diff options
| -rw-r--r-- | audio/flac/Makefile | 12 | ||||
| -rw-r--r-- | audio/flac/distinfo | 2 | ||||
| -rw-r--r-- | audio/flac/files/patch-configure.in | 24 | ||||
| -rw-r--r-- | audio/flac/files/patch-src::flac::Makefile.am | 10 | ||||
| -rw-r--r-- | audio/flac/files/patch-src::flac::file.c | 11 | ||||
| -rw-r--r-- | audio/flac/files/patch-src::libFLAC::fixed.c | 37 | ||||
| -rw-r--r-- | audio/flac/pkg-plist | 4 |
7 files changed, 36 insertions, 64 deletions
diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 8bb8e36c2879..4461ec3da36b 100644 --- a/audio/flac/Makefile +++ b/audio/flac/Makefile @@ -7,22 +7,24 @@ # PORTNAME= flac -PORTVERSION= 0.9 -PORTREVISION= 1 +PORTVERSION= 0.10 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= ijliao@FreeBSD.org +MAINTAINER= naddy@mips.inka.de .if defined(WITH_XMMS) BUILD_DEPENDS+= xmms-config:${PORTSDIR}/audio/xmms LIB_DEPENDS+= xmms.1:${PORTSDIR}/audio/xmms .endif +.if ${MACHINE_ARCH} == "i386" +BUILD_DEPENDS+= nasm:${PORTSDIR}/deve/nasm +.endif + USE_LIBTOOL= yes -USE_AUTOMAKE= yes USE_AUTOCONF= yes GNU_CONFIGURE= yes @@ -36,7 +38,7 @@ post-install: ${MKDIR} ${PREFIX}/share/doc/flac ${MKDIR} ${PREFIX}/share/doc/flac/images ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/flac -.for file in logo.jpg 1x1.gif +.for file in 1x1.gif cafebug.gif logo.jpg ${INSTALL_DATA} ${WRKSRC}/doc/images/${file} ${PREFIX}/share/doc/flac/images .endfor .endif diff --git a/audio/flac/distinfo b/audio/flac/distinfo index c50d3a4a7ac4..2c90e26d738c 100644 --- a/audio/flac/distinfo +++ b/audio/flac/distinfo @@ -1 +1 @@ -MD5 (flac-0.9-src.tar.gz) = 6b90c829c6224b43a3d304895bfd7d81 +MD5 (flac-0.10-src.tar.gz) = d8369dde641b984c96759f6c081171ab diff --git a/audio/flac/files/patch-configure.in b/audio/flac/files/patch-configure.in index 5b4870dad10f..6526e34547a0 100644 --- a/audio/flac/files/patch-configure.in +++ b/audio/flac/files/patch-configure.in @@ -1,17 +1,21 @@ ---- configure.in.orig Tue Apr 3 13:07:35 2001 -+++ configure.in Tue Apr 3 13:09:06 2001 -@@ -22,11 +22,11 @@ - AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - xmms support will not be built])) - AM_CONDITIONAL(XMMS, test x$XMMS_INPUT_PLUGIN_DIR != x) +$FreeBSD$ +--- configure.in.orig Thu Jun 7 21:27:38 2001 ++++ configure.in Thu Jun 7 21:28:13 2001 +@@ -51,14 +51,11 @@ + AC_DEFINE(FLAC__HAS_NASM) + fi -CFLAGS='-I./include -I $(top_srcdir)/include -Wall -W' -+CFLAGS="$CFLAGS -I./include -I \$(top_srcdir)/include" ++CFLAGS="-I./include -I \$(top_srcdir)/include" if test x$debug = xtrue; then -- CFLAGS="$CFLAGS -g -O0 -DDEBUG" -+ CFLAGS="$CFLAGS -g -DDEBUG" +- CFLAGS="$CFLAGS -g -O0 -DDEBUG" ++ CFLAGS="$CFLAGS -g -DDEBUG" else -- CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions -DNDEBUG" -+ CFLAGS="$CFLAGS -DNDEBUG" +- CFLAGS="$CFLAGS -O3 -DNDEBUG" +- if test x$GCC = xyes; then +- CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-loops -ffast-math -finline-functions" +- fi ++ CFLAGS="$CFLAGS -DNDEBUG" fi AC_OUTPUT( Makefile \ diff --git a/audio/flac/files/patch-src::flac::Makefile.am b/audio/flac/files/patch-src::flac::Makefile.am deleted file mode 100644 index 96a1a056e31f..000000000000 --- a/audio/flac/files/patch-src::flac::Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -$FreeBSD$ ---- src/flac/Makefile.am.orig Mon Mar 26 04:28:03 2001 -+++ src/flac/Makefile.am Mon Mar 26 04:28:10 2001 -@@ -5,5 +5,4 @@ flac_SOURCES = \ - decode.c \ - encode.c \ - main.c --flac_LDFLAGS = -lm --flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -+flac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la -lm diff --git a/audio/flac/files/patch-src::flac::file.c b/audio/flac/files/patch-src::flac::file.c new file mode 100644 index 000000000000..dbf8356f140d --- /dev/null +++ b/audio/flac/files/patch-src::flac::file.c @@ -0,0 +1,11 @@ +$FreeBSD$ +--- src/flac/file.c.orig Thu Jun 7 21:50:01 2001 ++++ src/flac/file.c Thu Jun 7 21:50:20 2001 +@@ -20,6 +20,7 @@ + #include <sys/utime.h> /* for utime() */ + #include <io.h> /* for chmod() */ + #else ++#include <sys/types.h> + #include <utime.h> /* for utime() */ + #include <unistd.h> /* for chown() */ + #endif diff --git a/audio/flac/files/patch-src::libFLAC::fixed.c b/audio/flac/files/patch-src::libFLAC::fixed.c deleted file mode 100644 index 4b8a20cd93ee..000000000000 --- a/audio/flac/files/patch-src::libFLAC::fixed.c +++ /dev/null @@ -1,37 +0,0 @@ ---- src/libFLAC/fixed.c.orig Sun Apr 1 07:35:25 2001 -+++ src/libFLAC/fixed.c Sun May 20 13:37:20 2001 -@@ -81,11 +81,11 @@ unsigned FLAC__fixed_compute_best_predic - residual_bits_per_sample[3] = (real)((data_len > 0) ? log(M_LN2 * (real)(int64)total_error_3 / (real) data_len) / M_LN2 : 0.0); - residual_bits_per_sample[4] = (real)((data_len > 0) ? log(M_LN2 * (real)(int64)total_error_4 / (real) data_len) / M_LN2 : 0.0); - #else -- residual_bits_per_sample[0] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_0 / (real) data_len) / M_LN2 : 0.0); -- residual_bits_per_sample[1] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_1 / (real) data_len) / M_LN2 : 0.0); -- residual_bits_per_sample[2] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_2 / (real) data_len) / M_LN2 : 0.0); -- residual_bits_per_sample[3] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_3 / (real) data_len) / M_LN2 : 0.0); -- residual_bits_per_sample[4] = (real)((data_len > 0) ? log(M_LN2 * (real)total_error_4 / (real) data_len) / M_LN2 : 0.0); -+ residual_bits_per_sample[0] = (real)((data_len > 0 && total_error_0 > 0) ? log(M_LN2 * (real)total_error_0 / (real) data_len) / M_LN2 : 0.0); -+ residual_bits_per_sample[1] = (real)((data_len > 0 && total_error_1 > 0) ? log(M_LN2 * (real)total_error_1 / (real) data_len) / M_LN2 : 0.0); -+ residual_bits_per_sample[2] = (real)((data_len > 0 && total_error_2 > 0) ? log(M_LN2 * (real)total_error_2 / (real) data_len) / M_LN2 : 0.0); -+ residual_bits_per_sample[3] = (real)((data_len > 0 && total_error_3 > 0) ? log(M_LN2 * (real)total_error_3 / (real) data_len) / M_LN2 : 0.0); -+ residual_bits_per_sample[4] = (real)((data_len > 0 && total_error_4 > 0) ? log(M_LN2 * (real)total_error_4 / (real) data_len) / M_LN2 : 0.0); - #endif - - return order; -@@ -152,7 +152,7 @@ unsigned FLAC__fixed_compute_best_predic - - void FLAC__fixed_compute_residual(const int32 data[], unsigned data_len, unsigned order, int32 residual[]) - { -- unsigned i; -+ int i; - - switch(order) { - case 0: -@@ -190,7 +190,7 @@ void FLAC__fixed_compute_residual(const - - void FLAC__fixed_restore_signal(const int32 residual[], unsigned data_len, unsigned order, int32 data[]) - { -- unsigned i; -+ int i; - - switch(order) { - case 0: diff --git a/audio/flac/pkg-plist b/audio/flac/pkg-plist index b602eed5cf1b..5a54d9bd06b1 100644 --- a/audio/flac/pkg-plist +++ b/audio/flac/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/flac bin/metaflac lib/libFLAC.a @@ -13,7 +14,8 @@ lib/libFLAC.so.0 %%PORTDOCS%%share/doc/flac/id.html %%PORTDOCS%%share/doc/flac/index.html %%PORTDOCS%%share/doc/flac/news.html -%%PORTDOCS%%share/doc/flac/images/logo.jpg %%PORTDOCS%%share/doc/flac/images/1x1.gif +%%PORTDOCS%%share/doc/flac/images/cafebug.gif +%%PORTDOCS%%share/doc/flac/images/logo.jpg %%PORTDOCS%%@dirrm share/doc/flac/images %%PORTDOCS%%@dirrm share/doc/flac |