Added patches to fix bugs #41042 and #50137. XMMS plugin should now build correctly and -fPIC is in the patch now instead of the ebuild.

7 files changed, 228 insertions, 6 deletions

diff --git a/media-libs/flac/ChangeLog b/media-libs/flac/ChangeLog
index 9cab0507f99f..dbb73c14297d 100644
--- a/media-libs/flac/ChangeLog
+++ b/media-libs/flac/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/flac
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.29 2004/05/26 02:22:15 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/ChangeLog,v 1.30 2004/06/14 21:24:15 eradicator Exp $
+
+*flac-1.1.0-r2 (14 Jun 2004)
+
+  14 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/flac-1.1.0-libtool.patch, +files/flac-1.1.0-m4.patch,
+  +flac-1.1.0-r2.ebuild:
+  Added patches to fix bugs #41042 and #50137. XMMS plugin should now build
+  correctly and -fPIC is in the patch now instead of the ebuild.
 
   26 May 2004; Guy Martin <gmsoft@gentoo.org> flac-1.1.0-r1.ebuild:
   Marked stable on hppa.
diff --git a/media-libs/flac/Manifest b/media-libs/flac/Manifest
index 3ed15acdf607..2b233b5d8729 100644
--- a/media-libs/flac/Manifest
+++ b/media-libs/flac/Manifest
@@ -1,6 +1,10 @@
+MD5 14cefd14aeb84502504b0d39eab813cf ChangeLog 3807
 MD5 9c2242ec43c3650cfe7965dbd1c76e8a flac-1.1.0-r1.ebuild 1534
 MD5 275581734ebd02604a7dc7a1aa221e5e flac-1.1.0.ebuild 1537
-MD5 14cefd14aeb84502504b0d39eab813cf ChangeLog 3807
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r1 63
+MD5 73980663ccf5c1f6e3488a4823415e22 flac-1.1.0-r2.ebuild 1633
 MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0 63
+MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r1 63
+MD5 efbd988ef5877a8f1f4018cfaa97b378 files/flac-1.1.0-libtool.patch 3831
+MD5 c10f4a7334db0c8eab9fbc5111363490 files/digest-flac-1.1.0-r2 63
+MD5 bb05dd6b2e2856a686d9d5a0441f60cd files/flac-1.1.0-m4.patch 2424
diff --git a/media-libs/flac/files/digest-flac-1.1.0-r2 b/media-libs/flac/files/digest-flac-1.1.0-r2
new file mode 100644
index 000000000000..614cadc8c556
--- /dev/null
+++ b/media-libs/flac/files/digest-flac-1.1.0-r2
@@ -0,0 +1 @@
+MD5 19b456a27b5fcf502c76cc33f33e1490 flac-1.1.0.tar.gz 1201861
diff --git a/media-libs/flac/files/flac-1.1.0-libtool.patch b/media-libs/flac/files/flac-1.1.0-libtool.patch
new file mode 100644
index 000000000000..04812160b0c1
--- /dev/null
+++ b/media-libs/flac/files/flac-1.1.0-libtool.patch
@@ -0,0 +1,91 @@
+--- flac-1.1.0/configure.moo	2004-03-11 16:54:57.275530648 -0500
++++ flac-1.1.0/configure	2004-03-11 16:55:05.821231504 -0500
+@@ -3106,7 +3106,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
+--- flac-1.1.0/aclocal.m4.foo	2004-03-11 16:57:15.862462232 -0500
++++ flac-1.1.0/aclocal.m4	2004-03-11 16:57:33.537775176 -0500
+@@ -4085,7 +4085,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
+--- flac-1.1.0/configure.moo	2004-03-11 17:06:38.507927120 -0500
++++ flac-1.1.0/configure	2004-03-11 17:07:03.874070880 -0500
+@@ -11251,9 +11251,9 @@
+ if test x$debug = xtrue; then
+ 	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
+ else
+-	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -DNDEBUG"
++	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
+ 	if test x$GCC = xyes; then
+-		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -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"
+--- flac-1.1.0/src/plugin_common/Makefile.in.moo	2004-03-11 17:18:48.054019256 -0500
++++ flac-1.1.0/src/plugin_common/Makefile.in	2004-03-11 17:18:48.058018648 -0500
+@@ -184,7 +184,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC
+ DIST_SOURCES = $(libplugin_common_a_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+ 
+--- flac-1.1.0/src/share/utf8/Makefile.in.moo	2004-03-11 17:18:42.004938856 -0500
++++ flac-1.1.0/src/share/utf8/Makefile.in	2004-03-11 17:18:42.008938248 -0500
+@@ -159,7 +159,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC
+ DIST_SOURCES = $(libutf8_a_SOURCES)
+ DIST_COMMON = Makefile.am Makefile.in
+ SOURCES = $(libutf8_a_SOURCES)
+--- flac-1.1.0/src/share/getopt/Makefile.in.moo	2004-03-11 17:18:42.013937488 -0500
++++ flac-1.1.0/src/share/getopt/Makefile.in	2004-03-11 17:18:42.016937032 -0500
+@@ -153,7 +153,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC
+ DIST_SOURCES = $(libgetopt_a_SOURCES)
+ DIST_COMMON = Makefile.am Makefile.in
+ SOURCES = $(libgetopt_a_SOURCES)
+--- flac-1.1.0/src/share/grabbag/Makefile.in.moo	2004-03-11 17:18:42.022936120 -0500
++++ flac-1.1.0/src/share/grabbag/Makefile.in	2004-03-11 17:18:42.025935664 -0500
+@@ -160,7 +160,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC
+ DIST_SOURCES = $(libgrabbag_a_SOURCES)
+ DIST_COMMON = Makefile.am Makefile.in
+ SOURCES = $(libgrabbag_a_SOURCES)
+--- flac-1.1.0/src/share/gain_analysis/Makefile.in.moo	2004-03-11 17:18:42.040933384 -0500
++++ flac-1.1.0/src/share/gain_analysis/Makefile.in	2004-03-11 17:18:42.043932928 -0500
+@@ -153,7 +153,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC
+ DIST_SOURCES = $(libgain_analysis_a_SOURCES)
+ DIST_COMMON = Makefile.am Makefile.in
+ SOURCES = $(libgain_analysis_a_SOURCES)
diff --git a/media-libs/flac/files/flac-1.1.0-m4.patch b/media-libs/flac/files/flac-1.1.0-m4.patch
new file mode 100644
index 000000000000..5dd4df183c18
--- /dev/null
+++ b/media-libs/flac/files/flac-1.1.0-m4.patch
@@ -0,0 +1,64 @@
+--- flac-1.1.0/configure.foo	2003-12-12 01:55:33.000000000 -0500
++++ flac-1.1.0/configure	2003-12-12 01:56:11.000000000 -0500
+@@ -8161,7 +8161,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"
+@@ -8171,7 +8171,7 @@
+   elif test "x$ogg_prefix" != "x" ; then
+     OGG_CFLAGS="-I$ogg_prefix/include"
+   elif test "$prefix" != "xNONE"; then
+-    OGG_CFLAGS="-I$prefix/include"
++    OGG_CFLAGS=""
+   fi
+ 
+   echo "$as_me:$LINENO: checking for Ogg" >&5
+--- flac-1.1.0/src/libFLAC/libFLAC.m4.cow	2002-07-01 16:37:39.000000000 -0400
++++ flac-1.1.0/src/libFLAC/libFLAC.m4	2003-12-12 01:56:51.000000000 -0500
+@@ -18,7 +18,7 @@
+   elif test "x$libFLAC_prefix" != "x" ; then
+     LIBFLAC_LIBS="-L$libFLAC_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    LIBFLAC_LIBS="-L$prefix/lib"
++    LIBFLAC_LIBS="-L$libdir"
+   fi
+ 
+   LIBFLAC_LIBS="$LIBFLAC_LIBS -lFLAC -lm"
+--- flac-1.1.0/src/libFLAC++/libFLAC++.m4.cow	2002-07-01 16:37:39.000000000 -0400
++++ flac-1.1.0/src/libFLAC++/libFLAC++.m4	2003-12-12 01:56:51.000000000 -0500
+@@ -19,7 +19,7 @@
+   elif test "x$libFLACPP_prefix" != "x" ; then
+     LIBFLACPP_LIBS="-L$libFLACPP_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    LIBFLACPP_LIBS="-L$prefix/lib"
++    LIBFLACPP_LIBS="-L$libdir"
+   fi
+ 
+   LIBFLACPP_LIBS="$LIBFLACPP_LIBS -lFLAC++ $LIBFLAC_LIBS"
+--- flac-1.1.0/src/libOggFLAC/libOggFLAC.m4.cow	2002-08-06 01:31:17.000000000 -0400
++++ flac-1.1.0/src/libOggFLAC/libOggFLAC.m4	2003-12-12 01:56:51.000000000 -0500
+@@ -18,7 +18,7 @@
+   elif test "x$libOggFLAC_prefix" != "x" ; then
+     LIBOGGFLAC_LIBS="-L$libOggFLAC_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    LIBOGGFLAC_LIBS="-L$prefix/lib"
++    LIBOGGFLAC_LIBS="-L$libdir"
+   fi
+ 
+   LIBOGGFLAC_LIBS="$LIBOGGFLAC_LIBS -lOggFLAC -lFLAC -lm"
+--- flac-1.1.0/src/libOggFLAC++/libOggFLAC++.m4.cow	2002-08-07 13:05:16.000000000 -0400
++++ flac-1.1.0/src/libOggFLAC++/libOggFLAC++.m4	2003-12-12 01:56:51.000000000 -0500
+@@ -19,7 +19,7 @@
+   elif test "x$libOggFLACPP_prefix" != "x" ; then
+     LIBOGGFLACPP_LIBS="-L$libOggFLACPP_prefix/lib"
+   elif test "x$prefix" != "xNONE" ; then
+-    LIBOGGFLACPP_LIBS="-L$prefix/lib"
++    LIBOGGFLACPP_LIBS="-L$libdir"
+   fi
+ 
+   LIBOGGFLACPP_LIBS="$LIBOGGFLACPP_LIBS -lOggFLAC++ $LIBOGGFLAC_LIBS"
diff --git a/media-libs/flac/flac-1.1.0-r2.ebuild b/media-libs/flac/flac-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..a2c9280fd764
--- /dev/null
+++ b/media-libs/flac/flac-1.1.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0-r2.ebuild,v 1.1 2004/06/14 21:24:15 eradicator Exp $
+
+IUSE="sse xmms"
+
+inherit libtool eutils
+
+DESCRIPTION="free lossless audio encoder which includes an XMMS plugin"
+HOMEPAGE="http://flac.sourceforge.net/"
+SRC_URI="mirror://sourceforge/flac/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips"
+
+RDEPEND=">=media-libs/libogg-1.0_rc2
+	xmms? ( media-sound/xmms )"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	sys-apps/gawk"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if ! use xmms
+	then
+		cp src/Makefile.in src/Makefile.in.orig
+		sed -e '/^@FLaC__HAS_XMMS_TRUE/d' src/Makefile.in.orig > src/Makefile.in || die
+	fi
+
+	epatch ${FILESDIR}/flac-1.1.0-m4.patch
+	epatch ${FILESDIR}/flac-1.1.0-libtool.patch
+
+	elibtoolize --reverse-deps
+}
+
+src_compile() {
+	econf \
+		--with-pic \
+		`use_enable sse` \
+		|| die
+
+	# 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
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}
diff --git a/media-libs/flac/flac-1.1.0.ebuild b/media-libs/flac/flac-1.1.0.ebuild
index 5faf0aea2230..547b26acaf7b 100644
--- a/media-libs/flac/flac-1.1.0.ebuild
+++ b/media-libs/flac/flac-1.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0.ebuild,v 1.20 2004/05/14 04:15:20 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.1.0.ebuild,v 1.21 2004/06/14 21:24:15 eradicator Exp $
 
 inherit libtool
 
@@ -13,9 +13,9 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 mips"
 IUSE="sse xmms X"
 
-RDEPEND="virtual/glibc
-	>=media-libs/libogg-1.0_rc2
+RDEPEND=">=media-libs/libogg-1.0_rc2
 	X? ( xmms? ( media-sound/xmms ) )"
+
 DEPEND="${RDEPEND}
 	x86? ( dev-lang/nasm )
 	sys-apps/gawk"