Ok, while we're off breaking things, let's stop by mplayer too. So... I backported the giflib detection from pre6 configure to pre5-r5. Now they act the same (though I'm still forcing giflib for all intensive purposes as the main gif lib and upstream supports it...). That's all.

4 files changed, 87 insertions, 18 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c82024d92362..6a4aba150554 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.265 2005/02/03 22:19:24 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.266 2005/02/04 21:49:38 chriswhite Exp $
+
+  05 Feb 2005; Chris White <chriswhite@gentoo.org> +files/mplayer-gif.patch,
+  mplayer-1.0_pre5-r5.ebuild:
+  Fixed giflib support by backing mplayer pre6 giflib detection.
 
   04 Feb 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 f9a5ad06c46a..00fa43ad0baa 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bc24484c9f506e1d7084d026cabed208 ChangeLog 48755
+MD5 785fa1226f654152d7880ac2be3ddf02 ChangeLog 48928
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 e59af451f7a05b0044a687f413bf4720 mplayer-1.0_pre4-r7.ebuild 12225
 MD5 c098282cf0148b2caac4682eceec5258 mplayer-1.0_pre5-r2.ebuild 14050
 MD5 101520d159844f194c02877d2c7e30d4 mplayer-1.0_pre5-r3.ebuild 14870
 MD5 db18f76ee40620f5142febc063834345 mplayer-1.0_pre5-r4.ebuild 16471
+MD5 56e73a4c7dfea23749473a881b6d1325 mplayer-1.0_pre5-r5.ebuild 16469
 MD5 c9b4e8f146431b587b50f92faafed28a mplayer-1.0_pre6.ebuild 15917
-MD5 46aa1ba15a49e27a01aa10bdc1945392 mplayer-1.0_pre5-r5.ebuild 16605
 MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
 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
@@ -30,10 +28,7 @@ MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch
 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
@@ -41,12 +36,18 @@ 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
+MD5 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514
+MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613
+MD5 6db752d3b5857f1b7c5a9446bec070f7 files/digest-mplayer-1.0_pre6 511
+MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534
+MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353
 MD5 475b283b41206562f0ee5ad28ff141e7 files/mplayer-avi_crash.patch 1388
 MD5 59120b22317a30fb88a5e4946eaed3f0 files/mplayer-nl.patch 673
+MD5 d58a5b4657be0c3010eff827e6970371 files/mplayer-gif.patch 1694
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFCAqN4FdQwWVoAgN4RAoP5AKDxy9SFW85HwGX5rhx9KfgcJkZl0gCfWWLw
-LLDgGsoqM48sa9OOjQ1ci6w=
-=gjTk
+iD8DBQFCA+4CFdQwWVoAgN4RAnvzAJ4qk+hv7pLl7pm/Tcrxn7Bdo3JIDQCgw6oj
+ZGbcV+uj48JE6RyTOuNogvU=
+=YFQq
 -----END PGP SIGNATURE-----
diff --git a/media-video/mplayer/files/mplayer-gif.patch b/media-video/mplayer/files/mplayer-gif.patch
new file mode 100644
index 000000000000..5f8ff60003c1
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-gif.patch
@@ -0,0 +1,66 @@
+--- MPlayer-1.0pre5try2/configure	2004-12-19 03:17:24.000000000 +0900
++++ MPlayer-1.0pre6/configure	2004-12-24 00:36:00.000000000 +0900
+@@ -3719,7 +3965,42 @@
+ fi
+ 
+ 
++
++echocheck "PNM support"
++if test "$_pnm" = yes; then
++  _def_pnm="#define HAVE_PNM"
++  _vosrc="$_vosrc vo_pnm.c"
++  _vomodules="pnm $_vomodules"
++else
++  _def_pnm="#undef HAVE_PNM"
++  _novomodules="pnm $_novomodules"
++fi
++echores "$_pnm"
++
++
++
++echocheck "md5sum support"
++if test "$_md5sum" = yes; then
++  _def_md5sum="#define HAVE_MD5SUM"
++  _vosrc="$_vosrc vo_md5sum.c md5sum.c"
++  _vomodules="md5sum $_vomodules"
++else
++  _def_md5sum="#undef HAVE_MD5SUM"
++  _novomodules="md5sum $_novomodules"
++fi
++echores "$_md5sum"
++
++
++
+ echocheck "GIF support"
++# This is to appease people who want to force gif support.
++# If it is forced to yes, then we still do checks to determine
++# which gif library to use.
++if test "$_gif" = yes ; then
++  _force_gif=yes
++  _gif=auto
++fi
++
+ if test "$_gif" = auto ; then
+   _gif=no
+ cat > $TMPC << EOF
+@@ -3743,6 +4024,20 @@
+   fi
+ fi
+ 
++# If no library was found, and the user wants support forced,
++# then we force it on with libgif, as this is the safest
++# assumption IMHO.  (libungif & libregif both create symbolic
++# links to libgif.  We also assume that no x11 support is needed,
++# because if you are forcing this, then you _should_ know what
++# you are doing.  [ Besides, package maintainers should never
++# have compiled x11 deps into libungif in the first place. ] )
++# </rant>
++#   --Joey
++if test "$_force_gif" = yes && test "$_gif" = no ; then
++  _gif=yes
++  _ld_gif="-lgif"
++fi
++
+ if test "$_gif" = yes ; then
+   _def_gif='#define HAVE_GIF 1'
+   _vosrc="$_vosrc vo_gif89a.c"
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
index 7d05a98cfb00..0831d8ca80b5 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.19 2005/02/03 22:19:24 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild,v 1.20 2005/02/04 21:49:38 chriswhite Exp $
 
 inherit eutils flag-o-matic kernel-mod
 
@@ -162,6 +162,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-bio2jack.patch
 
 	use ppc64 && epatch ${FILESDIR}/${P}-r4-ppc64.patch
+
+	# backport the gif recognition from pre6...
+	# yay! - Chris
+	epatch ${FILESDIR}/${PN}-gif.patch
 }
 
 linguas_warn() {
@@ -442,12 +446,6 @@ src_compile() {
 		--with-x11incdir=/usr/X11R6/include \
 		${myconf} || die
 
-	# 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 = -lgif:" -i config.mak
-	fi
-
 	einfo "Make"
 	make all || die "Failed to build MPlayer!"
 	einfo "Make completed"