Add patch from upstream for fixing build with sdl (upstream commit b6df18997dabe). Gentoo bug #414999

Package-Manager: portage-2.2.0_alpha101/cvs/Linux i686

4 files changed, 34 insertions, 5 deletions

diff --git a/media-plugins/audacious-plugins/ChangeLog b/media-plugins/audacious-plugins/ChangeLog
index 2b9b984b4fab..ad4a50ffca51 100644
--- a/media-plugins/audacious-plugins/ChangeLog
+++ b/media-plugins/audacious-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-plugins/audacious-plugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.242 2012/05/05 08:27:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/ChangeLog,v 1.243 2012/05/07 17:58:12 jdhore Exp $
+
+  07 May 2012; Jeff Horelick <jdhore@gentoo.org>
+  +files/audacious-plugins-3.2.2-fix-build-sdl.patch,
+  audacious-plugins-3.2.2-r1.ebuild:
+  Add patch from upstream for fixing build with sdl (upstream commit
+  b6df18997dabe). Gentoo bug #414999
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org>
   audacious-plugins-2.4.4-r1.ebuild, audacious-plugins-2.5.4.ebuild,
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index f6b472385ba1..c371732371df 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,4 +1,5 @@
 AUX audacious-plugins-3.2.2-fix-build-gmodule.patch 1244 RMD160 35437408a10eba1c616b2b78f605ab82c51f21ba SHA1 17e73f9d886b961d12053d1ee2a21dd1260333a3 SHA256 c86428993218ea785d740cc0e051a4c2401aadc17f35940048dd39347f1acdd5
+AUX audacious-plugins-3.2.2-fix-build-sdl.patch 622 RMD160 9c6e99012e5377031524b7024bc33ce2e10d2abf SHA1 4b3dcd60754c8d8aac1a10a5d41f35a6929b4b05 SHA256 c6b13de9284cb918a749b8c1356685af233c26065a1aff41290c5fff94074eb3
 AUX audacious-plugins_ldflags.patch 392 RMD160 4d606042a86ecc360fdd51131286027fbb5c991c SHA1 12929db542e94db329f50fec1d01a296b764c032 SHA256 1c22569d2a5c54656713f57b74412f61d09e002b87c6af2c291e771217d91a6a
 DIST audacious-plugins-2.4.4.tgz 3425914 RMD160 d8ec95fb678efcb9acd17e77b890d4c685c2b892 SHA1 33a43cdcb699578accbc181918b96da6ab04cedc SHA256 24948ae2161ddde580bcad27dbc11faed0cacd142252749e64da5f8f5e8084e4
 DIST audacious-plugins-2.5.4.tar.gz 3500309 RMD160 a2cf4b9407492758c7ee9b858c7c75b9d906c524 SHA1 8aedcc58c3b5a9415345374014d809ccb9a7541a SHA256 149fd27f476670d8ab3b8e9beaad9ab9de5955c8cbec70bf27e26446168148d8
@@ -14,7 +15,7 @@ EBUILD audacious-plugins-3.0.3.ebuild 3347 RMD160 7dca77018fef7343eb995d920acc2c
 EBUILD audacious-plugins-3.1.1.ebuild 3447 RMD160 ec4209470d5291b3dead63daa0d45b3e1c5fe4fc SHA1 d1eb93315992dea4d0e50c90d18621f7cd69daa3 SHA256 7b1a7a07463bbfea9bda7d4cc9ae805c91eef5368af52f8d34085ed588777abf
 EBUILD audacious-plugins-3.1.ebuild 3438 RMD160 35e40084b06b8904e8a3ba6eeceffc6c2bb0edae SHA1 17172b69ba64d8940cf020b18c271b18a1ef15d2 SHA256 08aa808f203389bd06db6709943fee5efab440d2a55ad7ff4569b1e82260ff27
 EBUILD audacious-plugins-3.2.1.ebuild 3341 RMD160 7840a391a06446b00d39fb246050b4442ccb7298 SHA1 7d5c5b2e748a3b597a7fab7e604c52d7101be4f7 SHA256 5a1068ea52be89550c9e0cf42292a511b61f754175bd8804dd67974bcc609ff5
