diff options
| -rw-r--r-- | media-libs/flac/ChangeLog | 10 | ||||
| -rw-r--r-- | media-libs/flac/Manifest | 15 | ||||
| -rw-r--r-- | media-libs/flac/files/digest-flac-1.1.2-r2 | 1 | ||||
| -rw-r--r-- | media-libs/flac/files/flac-1.1.2-gas.patch | 26 | ||||
| -rw-r--r-- | media-libs/flac/files/flac-1.1.2-libtool.patch | 111 | ||||
| -rw-r--r-- | media-libs/flac/files/flac-1.1.2-m4.patch | 33 | ||||
| -rw-r--r-- | media-libs/flac/files/flac-1.1.2-makefile.patch | 17 | ||||
| -rw-r--r-- | media-libs/flac/files/flac-1.1.2-noogg.patch | 51 | ||||
| -rw-r--r-- | media-libs/flac/files/flac-1.1.2-xmms-config.patch | 11 | ||||
| -rw-r--r-- | media-libs/flac/flac-1.1.2-r2.ebuild | 28 |
10 files changed, 26 insertions, 277 deletions
diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog index 63fda1f0e1a4..d3d8b4968a4e 100644 --- a/media-libs/flac/ChangeLog +++ b/media-libs/flac/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-libs/flac # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.69 2005/08/25 10:39:17 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.70 2005/08/25 11:11:50 flameeyes Exp $ + + 25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> + -files/flac-1.1.2-gas.patch, -files/flac-1.1.2-libtool.patch, + -files/flac-1.1.2-m4.patch, -files/flac-1.1.2-makefile.patch, + -files/flac-1.1.2-noogg.patch, -files/flac-1.1.2-xmms-config.patch, + flac-1.1.2-r2.ebuild: + Cleanup of flac ebuild, using patchset tarball instead of $FILESDIR. Removed + XMMS hack (provided m4). Don't add extra flags that are not requested. 25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> -files/flac-1.1.0-libtool.patch, -files/flac-1.1.0-m4.patch, diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest index e9d3fa13cdd9..18d51ef10214 100644 --- a/media-libs/flac/Manifest +++ b/media-libs/flac/Manifest @@ -1,14 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 420899236039018730a20d5dce719484 ChangeLog 9155 -MD5 00284aaecb79b71d7eb131e1c244c513 flac-1.1.2-r2.ebuild 1981 +MD5 b5cbae69fbc3c9f88c77192cf7b5c0e3 flac-1.1.2-r2.ebuild 1868 +MD5 f18c4e098666bda5c9227101b817edab .flac-1.1.2-r2.ebuild.swp 12288 MD5 fd56b1b8ffec55c61c135ead55df01e6 flac-1.1.1.ebuild 1650 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 MD5 953fea1d2ac1b75673f2c9bdcb0620c3 files/flac-1.1.2-noogg.patch 1442 MD5 86b29504f63f0ebfe0ddd971fc6b2470 files/flac-1.1.2-makefile.patch 511 MD5 36ab2ea2eeaffe0e9f1fd59c0fa1425f files/flac-1.1.2-gas.patch 753 -MD5 6c841c2c7db322a6c7f74f2a59e2cdf9 files/digest-flac-1.1.2-r2 63 +MD5 7070b10e66383782b73856e6dc37ba70 files/digest-flac-1.1.2-r2 128 MD5 96fbd16daecafb18ff0c203d9d041ee2 files/flac-1.1.2-xmms-config.patch 373 MD5 291cb72013c342e434ae5be0300ef63e files/digest-flac-1.1.1 63 MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.2-m4.patch 1175 @@ -16,10 +14,3 @@ MD5 d251cedb35cba423848e2e708f0f0773 files/flac-1.1.1-altivec.patch.gz 5705 MD5 97d7acba1f1548757a56330dd8ba7aa0 files/flac-1.1.1-m4.patch 1175 MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.2-libtool.patch 4041 MD5 bf28df385b4747a614fb93e31411b5de files/flac-1.1.1-libtool.patch 4041 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDDZ/sj5H05b2HAEkRAp6/AJ9P+3pgu3S5I6TPjiJale6qXo4E9gCeJmvr -MaE67K+cEf1slKTkpEuwnn4= -=AxeL ------END PGP SIGNATURE----- diff --git a/media-libs/flac/files/digest-flac-1.1.2-r2 b/media-libs/flac/files/digest-flac-1.1.2-r2 index ff97332b0a84..f444fed0afe0 100644 --- a/media-libs/flac/files/digest-flac-1.1.2-r2 +++ b/media-libs/flac/files/digest-flac-1.1.2-r2 @@ -1 +1,2 @@ MD5 2bfc127cdda02834d0491ab531a20960 flac-1.1.2.tar.gz 1516235 +MD5 70025a54bc22d07c77c923fd8cddee79 flac-patches-1.tar.bz2 4083 diff --git a/media-libs/flac/files/flac-1.1.2-gas.patch b/media-libs/flac/files/flac-1.1.2-gas.patch deleted file mode 100644 index 06b13c0e3ac8..000000000000 --- a/media-libs/flac/files/flac-1.1.2-gas.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- configure.in 2005-02-03 06:03:25.000000000 +0100 -+++ /tmp/configure.in 2005-02-19 14:11:56.714378040 +0100 -@@ -184,14 +184,17 @@ - fi - - # only matters for PowerPC --AC_CHECK_PROGS(AS, as) --AC_CHECK_PROGS(GAS, gas) --AM_CONDITIONAL(FLaC__HAS_AS, test -n "$AS") --AM_CONDITIONAL(FLaC__HAS_GAS, test -n "$GAS") --if test -n "$AS" ; then -+AC_CHECK_PROGS(AS, as, as) -+AC_CHECK_PROGS(AS, gas, gas) -+ -+test "$AS" = "as" && as -v -o /dev/null < /dev/null | grep GNU >/dev/null && AS=gas -+ -+AM_CONDITIONAL(FLaC__HAS_AS, test "$AS" = "as" ) -+AM_CONDITIONAL(FLaC__HAS_GAS, test "$AS" = "gas" ) -+if test "$AS" = "as" ; then - AC_DEFINE(FLAC__HAS_AS) - fi --if test -n "$GAS" ; then -+if test "$AS" = "gas" ; then - # funniest. macro. ever. - AC_DEFINE(FLAC__HAS_GAS) - fi diff --git a/media-libs/flac/files/flac-1.1.2-libtool.patch b/media-libs/flac/files/flac-1.1.2-libtool.patch deleted file mode 100644 index ea43e1e34494..000000000000 --- a/media-libs/flac/files/flac-1.1.2-libtool.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -Naur flac-1.1.1.orig/configure flac-1.1.1/configure ---- flac-1.1.1.orig/configure 2004-09-30 19:14:14.393540000 -0700 -+++ flac-1.1.1/configure 2004-09-30 19:19:54.583356858 -0700 -@@ -3469,7 +3469,7 @@ - # This must be Linux ELF. - linux-gnu*) - case $host_cpu in -- alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* ) -+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* | s390* | x86_64* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM -@@ -10465,7 +10465,7 @@ - else - OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG" - if test x$GCC = xyes; then -- OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__" -+ OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__" - fi - fi - CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS" -diff -Naur flac-1.1.1.orig/src/plugin_common/Makefile.in flac-1.1.1/src/plugin_common/Makefile.in ---- flac-1.1.1.orig/src/plugin_common/Makefile.in 2004-09-28 21:18:45.000000000 -0700 -+++ flac-1.1.1/src/plugin_common/Makefile.in 2004-09-30 19:20:42.137504142 -0700 -@@ -85,12 +85,12 @@ - CCAS = @CCAS@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -fPIC - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ -+CXXFLAGS = @CXXFLAGS@ -fPIC - CYGPATH_W = @CYGPATH_W@ - DEBUG_FALSE = @DEBUG_FALSE@ - DEBUG_TRUE = @DEBUG_TRUE@ -diff -Naur flac-1.1.1.orig/src/share/getopt/Makefile.in flac-1.1.1/src/share/getopt/Makefile.in ---- flac-1.1.1.orig/src/share/getopt/Makefile.in 2004-09-28 21:18:48.000000000 -0700 -+++ flac-1.1.1/src/share/getopt/Makefile.in 2004-09-30 19:21:03.493977488 -0700 -@@ -82,12 +82,12 @@ - CCAS = @CCAS@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -fPIC - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ -+CXXFLAGS = @CXXFLAGS@ -fPIC - CYGPATH_W = @CYGPATH_W@ - DEBUG_FALSE = @DEBUG_FALSE@ - DEBUG_TRUE = @DEBUG_TRUE@ -diff -Naur flac-1.1.1.orig/src/share/grabbag/Makefile.in flac-1.1.1/src/share/grabbag/Makefile.in ---- flac-1.1.1.orig/src/share/grabbag/Makefile.in 2004-09-28 21:18:48.000000000 -0700 -+++ flac-1.1.1/src/share/grabbag/Makefile.in 2004-09-30 19:21:32.385206586 -0700 -@@ -82,12 +82,12 @@ - CCAS = @CCAS@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -fPIC - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ -+CXXFLAGS = @CXXFLAGS@ -fPIC - CYGPATH_W = @CYGPATH_W@ - DEBUG_FALSE = @DEBUG_FALSE@ - DEBUG_TRUE = @DEBUG_TRUE@ -diff -Naur flac-1.1.1.orig/src/share/replaygain_analysis/Makefile.in flac-1.1.1/src/share/replaygain_analysis/Makefile.in ---- flac-1.1.1.orig/src/share/replaygain_analysis/Makefile.in 2004-09-28 21:18:49.000000000 -0700 -+++ flac-1.1.1/src/share/replaygain_analysis/Makefile.in 2004-09-30 19:21:59.291763405 -0700 -@@ -80,12 +80,12 @@ - CCAS = @CCAS@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -fPIC - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ -+CXXFLAGS = @CXXFLAGS@ -fPIC - CYGPATH_W = @CYGPATH_W@ - DEBUG_FALSE = @DEBUG_FALSE@ - DEBUG_TRUE = @DEBUG_TRUE@ -diff -Naur flac-1.1.1.orig/src/share/replaygain_synthesis/Makefile.in flac-1.1.1/src/share/replaygain_synthesis/Makefile.in ---- flac-1.1.1.orig/src/share/replaygain_synthesis/Makefile.in 2004-09-28 21:18:49.000000000 -0700 -+++ flac-1.1.1/src/share/replaygain_synthesis/Makefile.in 2004-09-30 19:22:15.817034518 -0700 -@@ -87,12 +87,12 @@ - CCAS = @CCAS@ - CCASFLAGS = @CCASFLAGS@ - CCDEPMODE = @CCDEPMODE@ --CFLAGS = @CFLAGS@ -+CFLAGS = @CFLAGS@ -fPIC - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CXX = @CXX@ - CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ -+CXXFLAGS = @CXXFLAGS@ -fPIC - CYGPATH_W = @CYGPATH_W@ - DEBUG_FALSE = @DEBUG_FALSE@ - DEBUG_TRUE = @DEBUG_TRUE@ diff --git a/media-libs/flac/files/flac-1.1.2-m4.patch b/media-libs/flac/files/flac-1.1.2-m4.patch deleted file mode 100644 index 79a012255257..000000000000 --- a/media-libs/flac/files/flac-1.1.2-m4.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur flac-1.1.1.orig/configure flac-1.1.1/configure ---- flac-1.1.1.orig/configure 2004-09-30 19:14:14.393540000 -0700 -+++ flac-1.1.1/configure 2004-09-30 19:15:24.279997712 -0700 -@@ -9040,7 +9040,7 @@ - elif test "x$ogg_prefix" != "x" ; then - OGG_LIBS="-L$ogg_prefix/lib" - elif test "x$prefix" != "xNONE" ; then -- OGG_LIBS="-L$prefix/lib" -+ OGG_LIBS="-L$libdir" - fi - - OGG_LIBS="$OGG_LIBS -logg" -@@ -9050,7 +9050,7 @@ - elif test "x$ogg_prefix" != "x" ; then - OGG_CFLAGS="-I$ogg_prefix/include" - elif test "x$prefix" != "xNONE"; then -- OGG_CFLAGS="-I$prefix/include" -+ OGG_CFLAGS="" - fi - - echo "$as_me:$LINENO: checking for Ogg" >&5 -diff -Naur flac-1.1.1.orig/src/libFLAC/libFLAC.m4 flac-1.1.1/src/libFLAC/libFLAC.m4 ---- flac-1.1.1.orig/src/libFLAC/libFLAC.m4 2004-07-19 17:22:39.000000000 -0700 -+++ flac-1.1.1/src/libFLAC/libFLAC.m4 2004-09-30 19:16:01.147908537 -0700 -@@ -28,7 +28,7 @@ - elif test "x$libFLAC_prefix" != "x" ; then - LIBFLAC_CFLAGS="-I$libFLAC_prefix/include" - elif test "$prefix" != "xNONE"; then -- LIBFLAC_CFLAGS="-I$prefix/include" -+ LIBFLAC_CFLAGS="-I$libdir" - fi - - AC_MSG_CHECKING(for libFLAC) diff --git a/media-libs/flac/files/flac-1.1.2-makefile.patch b/media-libs/flac/files/flac-1.1.2-makefile.patch deleted file mode 100644 index d5476ba97b4d..000000000000 --- a/media-libs/flac/files/flac-1.1.2-makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- src.orig/libFLAC/Makefile.am 2005-02-03 05:58:13.000000000 +0100 -+++ src/libFLAC/Makefile.am 2005-02-19 14:35:39.397097392 +0100 -@@ -59,12 +59,13 @@ - ARCH_SUBDIRS = ppc - if FLaC__HAS_AS__TEMPORARILY_DISABLED - libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la -+LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning" - else - if FLaC__HAS_GAS__TEMPORARILY_DISABLED - libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la -+LOCAL_EXTRA_LDFLAGS = "" - endif - endif --LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning" - endif - endif - diff --git a/media-libs/flac/files/flac-1.1.2-noogg.patch b/media-libs/flac/files/flac-1.1.2-noogg.patch deleted file mode 100644 index 2d1973db3f24..000000000000 --- a/media-libs/flac/files/flac-1.1.2-noogg.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- configure.in.old 2005-06-12 06:42:52.000000000 +0000 -+++ configure.in 2005-06-12 08:36:15.000000000 +0000 -@@ -35,6 +35,7 @@ - AM_PROG_AS - AC_PROG_CXX - AC_PROG_MAKE_SET -+AC_PATH_PROG(PKGCONFIG, pkg-config) - - AC_CHECK_TYPES(socklen_t, [], []) - -@@ -151,10 +152,36 @@ - fi - - dnl check for ogg library --XIPH_PATH_OGG(have_ogg=yes, AC_MSG_WARN([*** Ogg development enviroment not installed - Ogg support will not be built])) --AM_CONDITIONAL(FLaC__HAS_OGG, [test x$have_ogg = xyes]) --if test x$have_ogg = xyes ; then --AC_DEFINE(FLAC__HAS_OGG) -+AC_ARG_ENABLE([ogg], -+ AC_HELP_STRING([--disable-ogg], [Disable ogg support (default:test)]), -+ [want_ogg=$enableval ], [ want_ogg=yes ] ) -+ -+AM_CONDITIONAL(FLaC__HAS_OGG, test x$want_ogg = xyes) -+ -+if test "x$want_ogg" = "xyes"; then -+ AC_CHECK_HEADER(ogg/ogg.h, -+ [ogg_ok=yes -+ OGG_CFLAGS="`$PKGCONFIG ogg --cflags`" -+ OGG_LIBS="`$PKGCONFIG ogg --libs`" -+ AC_SUBST(OGG_CFLAGS) -+ AC_SUBST(OGG_LIBS) -+ ], [ogg_ok=no -+ OGG_CFLAGS="" -+ OGG_LIBS="" -+ AC_SUBST(OGG_CFLAGS) -+ AC_SUBST(OGG_LIBS) -+ ]) -+ if test "x$ogg_ok" = "xyes"; then -+ AC_DEFINE(FLAC__HAS_OGG) -+ else -+ AC_MSG_WARN(*** Ogg headers not found. Ogg support disabled.) -+ fi -+else -+ AC_MSG_RESULT([checking for ogg support... disabled]) -+ OGG_CFLAGS="" -+ OGG_LIBS="" -+ AC_SUBST(OGG_CFLAGS) -+ AC_SUBST(OGG_LIBS) - fi - - AM_PATH_XMMS(0.9.5.1, , AC_MSG_WARN([*** XMMS >= 0.9.5.1 not installed - xmms support will not be built])) diff --git a/media-libs/flac/files/flac-1.1.2-xmms-config.patch b/media-libs/flac/files/flac-1.1.2-xmms-config.patch deleted file mode 100644 index 9ac6d6931472..000000000000 --- a/media-libs/flac/files/flac-1.1.2-xmms-config.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- flac-1.1.2.orig/src/plugin_xmms/configure.c 2005-01-25 07:26:29 +0300 -+++ flac-1.1.2/src/plugin_xmms/configure.c 2005-02-24 12:40:37 +0300 -@@ -61,7 +61,7 @@ - "", /* proxy_user */ - "", /* proxy_pass */ - FALSE, /* save_http_stream */ -- "", /* save_http_path */ -+ FALSE, /* save_http_path */ - FALSE, /* cast_title_streaming */ - FALSE /* use_udp_channel */ - }, diff --git a/media-libs/flac/flac-1.1.2-r2.ebuild b/media-libs/flac/flac-1.1.2-r2.ebuild index 88b28354e73a..68849778b8af 100644 --- a/media-libs/flac/flac-1.1.2-r2.ebuild +++ b/media-libs/flac/flac-1.1.2-r2.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r2.ebuild,v 1.2 2005/06/12 09:27:15 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.2-r2.ebuild,v 1.3 2005/08/25 11:11:50 flameeyes Exp $ inherit libtool eutils flag-o-matic +PATCHLEVEL="1" DESCRIPTION="free lossless audio encoder which includes an XMMS plugin" HOMEPAGE="http://flac.sourceforge.net/" -SRC_URI="mirror://sourceforge/flac/${P}.tar.gz" +SRC_URI="mirror://sourceforge/flac/${P}.tar.gz + http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" LICENSE="GPL-2 LGPL-2" SLOT="0" @@ -24,18 +26,14 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} cd "${S}" - if use xmms ; then - epatch "${FILESDIR}"/${P}-xmms-config.patch - else - sed -i -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in || die - sed -i -e '/AM_PATH_XMMS/d' configure.in || die - fi - epatch "${FILESDIR}/${P}-m4.patch" - epatch "${FILESDIR}/${P}-libtool.patch" - epatch "${FILESDIR}/${P}-gas.patch" - epatch "${FILESDIR}/${P}-makefile.patch" - epatch "${FILESDIR}/${P}-noogg.patch" + # Apply all the patches but the largefile one (added later) + EPATCH_EXCLUDE="060_all_largefile.patch" + EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches + + # it needs XMMS m4 file + cp -R ${WORKDIR}/m4 ${S} + ./autogen.sh || die "autogen failed" libtoolize --copy --force elibtoolize --reverse-deps @@ -53,8 +51,8 @@ src_compile() { # the man page ebuild requires docbook2man... yick! sed -i -e 's:include man:include:g' Makefile - # emake seems to mess up the building of the xmms input plugin - make || die "make failed" + # parallel make seems to mess up the building of the xmms input plugin + emake -j1 || die "make failed" } src_install() { |