Use lrdf_CFLAGS to gain -I/usr/include/raptor2 for raptor.h; required with liblrdf-0.4.0-r20.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

4 files changed, 37 insertions, 8 deletions

diff --git a/media-sound/aqualung/ChangeLog b/media-sound/aqualung/ChangeLog
index 268bf402c5a3..a8db41d020a1 100644
--- a/media-sound/aqualung/ChangeLog
+++ b/media-sound/aqualung/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/aqualung
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.17 2011/05/31 18:10:40 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/ChangeLog,v 1.18 2011/07/29 07:58:04 ssuominen Exp $
+
+  29 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
+  aqualung-0.9_beta11-r1.ebuild,
+  +files/aqualung-0.9_beta11-use_lrdf_cflags.patch:
+  Use lrdf_CFLAGS to gain -I/usr/include/raptor2 for raptor.h; required with
+  liblrdf-0.4.0-r20.
 
   31 May 2011; Daniel Pielmeier <billie@gentoo.org> aqualung-0.9_beta11.ebuild,
   aqualung-0.9_beta11-r1.ebuild:
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 25bcd81fb758..d263f1656ac6 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX aqualung-0.9_beta11-use_lrdf_cflags.patch 1190 RMD160 d98a06cabaf6db7ed9a8450a0bde59e8117bd4bc SHA1 f2ed98c644fbe89d033d99c989cb48faaf1473c9 SHA256 1bd61fae33bbd2bc36e551dac73757258765de28b17cefa33f70474947197e66
 DIST aqualung-0.9beta11.tar.gz 1584700 RMD160 3ff28f7611db89290baa1b0b8528c0ba5e79a762 SHA1 7a52a82ced0554acad56bd18f5ec707bf9fa85a0 SHA256 315eae4539c1039978d38bd7bc8ef965f3e9dc518c7eb6f4e9da52a9bf332ddd
-EBUILD aqualung-0.9_beta11-r1.ebuild 2514 RMD160 8ee2074a6f0bfda82d3f039943ee44c24187750e SHA1 9cec8de79120be4efb72000ab8b0c5197785dad8 SHA256 583614db3e10aa259835138570fef461800699089f5c26e082d4af3fc1534a89
+EBUILD aqualung-0.9_beta11-r1.ebuild 2566 RMD160 f46fcc8f2af65cefa5304f93832a266d28a121f4 SHA1 c8cfb9b509bcda063d710ea3e22a80c2d9d214a8 SHA256 2d9f9cda4e3b2b227defcae8790ae5d98808fd62492bc9e8273455f9460091e7
 EBUILD aqualung-0.9_beta11.ebuild 2362 RMD160 5efa3c441c4277f3fe708a9ea1e6f27fa7597a77 SHA1 fca5d93b7df0cf6c23ce84f62e8dc1c52cd224f9 SHA256 00b8c92993c4d18f9e1146f1a1d6147a07a44a262c4c951b55a7f25008a8eb20
-MISC ChangeLog 3497 RMD160 40c2cdec4d16b7daffa1185e87e679335d3bf3a4 SHA1 6e8fceef56d95d140e469b78c9f3a48961565693 SHA256 f2876391ac5da19ab1393dfb15df6c486dac9b2835a01997762a5ed6f634feeb
+MISC ChangeLog 3738 RMD160 a1a34be375f6c829659330a59c6d3deaa57725e4 SHA1 d74e7cb5f42426b282c3d75bc71b81b3d18ad9ea SHA256 73a87ff0cb55b1248cb46776ae947a7aecf478f03f2169eedd238c60706b1e1d
 MISC metadata.xml 663 RMD160 f62e66e7b9c130ea967c3f82bc59c24b43194cf9 SHA1 1841f9a0738b59214aa523f8240af8ed98737f34 SHA256 c0a4fbd91732bb8bf47fcf8862325f1ab833dd2c1e91a4e27d3482eb7998c575
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3lL0gACgkQlcuUeyFa0U12IACgl2tc/4QZ2CzOZorIj9bgCEkA
-puMAnisLBvksmUXsMABSREBZ4tEonDMc
-=bCdr
+iF4EAREIAAYFAk4yZ44ACgkQXkR9YqOcLPHAWQEAn8+YUw5bKkAjbj3by/59tTjm
+/7VDMeCmQ8Qt965l7uAA+QEVNUeg13GdkQ7240E9Mw1vcOddxxkkApS6vzr2jXzh
+=3Svr
 -----END PGP SIGNATURE-----
diff --git a/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild b/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
index c91e5a60b993..3323d8f774f4 100644
--- a/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
+++ b/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild,v 1.4 2011/05/31 18:10:40 billie Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/aqualung/aqualung-0.9_beta11-r1.ebuild,v 1.5 2011/07/29 07:58:04 ssuominen Exp $
 
 EAPI=2
 
@@ -47,6 +47,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-use_lrdf_cflags.patch
 	sed -i -e 's:$(pkgdatadir)/doc:/usr/share/doc/${PF}:' doc/Makefile.am
 	eautoreconf
 }
diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-use_lrdf_cflags.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-use_lrdf_cflags.patch
new file mode 100644
index 000000000000..4b840e528978
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-0.9_beta11-use_lrdf_cflags.patch
@@ -0,0 +1,21 @@
+Otherwise we end up with missing -I/usr/include/raptor2 for raptor.h
+
+--- configure.ac
++++ configure.ac
+@@ -742,6 +742,7 @@
+ 		AC_MSG_CHECKING(whether liblrdf version >= 0.4.0)
+ 		if `pkg-config --exists 'lrdf >= 0.4.0'`; then
+ 			AC_MSG_RESULT(yes)
++			lrdf_CFLAGS=`pkg-config --cflags lrdf`
+ 		        lrdf_LIBS=`pkg-config --libs lrdf`
+ 			AC_DEFINE([HAVE_LADSPA], [1], [Defined if compile with LADSPA plugin support])
+ 		else
+@@ -957,7 +958,7 @@
+ 
+ CFLAGS="$CFLAGS $BUILD_CFLAGS -Wall $PLATFORM_CFLAGS $AQUALUNG_SKINDIR $AQUALUNG_LOCALEDIR $AQUALUNG_DATADIR -D_GNU_SOURCE"
+ CXXFLAGS="$CFLAGS"
+-CPPFLAGS="$gtk_CFLAGS $glib_CFLAGS $xml_CFLAGS $alsa_CFLAGS $jack_CFLAGS $cdda_CFLAGS $pulse_CFLAGS"
++CPPFLAGS="$gtk_CFLAGS $glib_CFLAGS $xml_CFLAGS $alsa_CFLAGS $jack_CFLAGS $cdda_CFLAGS $pulse_CFLAGS $lrdf_CFLAGS"
+ LIBS="decoder/libdecoder.a encoder/libencoder.a $gtk_LIBS $glib_LIBS $xml_LIBS $jack_LIBS $lrdf_LIBS $src_LIBS $alsa_LIBS $sndio_LIBS $oss_LIBS $sndfile_LIBS $flac_LIBS $ogg_LIBS $wavpack_LIBS $speex_LIBS $mad_LIBS $mod_LIBS $mpc_LIBS $mac_LIBS $lavc_LIBS $vorbisenc_LIBS $lame_LIBS $cdda_LIBS $cddb_LIBS $ifp_LIBS $PLATFORM_LIBS $z_LIBS $bz2_LIBS $lua_LIBS $pulse_LIBS"
+ 
+