-EBUILD audacious-plugins-3.2.2-r1.ebuild 3363 RMD160 10d5ff26aef6b7119585f8b1479e75da2d733cca SHA1 e7f2eed7227c22349100bc1dd3f1947b4d1fa24c SHA256 5522d696263712c46adf4f931106f0111e860691c387f7736aef0a62ff4d0ace
+EBUILD audacious-plugins-3.2.2-r1.ebuild 3476 RMD160 1ec8b791afeeb0944b01470f065507172666fde0 SHA1 c58d892dee90520d2cf347f5e45340c21d3932ec SHA256 6a533eed483d406132708d1f4fe59e1a41d3a0912559e1f8d3b232f83c755cc9
 EBUILD audacious-plugins-3.2.ebuild 3337 RMD160 90885320ade1bc18ff8ebc41564f1dba3cd49a3c SHA1 528acd9c8cad1324be46b9ce16819d30a233989c SHA256 f7e162c04d4fc4c9f3c1a5deaa846020892214c9f7896f3e414f397a6254eece
-MISC ChangeLog 50332 RMD160 1bea45cdef000605e8db5c2e8726ce4509b7936a SHA1 6f58843cdc40eb6a79e2b034a6f8d9f5ea341775 SHA256 0a9c736041f99fbf8749046a430d90ca04445c0d1ac198c3eefec35cb590c876
+MISC ChangeLog 50579 RMD160 4051b4fe23d2d36df4bbd73b894ee41ff49ebd77 SHA1 749ee1155bd55f1bd9887176d7a79ed5f8c81a35 SHA256 766b254f9be756bf6f43345f369f4f321cbeb273431d9ec85deb463133910fcb
 MISC metadata.xml 900 RMD160 bbe25dee100a0a3158ca5cdb78e142adbc8a7cd6 SHA1 0d199202747a7e8fc420f4fa7172877d865e16c9 SHA256 67b5344a7a88e6d04a4df5958625bc175514692e5e0f5a9c441ebbbcf9bb2750
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild
index df7b5d168c78..503f8c976135 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild,v 1.2 2012/05/05 08:27:19 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/audacious-plugins/audacious-plugins-3.2.2-r1.ebuild,v 1.3 2012/05/07 17:58:12 jdhore Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
 IUSE="aac adplug alsa bs2b cdda cue ffmpeg flac fluidsynth gnome +gtk gtk3 ipv6 jack
-lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sid sndfile vorbis wavpack"
+lame libnotify libsamplerate midi mms mp3 mtp nls oss pulseaudio scrobbler sdl sid sndfile vorbis wavpack"
 
 RDEPEND="app-arch/unzip
 	>=dev-libs/dbus-glib-0.60
@@ -48,6 +48,7 @@ RDEPEND="app-arch/unzip
 	mtp? ( media-libs/libmtp )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
 	scrobbler? ( net-misc/curl )
+	sdl? ( media-libs/libsdl[audio] )
 	sid? ( >=media-libs/libsidplay-2.1.1-r2 )
 	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
 	vorbis? ( >=media-libs/libvorbis-1.2.0
@@ -70,6 +71,7 @@ mp3_warning() {
 
 src_prepare() {
 	epatch "$FILESDIR"/${P}-fix-build-gmodule.patch
+	epatch "$FILESDIR"/${P}-fix-build-sdl.patch
 	eaclocal -I m4
 	eautoheader
 	eautoconf
@@ -107,6 +109,7 @@ src_configure() {
 		$(use_enable oss) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable scrobbler) \
+		$(use_enable sdl sdlout) \
 		$(use_enable sid) \
 		$(use_enable sndfile) \
 		$(use_enable vorbis) \
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-sdl.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-sdl.patch
new file mode 100644
index 000000000000..8f6fda0ba1b2
--- /dev/null
+++ b/media-plugins/audacious-plugins/files/audacious-plugins-3.2.2-fix-build-sdl.patch
@@ -0,0 +1,19 @@
+commit b6df18997dabe37f4357d977d2dfae07899be5e7
+Author: Michał Lipski <tallica@o2.pl>
+Date:   Mon May 7 12:48:23 2012 +0200
+
+    Use pkg-config for libsdl detection. (Gentoo #414999)
+
+diff --git a/configure.ac b/configure.ac
+index 358f841..cbba0ce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -693,7 +693,7 @@ AC_ARG_ENABLE(sdlout,
+  [enable_sdlout=$enableval], [enable_sdlout=yes])
+ 
+ if test $enable_sdlout = yes ; then
+-    AM_PATH_SDL(1.2.5, [enable_sdlout=yes], [enable_sdlout=no])
++    PKG_CHECK_MODULES([SDL], [sdl >= 1.2.11], [enable_sdlout=yes], [enable_sdlout=no])
+ fi
+ 
+ if test $enable_sdlout = yes ; then