minor cleanups

(Portage version: 2.1_pre4-r1)

4 files changed, 15 insertions, 46 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/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