From 8886af31b4bcdb49ca1439436bd9b1ddb4f31f61 Mon Sep 17 00:00:00 2001 From: lioux Date: Sun, 20 Jan 2002 18:56:47 +0000 Subject: Update to 0.7.2 --- audio/liba52-devel/Makefile | 14 +++---- audio/liba52-devel/distinfo | 2 +- audio/liba52-devel/files/extra-patch-configure.in | 48 ----------------------- audio/liba52-devel/files/patch-libao:Makefile.am | 12 ------ audio/liba52-devel/files/patch-src:Makefile.am | 11 ------ audio/liba52-devel/pkg-plist | 1 + audio/liba52/Makefile | 14 +++---- audio/liba52/distinfo | 2 +- audio/liba52/files/extra-patch-configure.in | 48 ----------------------- audio/liba52/files/patch-libao:Makefile.am | 12 ------ audio/liba52/files/patch-src:Makefile.am | 11 ------ audio/liba52/pkg-plist | 1 + 12 files changed, 18 insertions(+), 158 deletions(-) delete mode 100644 audio/liba52-devel/files/extra-patch-configure.in delete mode 100644 audio/liba52-devel/files/patch-libao:Makefile.am delete mode 100644 audio/liba52-devel/files/patch-src:Makefile.am delete mode 100644 audio/liba52/files/extra-patch-configure.in delete mode 100644 audio/liba52/files/patch-libao:Makefile.am delete mode 100644 audio/liba52/files/patch-src:Makefile.am (limited to 'audio') diff --git a/audio/liba52-devel/Makefile b/audio/liba52-devel/Makefile index d1018169f9ba..8244356da9d5 100644 --- a/audio/liba52-devel/Makefile +++ b/audio/liba52-devel/Makefile @@ -6,15 +6,13 @@ # PORTNAME= liba52 -PORTVERSION= 0.7.1.b -PORTREVISION= 1 +PORTVERSION= 0.7.2 CATEGORIES= audio MASTER_SITES= http://liba52.sourceforge.net/files/ DISTNAME= a52dec-${PORTVERSION:S/.b/b/} MAINTAINER= lioux@FreeBSD.org -USE_AUTOMAKE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-oss --enable-shared @@ -24,10 +22,6 @@ MAN1= a52dec.1 extract_a52.1 HEADER_FILES= liba52/a52_internal.h -.ifndef(WITH_OPTIMIZED_CFLAGS) -EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure.in -.endif - pre-everything:: .ifndef(WITH_OPTIMIZED_CFLAGS) @${ECHO_MSG} ">>>" @@ -36,6 +30,12 @@ pre-everything:: @${ECHO_MSG} ">>>" .endif +post-patch: +.ifndef(WITH_OPTIMIZED_CFLAGS) + @${PERL} -pi.orig -e 's!-O3!${CFLAGS}!;s!-mcpu=[^"]+"!"!' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} +.endif + post-configure: @${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC} diff --git a/audio/liba52-devel/distinfo b/audio/liba52-devel/distinfo index 9af260e30361..f51277bbdaac 100644 --- a/audio/liba52-devel/distinfo +++ b/audio/liba52-devel/distinfo @@ -1 +1 @@ -MD5 (a52dec-0.7.1b.tar.gz) = 888e6ccd8706a1e61b0f0366a142cd85 +MD5 (a52dec-0.7.2.tar.gz) = 8897222b9fc98b6dd276e1e662d9b5d2 diff --git a/audio/liba52-devel/files/extra-patch-configure.in b/audio/liba52-devel/files/extra-patch-configure.in deleted file mode 100644 index ddeb92c0a7a4..000000000000 --- a/audio/liba52-devel/files/extra-patch-configure.in +++ /dev/null @@ -1,48 +0,0 @@ ---- configure.in.orig Fri Aug 31 06:36:25 2001 -+++ configure.in Tue Oct 16 10:53:04 2001 -@@ -16,45 +16,15 @@ - - dnl -Wall -Werror moved to the end to not disturb the configure script - -- dnl -O3 - changequote(<<,>>) - OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"` - changequote([,]) -- OPT_CFLAGS="$OPT_CFLAGS -O3" - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) - - dnl -fomit-frame-pointer - OPT_CFLAGS="$CFLAGS -fomit-frame-pointer" - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) - -- dnl arch-specific flags -- case "$host_alias" in -- i?86-* | k?-*) -- case "$host_alias" in -- i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";; -- i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";; -- i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";; -- i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";; -- k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";; -- esac -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- sparc-*) -- OPT_CFLAGS="$CFLAGS -mcpu=ultrasparc -mvis" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- mips-sgi-irix6.*) dnl do we need to be that specific ? -- OPT_CFLAGS="$CFLAGS -mabi=64" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- esac --else -- dnl non-gcc flags - we probably need exact configuration triplets here. -- case "$host_alias" in -- mips-sgi-irix6.*) -- OPT_CFLAGS="$CFLAGS -64" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- sparc-sun-solaris*) -- OPT_CFLAGS="$CFLAGS -xCC -fast -xO5" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- esac - fi - - dnl Checks for libtool - this must be done after we set cflags diff --git a/audio/liba52-devel/files/patch-libao:Makefile.am b/audio/liba52-devel/files/patch-libao:Makefile.am deleted file mode 100644 index fdd4352c7c6b..000000000000 --- a/audio/liba52-devel/files/patch-libao:Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ ---- libao/Makefile.am.orig Thu Aug 16 03:36:56 2001 -+++ libao/Makefile.am Sat Dec 1 06:44:16 2001 -@@ -1,7 +1,5 @@ --lib_LTLIBRARIES = libao.la --libao_la_SOURCES = audio_out.c audio_out_oss.c audio_out_solaris.c \ -+noinst_LIBRARIES = libao.a -+libao_a_SOURCES = audio_out.c audio_out_oss.c audio_out_solaris.c \ - audio_out_null.c audio_out_float.c --libao_la_LIBADD = @LIBAO_LIBS@ --libao_la_LDFLAGS = -no-undefined - - EXTRA_DIST = configure.incl diff --git a/audio/liba52-devel/files/patch-src:Makefile.am b/audio/liba52-devel/files/patch-src:Makefile.am deleted file mode 100644 index 3d02513203d6..000000000000 --- a/audio/liba52-devel/files/patch-src:Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.am.orig Thu Aug 30 19:18:37 2001 -+++ src/Makefile.am Sat Dec 1 06:31:19 2001 -@@ -2,7 +2,7 @@ - - bin_PROGRAMS = a52dec extract_a52 - a52dec_SOURCES = a52dec.c getopt.c --a52dec_LDADD = $(top_builddir)/liba52/liba52.la $(top_builddir)/libao/libao.la -+a52dec_LDADD = $(top_builddir)/liba52/liba52.la $(top_builddir)/libao/libao.a @LIBAO_LIBS@ - extract_a52_SOURCES = extract_a52.c getopt.c - - man_MANS = a52dec.1 extract_a52.1 diff --git a/audio/liba52-devel/pkg-plist b/audio/liba52-devel/pkg-plist index 643a9ac8bcc9..bf290b1b0928 100644 --- a/audio/liba52-devel/pkg-plist +++ b/audio/liba52-devel/pkg-plist @@ -2,6 +2,7 @@ bin/a52dec bin/extract_a52 include/a52dec/a52.h include/a52dec/a52_internal.h +include/a52dec/attributes.h include/a52dec/audio_out.h include/a52dec/mm_accel.h lib/liba52.so.0 diff --git a/audio/liba52/Makefile b/audio/liba52/Makefile index d1018169f9ba..8244356da9d5 100644 --- a/audio/liba52/Makefile +++ b/audio/liba52/Makefile @@ -6,15 +6,13 @@ # PORTNAME= liba52 -PORTVERSION= 0.7.1.b -PORTREVISION= 1 +PORTVERSION= 0.7.2 CATEGORIES= audio MASTER_SITES= http://liba52.sourceforge.net/files/ DISTNAME= a52dec-${PORTVERSION:S/.b/b/} MAINTAINER= lioux@FreeBSD.org -USE_AUTOMAKE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-oss --enable-shared @@ -24,10 +22,6 @@ MAN1= a52dec.1 extract_a52.1 HEADER_FILES= liba52/a52_internal.h -.ifndef(WITH_OPTIMIZED_CFLAGS) -EXTRA_PATCHES= ${FILESDIR}/extra-patch-configure.in -.endif - pre-everything:: .ifndef(WITH_OPTIMIZED_CFLAGS) @${ECHO_MSG} ">>>" @@ -36,6 +30,12 @@ pre-everything:: @${ECHO_MSG} ">>>" .endif +post-patch: +.ifndef(WITH_OPTIMIZED_CFLAGS) + @${PERL} -pi.orig -e 's!-O3!${CFLAGS}!;s!-mcpu=[^"]+"!"!' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} +.endif + post-configure: @${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC} diff --git a/audio/liba52/distinfo b/audio/liba52/distinfo index 9af260e30361..f51277bbdaac 100644 --- a/audio/liba52/distinfo +++ b/audio/liba52/distinfo @@ -1 +1 @@ -MD5 (a52dec-0.7.1b.tar.gz) = 888e6ccd8706a1e61b0f0366a142cd85 +MD5 (a52dec-0.7.2.tar.gz) = 8897222b9fc98b6dd276e1e662d9b5d2 diff --git a/audio/liba52/files/extra-patch-configure.in b/audio/liba52/files/extra-patch-configure.in deleted file mode 100644 index ddeb92c0a7a4..000000000000 --- a/audio/liba52/files/extra-patch-configure.in +++ /dev/null @@ -1,48 +0,0 @@ ---- configure.in.orig Fri Aug 31 06:36:25 2001 -+++ configure.in Tue Oct 16 10:53:04 2001 -@@ -16,45 +16,15 @@ - - dnl -Wall -Werror moved to the end to not disturb the configure script - -- dnl -O3 - changequote(<<,>>) - OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"` - changequote([,]) -- OPT_CFLAGS="$OPT_CFLAGS -O3" - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) - - dnl -fomit-frame-pointer - OPT_CFLAGS="$CFLAGS -fomit-frame-pointer" - AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]) - -- dnl arch-specific flags -- case "$host_alias" in -- i?86-* | k?-*) -- case "$host_alias" in -- i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";; -- i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";; -- i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";; -- i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";; -- k6-*) OPT_CFLAGS="$CFLAGS -mcpu=k6";; -- esac -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- sparc-*) -- OPT_CFLAGS="$CFLAGS -mcpu=ultrasparc -mvis" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- mips-sgi-irix6.*) dnl do we need to be that specific ? -- OPT_CFLAGS="$CFLAGS -mabi=64" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- esac --else -- dnl non-gcc flags - we probably need exact configuration triplets here. -- case "$host_alias" in -- mips-sgi-irix6.*) -- OPT_CFLAGS="$CFLAGS -64" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- sparc-sun-solaris*) -- OPT_CFLAGS="$CFLAGS -xCC -fast -xO5" -- AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);; -- esac - fi - - dnl Checks for libtool - this must be done after we set cflags diff --git a/audio/liba52/files/patch-libao:Makefile.am b/audio/liba52/files/patch-libao:Makefile.am deleted file mode 100644 index fdd4352c7c6b..000000000000 --- a/audio/liba52/files/patch-libao:Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ ---- libao/Makefile.am.orig Thu Aug 16 03:36:56 2001 -+++ libao/Makefile.am Sat Dec 1 06:44:16 2001 -@@ -1,7 +1,5 @@ --lib_LTLIBRARIES = libao.la --libao_la_SOURCES = audio_out.c audio_out_oss.c audio_out_solaris.c \ -+noinst_LIBRARIES = libao.a -+libao_a_SOURCES = audio_out.c audio_out_oss.c audio_out_solaris.c \ - audio_out_null.c audio_out_float.c --libao_la_LIBADD = @LIBAO_LIBS@ --libao_la_LDFLAGS = -no-undefined - - EXTRA_DIST = configure.incl diff --git a/audio/liba52/files/patch-src:Makefile.am b/audio/liba52/files/patch-src:Makefile.am deleted file mode 100644 index 3d02513203d6..000000000000 --- a/audio/liba52/files/patch-src:Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.am.orig Thu Aug 30 19:18:37 2001 -+++ src/Makefile.am Sat Dec 1 06:31:19 2001 -@@ -2,7 +2,7 @@ - - bin_PROGRAMS = a52dec extract_a52 - a52dec_SOURCES = a52dec.c getopt.c --a52dec_LDADD = $(top_builddir)/liba52/liba52.la $(top_builddir)/libao/libao.la -+a52dec_LDADD = $(top_builddir)/liba52/liba52.la $(top_builddir)/libao/libao.a @LIBAO_LIBS@ - extract_a52_SOURCES = extract_a52.c getopt.c - - man_MANS = a52dec.1 extract_a52.1 diff --git a/audio/liba52/pkg-plist b/audio/liba52/pkg-plist index 643a9ac8bcc9..bf290b1b0928 100644 --- a/audio/liba52/pkg-plist +++ b/audio/liba52/pkg-plist @@ -2,6 +2,7 @@ bin/a52dec bin/extract_a52 include/a52dec/a52.h include/a52dec/a52_internal.h +include/a52dec/attributes.h include/a52dec/audio_out.h include/a52dec/mm_accel.h lib/liba52.so.0 -- cgit