Remove "Requires" from fishsound.pc to avoid including -I/usr/include/FLAC in cflags...

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

diff --git a/media-libs/libfishsound/ChangeLog b/media-libs/libfishsound/ChangeLog
index 5dba9026a5558d6cb1143140928c68f398136077..2da7b82cc23cccb9ac6c3044b5bcd63a523d0b37 100644 (file)
--- a/media-libs/libfishsound/ChangeLog
+++ b/media-libs/libfishsound/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libfishsound
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfishsound/ChangeLog,v 1.9 2010/03/11 10:56:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfishsound/ChangeLog,v 1.10 2010/03/11 11:33:22 ssuominen Exp $
+
+  11 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  libfishsound-1.0.0.ebuild, +files/libfishsound-1.0.0-pc.patch:
+  Remove "Requires" from fishsound.pc to avoid including -I/usr/include/FLAC
+  in cflags (FLAC/assert.h will collide with system assert.h).
 
 *libfishsound-1.0.0 (11 Mar 2010)
 

diff --git a/media-libs/libfishsound/Manifest b/media-libs/libfishsound/Manifest
index ffadb9eadfacb6f6e8c1af77a92a13ce02faeb9b..fe29938ab634284f76da0f4ddbfae8f000131c6b 100644 (file)
--- a/media-libs/libfishsound/Manifest
+++ b/media-libs/libfishsound/Manifest
@@ -1,8 +1,9 @@
+AUX libfishsound-1.0.0-pc.patch 406 RMD160 06ba70bf4eea4c582c59b135064d711da4230c26 SHA1 b3331f83ef733753a49e64ddbac58dd981ca1ee0 SHA256 d112dd62dfa8b76d9750a9ba5daae8c21248e948151aed6c8977283fefc02f26
 DIST libfishsound-0.9.1.tar.gz 485127 RMD160 1fc64b0ddf455401aa75544cebaf671bd7505f88 SHA1 1c587f55265a024911442a61b538c308f1f185c0 SHA256 2f2d651bb106509abd662a0cfd55769a323a0d0bd33c1cc56a4756f3b1693368
 DIST libfishsound-0.9.2.tar.gz 436119 RMD160 07972b131ee1bb681217b591697cf1bff275c8f2 SHA1 579875a51f51cdf85ecf60d15aac15534cb9a23a SHA256 ddc3eba9ca33abe5e613579079bf8a4978a5ada46722b2e99572819aaffc6642
 DIST libfishsound-1.0.0.tar.gz 444980 RMD160 49919da94696932ca88cc81bcc317a434ce67bc9 SHA1 5263dfaa12dce71e30c5d80f871d92869c6b5ce2 SHA256 2e0b57ce2fecc9375eef72938ed08ac8c8f6c5238e1cae24458f0b0e8dade7c7
 EBUILD libfishsound-0.9.1.ebuild 1161 RMD160 a09e9c96f6bd7440eb501963e879256ce943a2cf SHA1 92f405ad12cd315de93ccdb5d59e16d83b45c840 SHA256 c224dc37209aa86f3cc3d7476b576c2488b3b5c551eff7061b9a0a03ba4d154a
 EBUILD libfishsound-0.9.2.ebuild 1399 RMD160 6421a0b5d1bfa754b0cb71cc1d1c77f456fee0d2 SHA1 32ac87f6b0c757e0f6b4b843bee01839e7d4d606 SHA256 9538f82b61171326baedde7e3e2152dc4e8a769e1edd6c2c0bfd3eef6a81eb98
