applied patch to make distcc compiling possible. fixes bug #77235

Package-Manager: portage-2.0.51-r14

4 files changed, 39 insertions, 45 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 20f29c9c8e3f..c53a42f9a481 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.259 2005/01/22 21:27:47 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.260 2005/01/23 21:06:37 luckyduck Exp $
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
+  applied patch to make distcc compiling possible. fixes bug #77235
 
   23 Jan 2005; Chris White <chriswhite@gentoo.org>
   mplayer-1.0_pre5-r5.ebuild, mplayer-1.0_pre6.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index c0f044d5ebd9..513a036c37aa 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,51 +1,41 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c84aadb519bfcce14ab50a4a06332cf4 ChangeLog 47690
-MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
-MD5 e59af451f7a05b0044a687f413bf4720 mplayer-1.0_pre4-r7.ebuild 12225
+MD5 90701c1f5adeb4f72b4491f6e69a17c2 mplayer-1.0_pre5-r5.ebuild 16398
 MD5 c098282cf0148b2caac4682eceec5258 mplayer-1.0_pre5-r2.ebuild 14050
-MD5 101520d159844f194c02877d2c7e30d4 mplayer-1.0_pre5-r3.ebuild 14870
+MD5 b300fe7d8ea556f9a026083db2c42674 mplayer-1.0_pre6.ebuild 15514
 MD5 db18f76ee40620f5142febc063834345 mplayer-1.0_pre5-r4.ebuild 16471
-MD5 52869cb3458f68afee315aa58fb31e83 mplayer-1.0_pre5-r5.ebuild 16401
-MD5 e7e189c8f92024e6225efb090f1a83d1 mplayer-1.0_pre6.ebuild 15503
+MD5 e59af451f7a05b0044a687f413bf4720 mplayer-1.0_pre4-r7.ebuild 12225
+MD5 f3957441c462da934e5f9d3c1507d188 ChangeLog 47865
+MD5 101520d159844f194c02877d2c7e30d4 mplayer-1.0_pre5-r3.ebuild 14870
+MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
+MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534
+MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
+MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
 MD5 59120b22317a30fb88a5e4946eaed3f0 files/mplayer-nl.patch 673
-MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
+MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
+MD5 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
+MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
+MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
+MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
+MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
+MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613
+MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459
+MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
+MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
+MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
+MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
+MD5 6db752d3b5857f1b7c5a9446bec070f7 files/digest-mplayer-1.0_pre6 511
+MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
+MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
+MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597
+MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
+MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353
 MD5 e4581f6934f66ccecc8c1682664623d0 files/digest-mplayer-1.0_pre4-r7 358
 MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r2 440
 MD5 0c3c71bf461e94d4dcffabab341ddeec files/digest-mplayer-1.0_pre5-r3 440
 MD5 3e0467a312a41645fdc9e65b1caf6e83 files/digest-mplayer-1.0_pre5-r4 510
 MD5 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514
-MD5 6db752d3b5857f1b7c5a9446bec070f7 files/digest-mplayer-1.0_pre6 511
-MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
-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 a39bd930af792269808dc4bdbc382fbb files/mplayer-1.0_pre4-altivec-gcc34.patch 650
+MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
 MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre4-help_mp-ro.h.patch 3267
-MD5 09766023054d07a5f795eda66f247c42 files/mplayer-1.0_pre4-mpst.patch 459
-MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
-MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
 MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
-MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
-MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
-MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
-MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597
-MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613
-MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
-MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534
-MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
-MD5 c2d65649f15837c5a326557ded4e47c5 files/mplayer.desktop 119
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
-MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
-MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB8sNvFdQwWVoAgN4RAg3wAJ9d6W6LFINvKiX3/b6pIx/f4Db9RQCgoKEj
-nOLunx1/QBg8kQzGGeOqXXs=
-=iKu2
------END PGP SIGNATURE-----
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
index d0d4257225d5..1864ed8307b4 100644
--- a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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-r5.ebuild,v 1.14 2005/01/22 21:27:47 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.15 2005/01/23 21:06:37 luckyduck Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -436,7 +436,7 @@ src_compile() {
 	# when gif is autodetected, GIF_LIB is set correctly.  We're explicitly controlling it, and it doesn't behave correctly.
 	# so... we have to help it along.
 	if use gif; then
-		sed -e "s:GIF_LIB =:GIF_LIB = -lungif:" -i config.mak
+		sed -e "s:GIF_LIB =:GIF_LIB = -lgif:" -i config.mak
 	fi
 
 	einfo "Make"
diff --git a/media-video/mplayer/mplayer-1.0_pre6.ebuild b/media-video/mplayer/mplayer-1.0_pre6.ebuild
index 40cfe1d87253..a8f532e6064a 100644
--- a/media-video/mplayer/mplayer-1.0_pre6.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.16 2005/01/22 21:27:47 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre6.ebuild,v 1.17 2005/01/23 21:06:38 luckyduck Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -416,7 +416,7 @@ src_compile() {
 		${myconf} || die
 
 	einfo "Make"
-	make all || die "Failed to build MPlayer!"
+	make depend && emake || die "Failed to build MPlayer!"
 	einfo "Make completed"
 
 	# We build the shared libpostproc.so here so that our