Moved jack support back to -r3 to fix compilation on systems with jack installed.

3 files changed, 24 insertions, 14 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 2ab7167c7b13..80d2b30b640d 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.204 2004/09/22 20:16:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.205 2004/09/28 07:07:18 eradicator Exp $
+
+  27 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mplayer-1.0_pre5-r3.ebuild:
+  Moved jack support back to -r3 to fix compilation on systems with jack
+  installed.
 
   22 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org>
   mplayer-1.0_pre5-r4.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index ad81fe81a7f9..0e50e1ef937f 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,32 +1,32 @@
-MD5 7fda68c520aba447727595e9f49b95c2 ChangeLog 38174
+MD5 78e6b8ffb5771b8cfc9f60c4aecca431 ChangeLog 38349
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
+MD5 599d67abcb4c6196bb54cf4093afa52e mplayer-1.0_pre5-r3.ebuild 15469
+MD5 1b72c48acf29fe984cf75f4f0fed884a mplayer-1.0_pre5-r4.ebuild 15159
 MD5 a85740a291e190516009abeccd91c6f7 mplayer-1.0_pre4-r7.ebuild 12611
 MD5 42e71d724dca61a5ebe33d0c347f4e4f mplayer-1.0_pre5-r2.ebuild 14285
-MD5 838702974f7babceda0687b9e2e737a9 mplayer-1.0_pre5-r3.ebuild 15264
-MD5 1b72c48acf29fe984cf75f4f0fed884a mplayer-1.0_pre5-r4.ebuild 15159
 MD5 88afe4c7008da4f33b5b89ddc1ab8069 files/digest-mplayer-1.0_pre5-r3 527
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
 MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459
 MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r4 440
 MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
 MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
 MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
+MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
+MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
 MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
 MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre4-alsa-gcc34.patch 299
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
 MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
 MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
+MD5 b72a70cd788b73c1012ebe763e1125f6 files/digest-mplayer-1.0_pre4-r7 445
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
 MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
 MD5 ad254e1f8a5166ae1c5b53bc3c76ffd2 files/mplayer-1.0_pre5-yuv2rbg_kludge.patch 12585
-MD5 b72a70cd788b73c1012ebe763e1125f6 files/digest-mplayer-1.0_pre4-r7 445
 MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
-MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
 MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
 MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
-MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
+MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
 MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
 MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild
index 8b9aab802c64..2d561958add8 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild,v 1.5 2004/09/06 20:42:39 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r3.ebuild,v 1.6 2004/09/28 07:07:18 eradicator Exp $
 
 inherit eutils flag-o-matic kmod
 
-IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas network nls nvidia oggvorbis opengl oss png rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xinerama xmms xv xvid xvmc"
+IUSE="3dfx 3dnow 3dnowex aalib alsa altivec arts bidi debug divx4linux doc dvb cdparanoia directfb dvd dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca lirc live lzo mad matroska matrox mpeg mmx mmx2 mythtv nas network nls nvidia oggvorbis opengl oss png rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -71,6 +71,7 @@ RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
 		)
 	truetype? ( >=media-libs/freetype-2.1 )
 	xinerama? ( virtual/x11 )
+	!mips? ( !hppa? ( !ia64? ( !alpha? ( jack? ( >=media-libs/bio2jack-0.3 ) ) ) ) )
 	xmms? ( media-sound/xmms )
 	>=sys-apps/portage-2.0.36"
 
@@ -172,6 +173,9 @@ src_unpack() {
 	# Remove kernel-2.6 workaround as the problem it works around is
 	# fixed, and the workaround breaks sparc
 	use sparc && sed -i 's:#define __KERNEL__::' osdep/kerneltwosix.h
+
+	# Doesn't break if bio2jack is in
+	epatch ${FILESDIR}/${P}-bio2jack.patch
 }
 
 src_compile() {
@@ -220,6 +224,7 @@ src_compile() {
 	myconf="${myconf} $(use_enable truetype freetype)"
 	myconf="${myconf} $(use_enable v4l tv-v4l)"
 	myconf="${myconf} $(use_enable v4l2 tv-v4l2)"
+	myconf="${myconf} $(use_enable jack)"
 
 	#########
 	# Codecs #