-EBUILD libfishsound-1.0.0.ebuild 1176 RMD160 4e537db10834882b2e86136ff1f48241ebcca29d SHA1 2a6acb18fd095f0527a627248e2e34707dda1ca4 SHA256 fa01dd1bad6db0676e682f2a8d9ea45f997a9fa7c6347e0e3e271f6698c83b5d
-MISC ChangeLog 1583 RMD160 164e551f887eedf6fe025f6a7ff049ecd7599483 SHA1 018754252a4d4f945bd9b4ed4ab6b69928080964 SHA256 49d8ceee62504d691318475414edd27d3a8fd946e319f1dc47213a43d9c0d972
+EBUILD libfishsound-1.0.0.ebuild 1118 RMD160 9f5e0b410a8677fa327f8698e3462ac1f0e72146 SHA1 b0fb0562ced8432aa3bdac76b33474f9b91cc567 SHA256 88e8ee2cc59ededd566cb995b7dc0de510e2bed8cace2cb6266fa7cf593c774d
+MISC ChangeLog 1844 RMD160 3c6a8a268a06ed7cea308a151d73c81f87b2b527 SHA1 c4d3a8f73c0796c0ed21e338a9ffa32a4141f1d0 SHA256 f82245c090b3cf1be22140bb969f5f85252bb0ee89efe564fab81a350a7d7b60
 MISC metadata.xml 160 RMD160 10be84fed28405abd22adc6689e87e5bb77e3501 SHA1 0c1bb16a7cc376ef35b87d8699ec9504718d36b9 SHA256 6bafe4a5c7b42309f124ebc2a9d78ebe5379aec4dcdc88c0bda2ab79c9851a6b

diff --git a/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch b/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch
new file mode 100644 (file)
index 0000000..fa417bb
--- /dev/null
+++ b/media-libs/libfishsound/files/libfishsound-1.0.0-pc.patch
@@ -0,0 +1,13 @@
+This will avoid including -I/usr/include/FLAC in `pkg-config --cflags fishsound` since
+FLAC/assert.h will collide with system assert.h.
+
+--- fishsound.pc.in
++++ fishsound.pc.in
+@@ -5,7 +5,6 @@
+ 
+ Name: fishsound
+ Description: Encode and decode Vorbis, Speex, FLAC audio
+-Requires: @fishsound_pkgdeps@
+ Version: @VERSION@
+ Libs: -L${libdir} -lfishsound
+ Libs.private: @VORBIS_LIBS@ @SPEEX_LIBS@ @FLAC_LIBS@

diff --git a/media-libs/libfishsound/libfishsound-1.0.0.ebuild b/media-libs/libfishsound/libfishsound-1.0.0.ebuild
index 223fad5a196c749390635b9f18217d65ecd442c0..0efd4a2a65daba6c88e1bcdc6c08f6f587b7304b 100644 (file)
--- a/media-libs/libfishsound/libfishsound-1.0.0.ebuild
+++ b/media-libs/libfishsound/libfishsound-1.0.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfishsound/libfishsound-1.0.0.ebuild,v 1.2 2010/03/11 11:18:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfishsound/libfishsound-1.0.0.ebuild,v 1.3 2010/03/11 11:33:22 ssuominen Exp $
 
 EAPI=2
+inherit eutils
 
 DESCRIPTION="Simple programming interface for decoding and encoding audio data using vorbis or speex"
 HOMEPAGE="http://www.xiph.org/fishsound/"
@@ -11,17 +12,17 @@ SRC_URI="http://downloads.xiph.org/releases/libfishsound/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="speex"
-# flac
+IUSE="flac speex"
 
 RDEPEND="media-libs/libvorbis
        media-libs/libogg
+       flac? ( media-libs/flac )
        speex? ( media-libs/speex )"
-# flac? ( media-libs/flac )
 DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
 src_prepare() {
+       epatch "${FILESDIR}"/${P}-pc.patch
        sed -i \
                -e 's:doxygen:doxygen-dummy:' \
                configure || die
@@ -29,10 +30,7 @@ src_prepare() {
 
 src_configure() {
        local myconf=""
-       # FLAC pkg-config file is broken and shouldn't append -I/usr/include/FLAC
-       # because of e.g. assert.h
-       # use flac ||
-       myconf="${myconf} --disable-flac"
+       use flac || myconf="${myconf} --disable-flac"
        use speex || myconf="${myconf} --disable-speex"
 
        econf \