diff options
| author |   Jeff Horelick <jdhore@gentoo.org> | 2012-05-07 17:58:12 +0000 |
|---|---|---|
| committer | Jeff Horelick <jdhore@gentoo.org> | 2012-05-07 17:58:12 +0000 |
| commit | 972815c0bc0969e8b450c757d6ca64bf646141fa (patch) | |
| tree | 9d20dbf4a928c713afefd218797eee9089ad7c5e /media-plugins | |
| parent | Version bump. (diff) | |
| download | gentoo-2-972815c0bc0969e8b450c757d6ca64bf646141fa.tar.gz gentoo-2-972815c0bc0969e8b450c757d6ca64bf646141fa.tar.bz2 gentoo-2-972815c0bc0969e8b450c757d6ca64bf646141fa.zip | |
Add patch from upstream for fixing build with sdl (upstream commit b6df18997dabe). Gentoo bug #414999
(Portage version: 2.2.0_alpha101/cvs/Linux i686)
Diffstat (limited to 'media-plugins')
3 files changed, 31 insertions, 3 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/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 |