minor cleanups

Package-Manager: portage-2.1_pre4-r1

5 files changed, 21 insertions, 58 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 4c3097fba38e..ab5760586681 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.343 2006/02/17 22:48:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.344 2006/02/20 21:29:12 lu_zero Exp $
+
+  20 Feb 2006; Luca Barbato <lu_zero@gentoo.org>
+  -files/mmst_fix_20050415.diff, -files/rtsp_fix_20050415.diff,
+  mplayer-1.0.20060217.ebuild:
+  fixed faad autodetection
 
   17 Feb 2006; Luca Barbato <lu_zero@gentoo.org>
   mplayer-1.0.20060217.ebuild:
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 33db51f48a43..6301b1c379dc 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,6 +1,6 @@
-MD5 b3f6de694b43b9458271d618ea84ac96 ChangeLog 63271
-RMD160 65650a548107f466cc442b6e0be8e54ecb088927 ChangeLog 63271
-SHA256 013655975ca4dd06d7b8869b5a3ed18d7404ce548ef96e6cf925b702beeac2b6 ChangeLog 63271
+MD5 2fe9ecd2698bf54c31bce3cfbdf57628 ChangeLog 63443
+RMD160 daea10059dabd99b46af47e99a3726f407f4be92 ChangeLog 63443
+SHA256 c9350b072f75eab3d6dc95d37a7f8c85da79be56545aa9e00deceba7b19514a8 ChangeLog 63443
 MD5 4165dc479a988a3d1c6424a57d55c447 files/digest-mplayer-1.0.20060102 433
 RMD160 3a7283c34ba67b68f0ffc4d61264507f86dc95ac files/digest-mplayer-1.0.20060102 433
 SHA256 7c4944ecbe21cd6b83e73f498e5e4accef1e1f8d1a6651244b7cb67719c75ed1 files/digest-mplayer-1.0.20060102 433
@@ -10,9 +10,6 @@ SHA256 23f2d81285e075ce277e4c4361b6ca68cf8b6042f8011041b014c2df48098ddf files/di
 MD5 bdc2a05b83ca16773f288d75afe99b33 files/digest-mplayer-1.0_pre7-r1 432
 RMD160 e15bccf47441f6210b2f1cb1cdfb0ae1a2fb54a7 files/digest-mplayer-1.0_pre7-r1 432
 SHA256 1eb44a0c360f6baa94988cf4a0cad549e1ba0f8d21475d70ca4fbf160d853670 files/digest-mplayer-1.0_pre7-r1 432
-MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630
-RMD160 aee1445e5cde243d317e245d38b986f50987c492 files/mmst_fix_20050415.diff 630
-SHA256 1cecb48cc769ce3dd844939285b44979f60887182d5a441d756558a2bd06b93f files/mmst_fix_20050415.diff 630
 MD5 9c52b8b6d2256cc936201aad760823c6 files/mplayer-1.0_pre7-gcc4-amd64.patch 2521
 RMD160 6fdfd5eb60ae9893f74a5bd22ddc59acee1f9126 files/mplayer-1.0_pre7-gcc4-amd64.patch 2521
 SHA256 b59bc7328d50cfb0f1b18ae768ebc90051325a311bc54e4ace2acfc033d5ee8c files/mplayer-1.0_pre7-gcc4-amd64.patch 2521
@@ -31,18 +28,15 @@ SHA256 c14d15c9dbcf89d92f3d5549410e216f97ec5c79a5945830460d7b66ba11e4be files/mp
 MD5 995f560631c6874f08bf6cc9ae01fb08 files/mplayer.desktop 794
 RMD160 f7df35bfad6cb8d1eba2f5b2df9ace117c9f2651 files/mplayer.desktop 794
 SHA256 a3763e82f93b008e202bcb38bd48a65de8f4fd954a8e44b847f0a0f3a83b563d files/mplayer.desktop 794
-MD5 1dc7b4b16903461c2ea8663d5dfc5795 files/rtsp_fix_20050415.diff 634
-RMD160 5340e3272020dfb3aa6e96ef0349092795ef84d1 files/rtsp_fix_20050415.diff 634
-SHA256 dc55b0ccdc8579a1d7975ac6b6d4ca52b9f26f71ac81a4308f253d66ef6aeca1 files/rtsp_fix_20050415.diff 634
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158
 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 metadata.xml 158
 MD5 68d6838c693d5653b1f80338c2f62362 mplayer-1.0.20060102.ebuild 16567
 RMD160 a1b140211aea5339a422a05508af294a1a9c1ee5 mplayer-1.0.20060102.ebuild 16567
 SHA256 b3bb40df9c6f98ac15c7f4ec9c521e753c93dee65466a2883e8c13ca622ba345 mplayer-1.0.20060102.ebuild 16567
-MD5 54c003bec41a4879179778595ad3e12f mplayer-1.0.20060217.ebuild 16613
-RMD160 e58db2b8570222ff3a80f7164e7716893eca9c28 mplayer-1.0.20060217.ebuild 16613
-SHA256 045d25858192a1fe64a45291a057f29702566ee59d0c2610411f57fea841d6a5 mplayer-1.0.20060217.ebuild 16613
+MD5 8eb3b1b400fb4673ae40b1d2dc66564b mplayer-1.0.20060217.ebuild 16623
+RMD160 cce9bc07ed7119ee67eb30fc625b01bbbda305b4 mplayer-1.0.20060217.ebuild 16623
+SHA256 43bd31dd2c01acb150ff16652a50854f811a1512a005ebb84f97b197b91b7bea mplayer-1.0.20060217.ebuild 16623
 MD5 c14023b29e9f342df8ed9457db1253f4 mplayer-1.0_pre7-r1.ebuild 16913
 RMD160 73903913b9601e66b36716760ae61a9f52c22431 mplayer-1.0_pre7-r1.ebuild 16913
 SHA256 e799d7beb1b7a985cf9779b367657d6cbbb75c05332c401971d87462d0a5953f mplayer-1.0_pre7-r1.ebuild 16913
diff --git a/media-video/mplayer/files/mmst_fix_20050415.diff b/media-video/mplayer/files/mmst_fix_20050415.diff
deleted file mode 100644
index 43f4c5c1919a..000000000000
--- a/media-video/mplayer/files/mmst_fix_20050415.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN MPlayer-1.0pre5try2_old/libmpdemux/asf_mmst_streaming.c MPlayer-1.0pre5try2/libmpdemux/asf_mmst_streaming.c
---- MPlayer-1.0pre5try2_old/libmpdemux/asf_mmst_streaming.c	2004-12-15 22:18:31.000000000 +0100
-+++ MPlayer-1.0pre5try2/libmpdemux/asf_mmst_streaming.c	2005-04-16 09:43:16.000000000 +0200
-@@ -334,8 +334,12 @@
- 
-       printf ("stream object, stream id: %d\n", stream_id);
- 
-+      if (num_stream_ids < 20) {
-       stream_ids[num_stream_ids] = stream_id;
-       num_stream_ids++;
-+      } else {
-+        printf ("too many id, stream skipped");
-+      }
-       
-     } else {
-       printf ("unknown object\n");
diff --git a/media-video/mplayer/files/rtsp_fix_20050415.diff b/media-video/mplayer/files/rtsp_fix_20050415.diff
deleted file mode 100644
index 229157818284..000000000000
--- a/media-video/mplayer/files/rtsp_fix_20050415.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ruN MPlayer-1.0pre5try2_old/libmpdemux/realrtsp/rtsp.c MPlayer-1.0pre5try2/libmpdemux/realrtsp/rtsp.c
---- MPlayer-1.0pre5try2_old/libmpdemux/realrtsp/rtsp.c	2004-06-26 12:38:26.000000000 +0200
-+++ MPlayer-1.0pre5try2/libmpdemux/realrtsp/rtsp.c	2005-04-16 09:41:22.000000000 +0200
-@@ -397,6 +397,7 @@
-   unsigned int answer_seq;
-   char **answer_ptr=s->answers;
-   int code;
-+  int ans_count = 0;
-   
-   answer=rtsp_get(s);
-   if (!answer)
-@@ -448,7 +449,7 @@
-     }
-     *answer_ptr=answer;
-     answer_ptr++;
--  } while (strlen(answer)!=0);
-+  } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
-   
-   s->cseq++;
-   
diff --git a/media-video/mplayer/mplayer-1.0.20060217.ebuild b/media-video/mplayer/mplayer-1.0.20060217.ebuild
index a0722dd8c825..13d4f29714f0 100644
--- a/media-video/mplayer/mplayer-1.0.20060217.ebuild
+++ b/media-video/mplayer/mplayer-1.0.20060217.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060217.ebuild,v 1.3 2006/02/17 22:48:25 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20060217.ebuild,v 1.4 2006/02/20 21:29:12 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca
 lirc live livecd lzo mad matroska matrox mmx mmxext musepack nas nls nvidia
 vorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype
 v4l v4l2 win32codecs X xanim xinerama xmms xv xvid xvmc"
-# openal 
+# openal
 BLUV=1.4
 SVGV=1.9.17
 
@@ -233,8 +233,8 @@ src_compile() {
 
 
 
-	#FIXME make it work in the snapshot
-	local myconf="--disable-x264"
+	#FIXME make x264 work in the snapshot
+	local myconf="--disable-x264 --disable-external-faad"
 	################
 	#Optional features#
 	###############
@@ -487,12 +487,12 @@ src_install() {
 
 	einfo "Make install"
 	make prefix=${D}/usr \
-	     BINDIR=${D}/usr/bin \
+		 BINDIR=${D}/usr/bin \
 		 LIBDIR=${D}/usr/$(get_libdir) \
-	     CONFDIR=${D}/usr/share/mplayer \
-	     DATADIR=${D}/usr/share/mplayer \
-	     MANDIR=${D}/usr/share/man \
-	     install || die "Failed to install MPlayer!"
+		 CONFDIR=${D}/usr/share/mplayer \
+		 DATADIR=${D}/usr/share/mplayer \
+		 MANDIR=${D}/usr/share/man \
+		 install || die "Failed to install MPlayer!"
 	einfo "Make install completed"
 
 	dodoc AUTHORS ChangeLog README