removed old vulnerable version and unneeded patches.

(Portage version: 2.0.51.21)

27 files changed, 36 insertions, 3152 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index 13b72a3d1957..9526568bd9a2 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,26 @@
 # 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.305 2005/04/25 08:44:58 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.306 2005/05/05 15:26:40 luckyduck Exp $
+
+  05 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  -files/mplayer-0.90-coreutils-fixup.patch, -files/mplayer-1.0-gtk2.patch,
+  -files/mplayer-1.0_pre5-alsa-gcc34.patch,
+  -files/mplayer-1.0_pre5-bio2jack.patch,
+  -files/mplayer-1.0_pre5-configure.patch,
+  -files/mplayer-1.0_pre5-gcc_detection.patch,
+  -files/mplayer-1.0_pre5-help_mp-ro.h.patch,
+  -files/mplayer-1.0_pre5-live.patch,
+  -files/mplayer-1.0_pre5-mga-kernel-2.6.patch,
+  -files/mplayer-1.0_pre5-mips64.patch,
+  -files/mplayer-1.0_pre5-r1-conf_locale.patch,
+  -files/mplayer-1.0_pre5-r4-ppc64.patch,
+  -files/mplayer-1.0_pre5-r5-configure.patch,
+  -files/mplayer-1.0_pre5-yuv2rgb_fix.patch, -files/cachefill.patch,
+  -files/gui_vuln_code.patch, -files/mplayer-gif.patch,
+  -files/mplayer-odml.patch, -files/mplayer-x11.patch,
+  -files/real_demux.patch, -files/str_undefined.patch, -files/strl.c,
+  -files/vuln02-fix.diff, -mplayer-1.0_pre5-r5.ebuild:
+  removed old vulnerable version and unneeded patches.
 
   25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
   +files/mplayer-1.0_pre7-gcc4.patch,
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 5d4a340b3f0b..1fc58aa4d474 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,59 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 211ad7e953c470d98d76ced823f35c47 mplayer-1.0_pre6-r4.ebuild 18378
-MD5 45e2a019f7e6f9fdc7bda68ff8d19f10 mplayer-1.0_pre6-r5.ebuild 18461
 MD5 4579e54df9280b2bf36ae418ef98d91e mplayer-1.0_pre7.ebuild 17888
-MD5 c945ac8c09c7da17a796b378b50f54b5 ChangeLog 56593
+MD5 211ad7e953c470d98d76ced823f35c47 mplayer-1.0_pre6-r4.ebuild 18378
 MD5 358ffd02ff69efeb5e332a34f050e37f mplayer-1.0_pre6-r6.ebuild 18391
+MD5 45e2a019f7e6f9fdc7bda68ff8d19f10 mplayer-1.0_pre6-r5.ebuild 18461
+MD5 3b90eaadc632609b04c6bcacb0148c8b ChangeLog 57566
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 31a76aa868e3aa8e73c045e465393118 mplayer-1.0_pre5-r5.ebuild 18497
-MD5 c54c7ba8e18c8e7f3412c6d6939d010a files/mplayer-1.0-gtk2.patch 5903
-MD5 a9fa1b94e4e3842e2c5e552644b03eaa files/mplayer-1.0_pre5-alsa-gcc34.patch 299
-MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281
+MD5 9ca8563e7f6df3496b972f87feabd6c0 files/mplayer-1.0_pre6-configure.patch 534
+MD5 c2e82dbe0e7b780adcbe9bfb902b8654 files/mplayer-1.0_pre6-pic.patch 18233
 MD5 59120b22317a30fb88a5e4946eaed3f0 files/mplayer-nl.patch 673
-MD5 4be5ce1a1c93b8d40bc961468fcc1aa7 files/mplayer-1.0_pre5-live.patch 378
+MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630
+MD5 6748b8218fbe9ff36efcec61c749a346 files/mplayer-1.0_pre6-codecs.patch 1264
+MD5 a8ffa5151727e9dd008d95a6553948bb files/mplayer-gcc_detection.patch 780
+MD5 475b283b41206562f0ee5ad28ff141e7 files/mplayer-avi_crash.patch 1388
+MD5 c08980a7e7ffcb5793e929cf25cf349e files/mplayer-1.0_pre7-gcc_detection.patch 788
+MD5 2dc9c3b558bde75c56ddd33331a5d04d files/mplayer.desktop 793
+MD5 62d91cee9c8499fb0186fd7597c725f7 files/digest-mplayer-1.0_pre7 428
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre6-ppc64.patch 353
 MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r4 429
 MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r5 429
+MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r6 429
 MD5 1dc7b4b16903461c2ea8663d5dfc5795 files/rtsp_fix_20050415.diff 634
-MD5 f56773d6c12d0e9bf91edfe8a1f7551d files/digest-mplayer-1.0_pre5-r5 514
-MD5 2dc9c3b558bde75c56ddd33331a5d04d files/mplayer.desktop 793
-MD5 1056be7554e42ba655fd7423fe6baad7 files/mplayer-1.0_pre5-mips64.patch 459
-MD5 62d91cee9c8499fb0186fd7597c725f7 files/digest-mplayer-1.0_pre7 428
-MD5 42733acde24d84c1482db03c777360ab files/mplayer-1.0_pre5-help_mp-ro.h.patch 3267
-MD5 1479661ba42d9647f03f2029efcc8565 files/mplayer-1.0_pre5-bio2jack.patch 2691
-MD5 7f52d1618f675149115ecf8d313b497e files/mplayer-1.0_pre5-yuv2rgb_fix.patch 19505
 MD5 3d94fd5886df3b60fe2606c4dee9d1dd files/mplayer-1.0_pre7-gcc4.patch 6412
-MD5 a71fc9832d953424652af1125fb7ea64 files/mplayer-0.90-coreutils-fixup.patch 1857
-MD5 f2d6c259271fd9abc036acd72a26d376 files/mplayer-1.0_pre5-r4-ppc64.patch 597
-MD5 a657a67a5658b998acc23a00ffa3951e files/mplayer-1.0_pre5-r5-configure.patch 613
-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 d58a5b4657be0c3010eff827e6970371 files/mplayer-gif.patch 1694
-MD5 34f948b8f242a2aadb53a1e2b00e3155 files/vuln02-fix.diff 467
-MD5 4530ba68fc882c8c4b1fc3a2399d3152 files/mplayer-x11.patch 593
-MD5 a8ffa5151727e9dd008d95a6553948bb files/mplayer-gcc_detection.patch 780
 MD5 68f89231bdbc972ac6abf45a135c8282 files/mplayer-jack.patch 272
-MD5 443b9526abb33e4e9f8786f764253b53 files/mplayer-1.0_pre5-gcc_detection.patch 445
-MD5 13bcf07a21789edf9b2f7b7935828b5b files/digest-mplayer-1.0_pre6-r6 429
-MD5 6748b8218fbe9ff36efcec61c749a346 files/mplayer-1.0_pre6-codecs.patch 1264
-MD5 1f9260386b063367f192b6d5d65d6aea files/real_demux.patch 3107
-MD5 7d81475ff0d1ba01de3b714d6dcc4891 files/gui_vuln_code.patch 17981
-MD5 5cc95d6b380dc27e5ceae0f53ab88f99 files/mplayer-1.0_pre5-mga-kernel-2.6.patch 15043
-MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630
-MD5 c2e82dbe0e7b780adcbe9bfb902b8654 files/mplayer-1.0_pre6-pic.patch 18233
-MD5 484c45fb52a157c6b056b4298f787f3d files/cachefill.patch 6053
-MD5 c08980a7e7ffcb5793e929cf25cf349e files/mplayer-1.0_pre7-gcc_detection.patch 788
-MD5 d77341e4aea32e3e992f01ce5cc12ae0 files/mplayer-1.0_pre5-r1-conf_locale.patch 853
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 65d49d490b98ac8cabcafc5cb439825c files/mplayer-odml.patch 730
-MD5 c39b2e0baa9cc24d22b62765776426ad files/str_undefined.patch 1845
-MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCb48P1ZcsMnZjRyIRAtbmAJ9W1l7enCJhPTLh2VQHaJ5HqP+EHACgkcDW
-DGrlHwh3hwLoqtFdYtzw8Wg=
-=3STf
------END PGP SIGNATURE-----
diff --git a/media-video/mplayer/files/cachefill.patch b/media-video/mplayer/files/cachefill.patch
deleted file mode 100644
index b12ffdb403b3..000000000000
--- a/media-video/mplayer/files/cachefill.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff -Naur MPlayer-1.0pre4.orig/cfg-common.h MPlayer-1.0pre4/cfg-common.h
---- MPlayer-1.0pre4.orig/cfg-common.h	2004-04-26 01:53:41.000000000 -0700
-+++ MPlayer-1.0pre4/cfg-common.h	2004-07-03 03:32:15.000000000 -0700
-@@ -10,8 +10,10 @@
- // ------------------------- stream options --------------------
- 
- #ifdef USE_STREAM_CACHE
--	{"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 4, 65536, NULL},
-+	{"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 32, 262144, NULL},
- 	{"nocache", &stream_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL},
-+	{"cache-min", &stream_cache_min_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
-+	{"cache-prefill", &stream_cache_prefill_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
- #else
- 	{"cache", "MPlayer was compiled WITHOUT cache2 support\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
- #endif
-diff -Naur MPlayer-1.0pre4.orig/etc/example.conf MPlayer-1.0pre4/etc/example.conf
---- MPlayer-1.0pre4.orig/etc/example.conf	2004-01-13 01:55:40.000000000 -0800
-+++ MPlayer-1.0pre4/etc/example.conf	2004-07-03 03:32:15.000000000 -0700
-@@ -116,6 +116,8 @@
- 			# etc)
- 
- cache		= 8192	# use 8Mb input cache by default
-+cache-min	= 20.0  # Prefill 20% of the cache before initially playing
-+cache-prefill	= 5.0   # Prefill 5% of the cache before restarting playback if it empties
- 
- # slang		= en	# DVD : display english subtitles if available
- # alang		= en	# DVD : play english audio tracks if available
-diff -Naur MPlayer-1.0pre4.orig/libmpdemux/cache2.c MPlayer-1.0pre4/libmpdemux/cache2.c
---- MPlayer-1.0pre4.orig/libmpdemux/cache2.c	2003-06-09 05:15:45.000000000 -0700
-+++ MPlayer-1.0pre4/libmpdemux/cache2.c	2004-07-05 14:49:03.441387677 -0700
-@@ -33,6 +33,8 @@
- int stream_fill_buffer(stream_t *s);
- int stream_seek_long(stream_t *s,off_t pos);
- 
-+extern float stream_cache_min_percent;
-+extern float stream_cache_prefill_percent;
- extern int mp_input_check_interrupt(int time);
- 
- typedef struct {
-@@ -207,7 +209,7 @@
- #endif
-   s->fill_limit=8*sector;
-   s->back_size=size/2;
--  s->prefill=size/20; // default: 5%
-+  s->prefill=size * stream_cache_prefill_percent / 100.0;
-   return s;
- }
- 
-@@ -265,7 +267,26 @@
-     // wait until cache is filled at least prefill_init %
-     mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %d [%d] %d  pre:%d  eof:%d  \n",
- 	s->min_filepos,s->read_filepos,s->max_filepos,min,s->eof);
--    while(s->read_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){
-+
-+    // The buffer is determined to be full in cache_fill() when this condition is true:
-+    // s->buffer_size - (s->max_filepos - s->read_filepos) < s->fill_limit
-+    // So we need to make sure that min does not go over s->buffer_size - s->fill_limit
-+    // ie this needs to be always be true:
-+    //     s->buffer_size - (data_in_buffer) >= s->fill_limit
-+    // ==> data_in_buffer <= s->buffer_size - s->fill_limit
-+    //
-+    // So we need to make sure that our min is safe with this condition or else we
-+    // will wait forever for cache_fill() to get to min.
-+    if (min > s->buffer_size - s->fill_limit) {
-+        min = s->buffer_size - s->fill_limit;
-+    }
-+
-+    // Keep waiting for the buffer to fill while:
-+    // We still want to read more: (s->max_filepos - s->read_filepos < min) || (s->read_filepos < s->min_filepos)
-+    // There is data to read in the file: (!s->eof)
-+    while( (s->max_filepos - s->read_filepos < min) || 
-+           (s->read_filepos < s->min_filepos)) {
-+
- 	mp_msg(MSGT_CACHE,MSGL_STATUS,"\rCache fill: %5.2f%% (%d bytes)    ",
- 	    100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size),
- 	    s->max_filepos-s->read_filepos
-diff -Naur MPlayer-1.0pre4.orig/libmpdemux/demuxer.c MPlayer-1.0pre4/libmpdemux/demuxer.c
---- MPlayer-1.0pre4.orig/libmpdemux/demuxer.c	2004-04-17 09:46:40.000000000 -0700
-+++ MPlayer-1.0pre4/libmpdemux/demuxer.c	2004-07-03 03:32:15.000000000 -0700
-@@ -1374,6 +1374,9 @@
- 
- extern int hr_mp3_seek;
- 
-+extern float stream_cache_min_percent;
-+extern float stream_cache_prefill_percent;
-+
- demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){
-   stream_t *as = NULL,*ss = NULL;
-   demuxer_t *vd,*ad = NULL,*sd = NULL;
-@@ -1386,8 +1389,8 @@
-       return NULL;
-     }
-     if(audio_stream_cache) {
--      if(!stream_enable_cache(as,audio_stream_cache*1024,audio_stream_cache*1024/5,
--			      audio_stream_cache*1024/20)) {
-+      if(!stream_enable_cache(as,audio_stream_cache*1024,audio_stream_cache*1024*(stream_cache_min_percent / 100.0),
-+			      audio_stream_cache*1024*(stream_cache_prefill_percent / 100.0))) {
- 	free_stream(as);
- 	mp_msg(MSGT_DEMUXER,MSGL_ERR,"Can't enable audio stream cache\n");
- 	return NULL;
-diff -Naur MPlayer-1.0pre4.orig/mencoder.c MPlayer-1.0pre4/mencoder.c
---- MPlayer-1.0pre4.orig/mencoder.c	2004-04-17 09:46:40.000000000 -0700
-+++ MPlayer-1.0pre4/mencoder.c	2004-07-03 03:32:15.000000000 -0700
-@@ -100,6 +100,9 @@
- int stream_cache_size=-1;
- #ifdef USE_STREAM_CACHE
- extern int cache_fill_status;
-+
-+float stream_cache_min_percent=20.0;
-+float stream_cache_prefill_percent=5.0;
- #else
- #define cache_fill_status 0
- #endif
-diff -Naur MPlayer-1.0pre4.orig/mplayer.c MPlayer-1.0pre4/mplayer.c
---- MPlayer-1.0pre4.orig/mplayer.c	2004-04-26 14:15:13.000000000 -0700
-+++ MPlayer-1.0pre4/mplayer.c	2004-07-03 03:32:15.000000000 -0700
-@@ -249,6 +249,9 @@
-        int stream_cache_size=-1;
- #ifdef USE_STREAM_CACHE
- extern int cache_fill_status;
-+
-+float stream_cache_min_percent=20.0;
-+float stream_cache_prefill_percent=5.0;
- #else
- #define cache_fill_status 0
- #endif
-@@ -1368,7 +1371,7 @@
- #endif
- if(stream_cache_size>0){
-   current_module="enable_cache";
--  if(!stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024/5,stream_cache_size*1024/20))
-+  if(!stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024*(stream_cache_min_percent / 100.0),stream_cache_size*1024*(stream_cache_prefill_percent / 100.0)))
-     if((eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file;
- }
- 
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre5-r5 b/media-video/mplayer/files/digest-mplayer-1.0_pre5-r5
deleted file mode 100644
index dd2a0149de89..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre5-r5
+++ /dev/null
@@ -1,7 +0,0 @@
-MD5 724c905a8dddb7e8ec9722fc585f833d MPlayer-1.0pre5try2.tar.bz2 5073725
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-MD5 48493efca70c570f2cda0134e63cb5df mplayer-1.0_pre5-alsa-gui.patch.tar.bz2 5852
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734
diff --git a/media-video/mplayer/files/gui_vuln_code.patch b/media-video/mplayer/files/gui_vuln_code.patch
deleted file mode 100644
index 69bf0c801c87..000000000000
--- a/media-video/mplayer/files/gui_vuln_code.patch
+++ /dev/null
@@ -1,417 +0,0 @@
-diff -Naur MPlayer-1.0pre4/Gui/Makefile MPlayer-1.0pre5/Gui/Makefile
---- MPlayer-1.0pre4/Gui/Makefile	2003-04-05 00:39:51.000000000 +0900
-+++ MPlayer-1.0pre5/Gui/Makefile	2004-06-28 04:17:24.000000000 +0900
-@@ -27,11 +27,12 @@
- $(LIB):	.depend	$(OBJS)
- 	rm -f $(LIB)
- 	$(AR) rc $(LIB) $(OBJS) $(MPLAYEROBJS)
-+	$(RANLIB) $(LIB)
- 
- all:	$(LIB)
- 
- clean:
--	rm -rf $(OBJS) *.o *~ *.bak main $(PRG) $(LIB) .depend
-+	rm -rf $(OBJS) *.o *~ *.bak main $(LIB) .depend
- 
- #dep:	depend
- #
-diff -Naur MPlayer-1.0pre4/Gui/interface.c MPlayer-1.0pre5/Gui/interface.c
---- MPlayer-1.0pre4/Gui/interface.c	2004-03-26 06:49:47.000000000 +0900
-+++ MPlayer-1.0pre5/Gui/interface.c	2004-06-26 22:26:10.000000000 +0900
-@@ -54,8 +56,12 @@
-  if ( *dest )
-   {
-    tmp=malloc( strlen( *dest ) + strlen( src ) + 1 );
--   strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest ); 
--  }
-+   
-+   if ( tmp ) /* TODO: advanced error handling */
-+    {
-+     strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest ); 
-+    }
-+   }
-   else
-    { tmp=malloc( strlen( src ) + 1 ); strcpy( tmp,src ); }
-  *dest=tmp;
-diff -Naur MPlayer-1.0pre4/Gui/mplayer/common.c MPlayer-1.0pre5/Gui/mplayer/common.c
---- MPlayer-1.0pre4/Gui/mplayer/common.c	2003-03-20 21:42:09.000000000 +0900
-+++ MPlayer-1.0pre5/Gui/mplayer/common.c	2004-06-26 22:54:20.000000000 +0900
-@@ -30,37 +30,41 @@
- #include "play.h"
- #include "widgets.h"
- 
- extern unsigned int GetTimerMS( void );
- 
--inline void TranslateFilename( int c,char * tmp )
-+inline void TranslateFilename( int c,char * tmp,size_t tmplen )
- {
-  int i;
-+ char * p;
-+ 
-  switch ( guiIntfStruct.StreamType )
-   {
-    case STREAMTYPE_STREAM:
--        strcpy( tmp,guiIntfStruct.Filename );
-+        strlcpy(tmp, guiIntfStruct.Filename, tmplen);
-         break;
-    case STREAMTYPE_FILE:
-           if ( ( guiIntfStruct.Filename )&&( guiIntfStruct.Filename[0] ) )
-            {
--	    if ( strrchr( guiIntfStruct.Filename,'/' ) ) strcpy( tmp,strrchr( guiIntfStruct.Filename,'/' ) + 1 );
--	     else strcpy( tmp,guiIntfStruct.Filename );
-+            if ( p = strrchr(guiIntfStruct.Filename, '/') )
-+              strlcpy(tmp, p + 1, tmplen);
-+            else
-+              strlcpy(tmp, guiIntfStruct.Filename, tmplen);
-             if ( tmp[strlen( tmp ) - 4] == '.' ) tmp[strlen( tmp ) - 4]=0;
-             if ( tmp[strlen( tmp ) - 5] == '.' ) tmp[strlen( tmp ) - 5]=0;
--           } else strcpy( tmp,MSGTR_NoFileLoaded );
-+           } else strlcpy( tmp,MSGTR_NoFileLoaded,tmplen );
-           break;
- #ifdef USE_DVDREAD
-    case STREAMTYPE_DVD:
--          if ( guiIntfStruct.DVD.current_chapter ) sprintf( tmp,MSGTR_Chapter,guiIntfStruct.DVD.current_chapter );
--            else strcat( tmp,MSGTR_NoChapter );
-+          if ( guiIntfStruct.DVD.current_chapter ) snprintf(tmp,tmplen,MSGTR_Chapter,guiIntfStruct.DVD.current_chapter );
-+            else strlcat( tmp,MSGTR_NoChapter,tmplen );
-           break;
- #endif
- #ifdef HAVE_VCD
-    case STREAMTYPE_VCD:
--        sprintf( tmp,MSGTR_VCDTrack,guiIntfStruct.Track );
-+        snprintf( tmp,tmplen,MSGTR_VCDTrack,guiIntfStruct.Track );
- 	break;
- #endif
--   default: strcpy( tmp,MSGTR_NoMediaOpened );
-+   default: strlcpy( tmp,MSGTR_NoMediaOpened,tmplen );
-   }
-  if ( c )
-   {
-@@ -74,75 +80,94 @@
-   }
- }
- 
-+/* Unsafe!  Pass only null-terminated strings as (char *)str. */
- char * Translate( char * str )
- {
-  static char   trbuf[512];
-         char   tmp[512];
-         int    i,c;
-         int    t;
-+        int    strsize = 0;
-  memset( trbuf,0,512 );
-  memset( tmp,0,128 );
-- for ( c=0,i=0;i < (int)strlen( str );i++ )
-+ strsize = strlen(str);
-+ for ( c=0,i=0;i < strsize;i++ )
-   {
-    if ( str[i] != '$' ) { trbuf[c++]=str[i]; trbuf[c]=0; }
-     else
-     {
-      switch ( str[++i] )
-       {
--       case 't': sprintf( tmp,"%02d",guiIntfStruct.Track ); strcat( trbuf,tmp ); break;
--       case 'o': TranslateFilename( 0,tmp ); strcat( trbuf,tmp ); break;
--       case 'f': TranslateFilename( 1,tmp ); strcat( trbuf,tmp ); break;
--       case 'F': TranslateFilename( 2,tmp ); strcat( trbuf,tmp ); break;
-+       case 't': snprintf( tmp,sizeof( tmp ),"%02d",guiIntfStruct.Track );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 'o': TranslateFilename( 0,tmp,sizeof( tmp ) );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 'f': TranslateFilename( 1,tmp,sizeof( tmp ) );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 'F': TranslateFilename( 2,tmp,sizeof( tmp ) );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-        case '6': t=guiIntfStruct.LengthInSec; goto calclengthhhmmss;
-        case '1': t=guiIntfStruct.TimeSec;
- calclengthhhmmss:
--            sprintf( tmp,"%02d:%02d:%02d",t/3600,t/60%60,t%60 ); strcat( trbuf,tmp );
-+            snprintf( tmp,sizeof( tmp ),"%02d:%02d:%02d",t/3600,t/60%60,t%60 );
-+            strlcat( trbuf,tmp,sizeof( trbuf ) );
-             break;
-        case '7': t=guiIntfStruct.LengthInSec; goto calclengthmmmmss;
-        case '2': t=guiIntfStruct.TimeSec;
- calclengthmmmmss:
--            sprintf( tmp,"%04d:%02d",t/60,t%60 ); strcat( trbuf,tmp );
-+            snprintf( tmp,sizeof( tmp ),"%04d:%02d",t/60,t%60 );
-+            strlcat( trbuf,tmp,sizeof( trbuf ) );
-             break;
--       case '3': sprintf( tmp,"%02d",guiIntfStruct.TimeSec / 3600 ); strcat( trbuf,tmp ); break;
--       case '4': sprintf( tmp,"%02d",( ( guiIntfStruct.TimeSec / 60 ) % 60 ) ); strcat( trbuf,tmp ); break;
--       case '5': sprintf( tmp,"%02d",guiIntfStruct.TimeSec % 60 ); strcat( trbuf,tmp ); break;
--       case '8': sprintf( tmp,"%01d:%02d:%02d",guiIntfStruct.TimeSec / 3600,( guiIntfStruct.TimeSec / 60 ) % 60,guiIntfStruct.TimeSec % 60 ); strcat( trbuf,tmp ); break;
--       case 'v': sprintf( tmp,"%3.2f%%",guiIntfStruct.Volume ); strcat( trbuf,tmp ); break;
--       case 'V': sprintf( tmp,"%3.1f",guiIntfStruct.Volume ); strcat( trbuf,tmp ); break;
--       case 'b': sprintf( tmp,"%3.2f%%",guiIntfStruct.Balance ); strcat( trbuf,tmp ); break;
--       case 'B': sprintf( tmp,"%3.1f",guiIntfStruct.Balance ); strcat( trbuf,tmp ); break;
--       case 'd': sprintf( tmp,"%d",guiIntfStruct.FrameDrop ); strcat( trbuf,tmp ); break;
--       case 'x': sprintf( tmp,"%d",guiIntfStruct.MovieWidth ); strcat( trbuf,tmp ); break;
--       case 'y': sprintf( tmp,"%d",guiIntfStruct.MovieHeight ); strcat( trbuf,tmp ); break;
--       case 'C': sprintf( tmp,"%s", guiIntfStruct.sh_video? ((sh_video_t *)guiIntfStruct.sh_video)->codec->name : "");
--                 strcat( trbuf,tmp ); break;
--       case 's': if ( guiIntfStruct.Playing == 0 ) strcat( trbuf,"s" ); break;
--       case 'l': if ( guiIntfStruct.Playing == 1 ) strcat( trbuf,"p" ); break;
--       case 'e': if ( guiIntfStruct.Playing == 2 ) strcat( trbuf,"e" ); break;
-+       case '3': snprintf( tmp,sizeof( tmp ),"%02d",guiIntfStruct.TimeSec / 3600 );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case '4': snprintf( tmp,sizeof( tmp ),"%02d",( ( guiIntfStruct.TimeSec / 60 ) % 60 ) );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case '5': snprintf( tmp,sizeof( tmp ),"%02d",guiIntfStruct.TimeSec % 60 );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case '8': snprintf( tmp,sizeof( tmp ),"%01d:%02d:%02d",guiIntfStruct.TimeSec / 3600,( guiIntfStruct.TimeSec / 60 ) % 60,guiIntfStruct.TimeSec % 60 ); strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 'v': snprintf( tmp,sizeof( tmp ),"%3.2f%%",guiIntfStruct.Volume );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 'V': snprintf( tmp,sizeof( tmp ),"%3.1f",guiIntfStruct.Volume );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 'b': snprintf( tmp,sizeof( tmp ),"%3.2f%%",guiIntfStruct.Balance );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 'B': snprintf( tmp,sizeof( tmp ),"%3.1f",guiIntfStruct.Balance );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 'd': snprintf( tmp,sizeof( tmp ),"%d",guiIntfStruct.FrameDrop );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 'x': snprintf( tmp,sizeof( tmp ),"%d",guiIntfStruct.MovieWidth );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 'y': snprintf( tmp,sizeof( tmp ),"%d",guiIntfStruct.MovieHeight );
-+		 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 'C': snprintf( tmp,sizeof( tmp ),"%s", guiIntfStruct.sh_video? ((sh_video_t *)guiIntfStruct.sh_video)->codec->name : "");
-+                 strlcat( trbuf,tmp,sizeof( trbuf ) ); break;
-+       case 's': if ( guiIntfStruct.Playing == 0 ) strlcat( trbuf,"s",sizeof( trbuf ) ); break;
-+       case 'l': if ( guiIntfStruct.Playing == 1 ) strlcat( trbuf,"p",sizeof( trbuf ) ); break;
-+       case 'e': if ( guiIntfStruct.Playing == 2 ) strlcat( trbuf,"e",sizeof( trbuf ) ); break;
-        case 'a':
--            if ( muted ) { strcat( trbuf,"n" ); break; }
-+            if ( muted ) { strlcat( trbuf,"n",sizeof( trbuf ) ); break; }
-             switch ( guiIntfStruct.AudioType )
-              {
--              case 0: strcat( trbuf,"n" ); break;
--              case 1: strcat( trbuf,"m" ); break;
--              case 2: strcat( trbuf,"t" ); break;
-+              case 0: strlcat( trbuf,"n",sizeof( trbuf ) ); break;
-+              case 1: strlcat( trbuf,"m",sizeof( trbuf ) ); break;
-+              case 2: strlcat( trbuf,"t",sizeof( trbuf ) ); break;
-              }
-             break;
-        case 'T':
-            switch ( guiIntfStruct.StreamType )
-             {
--             case STREAMTYPE_FILE:   strcat( trbuf,"f" ); break;
-+             case STREAMTYPE_FILE:   strlcat( trbuf,"f",sizeof( trbuf ) ); break;
- #ifdef HAVE_VCD
--             case STREAMTYPE_VCD:    strcat( trbuf,"v" ); break;
-+             case STREAMTYPE_VCD:    strlcat( trbuf,"v",sizeof( trbuf ) ); break;
- #endif
--             case STREAMTYPE_STREAM: strcat( trbuf,"u" ); break;
-+             case STREAMTYPE_STREAM: strlcat( trbuf,"u",sizeof( trbuf ) ); break;
- #ifdef USE_DVDREAD
--             case STREAMTYPE_DVD:    strcat( trbuf,"d" ); break;
-+             case STREAMTYPE_DVD:    strlcat( trbuf,"d",sizeof( trbuf ) ); break;
- #endif
--             default:                strcat( trbuf," " ); break;
-+             default:                strlcat( trbuf," ",sizeof( trbuf ) ); break;
-             }
-            break;
--       case '$': strcat( trbuf,"$" ); break;
-+       case '$': strlcat( trbuf,"$",sizeof( trbuf ) ); break;
-        default: continue;
-       }
-      c=strlen( trbuf );
-diff -Naur MPlayer-1.0pre4/Gui/mplayer/gtk/about.c MPlayer-1.0pre5/Gui/mplayer/gtk/about.c
---- MPlayer-1.0pre4/Gui/mplayer/gtk/about.c	2003-03-17 09:48:26.000000000 +0900
-+++ MPlayer-1.0pre5/Gui/mplayer/gtk/about.c	2004-06-15 19:52:36.000000000 +0900
-@@ -105,7 +105,6 @@
- 	"     * Bertrand Baudet\n" 
- 	"     * Derek J Witt\n"
- 	"     * Artur Zaprzala\n" 
--	"     * lanzz@lanzz.org\n"
- 	"     * Adam Tla/lka\n"
- 	"     * Folke Ashberg\n"
- 	"     * Kamil-"
-diff -Naur MPlayer-1.0pre4/Gui/skin/skin.c MPlayer-1.0pre5/Gui/skin/skin.c
---- MPlayer-1.0pre4/Gui/skin/skin.c	2003-06-04 02:36:25.000000000 +0900
-+++ MPlayer-1.0pre5/Gui/skin/skin.c	2004-06-26 01:49:52.000000000 +0900
-@@ -116,7 +116,7 @@
- {
-  CHECKDEFLIST( "window" );
- 
-- strcpy( window_name,strlower( in ) );
-+ strlcpy( window_name,strlower( in ),sizeof( window_name ) );
-  if ( !strncmp( in,"main",4 ) ) { currSection=&skinAppMPlayer->main; currSubItem=&skinAppMPlayer->NumberOfItems; currSubItems=skinAppMPlayer->Items; }
-   else if ( !strncmp( in,"sub",3 ) ) currSection=&skinAppMPlayer->sub;
-    else if ( !strncmp( in,"playbar",7 ) ) { currSection=&skinAppMPlayer->bar; currSubItem=&skinAppMPlayer->NumberOfBarItems; currSubItems=skinAppMPlayer->barItems; }
-@@ -147,7 +147,7 @@
-    defList->main.x=x;
-    defList->main.y=y;
-    defList->main.type=itBase;
--   strcpy( tmp,path ); strcat( tmp,fname );
-+   strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); 
-    if ( skinBPRead( tmp,&defList->main.Bitmap ) ) return 1;
-    defList->main.width=defList->main.Bitmap.Width;
-    defList->main.height=defList->main.Bitmap.Height;
-@@ -162,7 +162,7 @@
-  if ( !strcmp( window_name,"sub" ) )
-   {
-    defList->sub.type=itBase;
--   strcpy( tmp,path ); strcat( tmp,fname );
-+   strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); 
-    if ( skinBPRead( tmp,&defList->sub.Bitmap ) ) return 1;
-    defList->sub.x=x;
-    defList->sub.y=y;
-@@ -179,7 +179,7 @@
-   {
-    defList->menuIsPresent=1;
-    defList->menuBase.type=itBase;
--   strcpy( tmp,path ); strcat( tmp,fname );
-+   strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); 
-    if ( skinBPRead( tmp,&defList->menuBase.Bitmap ) ) return 1;
-    defList->menuBase.width=defList->menuBase.Bitmap.Width;
-    defList->menuBase.height=defList->menuBase.Bitmap.Height;
-@@ -197,7 +197,7 @@
-    defList->bar.x=x;
-    defList->bar.y=y;
-    defList->bar.type=itBase;
--   strcpy( tmp,path ); strcat( tmp,fname );
-+   strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); 
-    if ( skinBPRead( tmp,&defList->bar.Bitmap ) ) return 1;
-    defList->bar.width=defList->bar.Bitmap.Width;
-    defList->bar.height=defList->bar.Bitmap.Height;
-@@ -268,7 +268,7 @@
-  currSubItems[ *currSubItem ].Bitmap.Image=NULL;
-  if ( strcmp( fname,"NULL" ) )
-   {
--   strcpy( tmp,path ); strcat( tmp,fname );
-+   strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); 
-    if ( skinBPRead( tmp,&currSubItems[ *currSubItem ].Bitmap ) ) return 1;
-   }
- 
-@@ -289,7 +289,7 @@
- 
-  cutItem( in,fname,',',0 );
-  defList->menuSelected.type=itBase;
-- strcpy( tmp,path ); strcat( tmp,fname );
-+ strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, fname, sizeof( tmp )); 
-  mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"\n[skin] selected: %s\n",fname );
-  if ( skinBPRead( tmp,&defList->menuSelected.Bitmap ) ) return 1;
-  defList->menuSelected.width=defList->menuSelected.Bitmap.Width;
-@@ -381,14 +381,14 @@
-  item->Bitmap.Image=NULL;
-  if ( strcmp( phfname,"NULL" ) )
-   {
--   strcpy( tmp,path ); strcat( tmp,phfname );
-+   strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, phfname, sizeof( tmp )); 
-    if ( skinBPRead( tmp,&item->Bitmap ) ) return 1;
-   }
- 
-  item->Mask.Image=NULL;
-  if ( strcmp( pfname,"NULL" ) )
-   {
--   strcpy( tmp,path ); strcat( tmp,pfname );
-+   strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, pfname, sizeof( tmp )); 
-    if ( skinBPRead( tmp,&item->Mask ) ) return 1;
-   }
-  return 0;
-@@ -445,7 +445,7 @@
-  item->Bitmap.Image=NULL;
-  if ( strcmp( phfname,"NULL" ) )
-   {
--   strcpy( tmp,path ); strcat( tmp,phfname );
-+   strlcpy(tmp, path, sizeof( tmp )); strlcat(tmp, phfname, sizeof( tmp )); 
-    if ( skinBPRead( tmp,&item->Bitmap ) ) return 1;
-   }
-  return 0;
-@@ -655,7 +655,12 @@
- FILE * skinFile;
-  XFlush( wsDisplay );
- 
- void setname( char * item1, char * item2 )
--{ strcpy( fn,item1 ); strcat( fn,"/" ); strcat( fn,item2 ); strcpy( path,fn ); strcat( path,"/" ); strcat( fn,"/skin" ); }
-+{
-+  strlcpy(fn, item1, sizeof( fn ));
-+  strlcat(fn, "/", sizeof( fn )); strlcat(fn, item2, sizeof( fn ));
-+  strlcpy(path, fn, sizeof( path )); strlcat(path, "/", sizeof( path ));
-+  strlcat(fn, "/skin", sizeof( fn ));
-+}
- 
- int skinRead( char * dname )
- {
-diff -Naur MPlayer-1.0pre4/Gui/wm/wm.c MPlayer-1.0pre5/Gui/wm/wm.c
---- MPlayer-1.0pre4/Gui/wm/ws.c	2004-06-25 11:19:47.095450056 +0900
-+++ MPlayer-1.0pre5/Gui/wm/ws.c	2004-06-25 11:23:47.593888736 +0900
-@@ -763,6 +763,7 @@
- #ifdef ENABLE_DPMS
-    wsScreenSaverOn( wsDisplay );
- #endif
-+   vo_x11_ewmh_fullscreen( 0 ); // removes fullscreen state to be added if wm supports EWMH
-   }
-   else
-    {
-@@ -774,6 +775,7 @@
- #ifdef ENABLE_DPMS
-     wsScreenSaverOff( wsDisplay );
- #endif
-+    vo_x11_ewmh_fullscreen( 1 ); // sends fullscreen state to be added if wm supports EWMH
-    }
- 
-  vo_x11_decoration( wsDisplay,win->WindowID,decoration );
-diff -Naur MPlayer-1.0pre4/libvo/x11_common.c MPlayer-1.0pre5/Gui/libvo/x11_common.c
---- MPlayer-1.0pre4/libvo/x11_common.c	2004-06-25 11:24:39.212041584 +0900
-+++ MPlayer-1.0pre5/libvo/x11_common.c	2004-06-25 11:31:05.225358640 +0900
-@@ -117,6 +117,43 @@
- 
- static int vo_x11_get_fs_type(int supported);
- 
-+/*
-+ * Sends the EWMH fullscreen state event.
-+ *
-+ * action: could be on of 0 -- remove state
-+ *                        1 -- add state
-+ *                        2 -- toggle
-+ */
-+void vo_x11_ewmh_fullscreen( int action )
-+{
-+  if ( vo_fs_type & vo_wm_FULLSCREEN )
-+  {
-+    XEvent xev;
-+
-+    /* init X event structure for _NET_WM_FULLSCREEN client msg */
-+    xev.xclient.type = ClientMessage;
-+    xev.xclient.serial = 0;
-+    xev.xclient.send_event = True;
-+    xev.xclient.message_type = XInternAtom( mDisplay,
-+                                            "_NET_WM_STATE", False );
-+    xev.xclient.window = vo_window;
-+    xev.xclient.format = 32;
-+    xev.xclient.data.l[0] = action;
-+    xev.xclient.data.l[1] = XInternAtom( mDisplay,
-+                                         "_NET_WM_STATE_FULLSCREEN", False );
-+    xev.xclient.data.l[2] = 0;
-+    xev.xclient.data.l[3] = 0;
-+    xev.xclient.data.l[4] = 0;
-+
-+    /* finally send that damn thing */
-+    if ( !XSendEvent( mDisplay, DefaultRootWindow( mDisplay ), False,
-+                     SubstructureRedirectMask | SubstructureNotifyMask, &xev ) )
-+    {
-+      mp_msg( MSGT_VO,MSGL_ERR, "\nX11: Couldn't send EWMH fullscreen Event!\n" );
-+    }
-+  }
-+}
-+	
- void vo_hidecursor ( Display *disp , Window win )
- {
- 	Cursor no_ptr;
-@@ -1062,11 +1099,15 @@
- 
-  if ( vo_fs ){
-    // fs->win
-+   vo_x11_ewmh_fullscreen( 0 ); // removes fullscreen state if wm supports EWMH
-+   
-    if(vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight) return;
-    vo_fs=VO_FALSE;
-    x=vo_old_x; y=vo_old_y; w=vo_old_width; h=vo_old_height;
-  } else {
-    // win->fs
-+   vo_x11_ewmh_fullscreen( 1 ); // sends fullscreen state to be added if wm supports EWMH
-+
-    if(vo_old_width && 
-      (vo_dwidth==vo_screenwidth && vo_dwidth!=vo_old_width) &&
-      (vo_dheight==vo_screenheight && vo_dheight!=vo_old_height) ) return;
diff --git a/media-video/mplayer/files/mplayer-0.90-coreutils-fixup.patch b/media-video/mplayer/files/mplayer-0.90-coreutils-fixup.patch
deleted file mode 100644
index 127d9c871403..000000000000
--- a/media-video/mplayer/files/mplayer-0.90-coreutils-fixup.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urpN MPlayer-0.90/configure MPlayer-0.90.CUfixed/configure
---- MPlayer-0.90/configure	2003-03-22 18:29:16.000000000 +0200
-+++ MPlayer-0.90.CUfixed/configure	2003-08-03 09:38:25.000000000 +0200
-@@ -452,7 +452,7 @@ fi
- if test "$_skip_cc_check" != yes ; then
-  for _cc in "$_cc" gcc-3.1 gcc3 gcc-3.0 cc ; do
-   echocheck "$_cc version"
--  cc_name=`( $_cc -v ) 2>&1 | tail -1 | cut -d ' ' -f 1`
-+  cc_name=`( $_cc -v ) 2>&1 | tail -n 1 | cut -d ' ' -f 1`
-   cc_version=`( $_cc -dumpversion ) 2>&1`
-   if test "$?" -gt 0; then
-     cc_version="not found"
-@@ -552,15 +552,15 @@ if x86 || ppc; then
-     _cpuinfo="TOOLS/cpuinfo"
-   fi
- 
--  pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
--  pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -1`
--  pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
--  pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
--  pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
-+  pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -n 1`
-+  pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -n 1`
-+  pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1`
-+  pmodel=`$_cpuinfo | grep -v 'model name' | grep 'model' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1`
-+  pstepping=`$_cpuinfo | grep 'stepping' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1`
- 
--  pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -1`
-+  pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -n 1`
-   if test -z "$pparam" ; then
--    pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -1`
-+    pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -n 1`
-   fi
- 
-   _mmx=no
diff --git a/media-video/mplayer/files/mplayer-1.0-gtk2.patch b/media-video/mplayer/files/mplayer-1.0-gtk2.patch
deleted file mode 100644
index 33d99e3347c2..000000000000
--- a/media-video/mplayer/files/mplayer-1.0-gtk2.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-diff -urN MPlayer-1.0pre3.old/Gui/mplayer/gtk/about.c MPlayer-1.0pre3/Gui/mplayer/gtk/about.c
---- MPlayer-1.0pre3.old/Gui/mplayer/gtk/about.c	2003-03-16 16:48:26.000000000 -0800
-+++ MPlayer-1.0pre3/Gui/mplayer/gtk/about.c	2003-12-11 22:58:54.000000000 -0800
-@@ -28,6 +28,11 @@
-   GtkWidget     * AboutText;
-   GtkWidget     * Ok;
- 
-+#ifdef HAVE_GTK2_GUI
-+  GtkTextBuffer * AboutTextBuffer;
-+  GtkTextIter   iter;
-+#endif //HAVE_GTK2_GUI
-+
-   GtkStyle      * pixmapstyle;
-   GdkPixmap     * pixmapwid;
-   GdkBitmap     * mask;
-@@ -67,11 +72,24 @@
-   gtk_box_pack_start( GTK_BOX( vbox ),scrolledwindow1,TRUE,TRUE,0 );
-   gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolledwindow1 ),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC );
- 
--  AboutText=gtk_text_new( NULL,NULL );
-+  #ifdef HAVE_GTK2_GUI
-+    AboutText = gtk_text_view_new();
-+    AboutTextBuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (AboutText));
-+    gtk_text_buffer_get_iter_at_offset (AboutTextBuffer, &iter, 0);  
-+  #else  
-+    AboutText = gtk_text_new( NULL,NULL );
-+  #endif //HAVE_GTK2_GUI
-+
-   gtk_widget_set_name( AboutText,"AboutText" );
-   gtk_widget_show( AboutText );
-   gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText );
--  gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
-+
-+  #ifdef HAVE_GTK2_GUI  
-+    gtk_text_buffer_insert (AboutTextBuffer, &iter,   
-+  #else  
-+    gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
-+  #endif //HAVE_GTK2_GUI
-+
-   	"\n" 
- 	MSGTR_ABOUT_UHU 
- 	"             (http://www.uhulinux.hu/)\n" 
-diff -urN MPlayer-1.0pre3.old/configure MPlayer-1.0pre3/configure
---- MPlayer-1.0pre3.old/configure	2003-12-08 13:33:31.000000000 -0800
-+++ MPlayer-1.0pre3/configure	2003-12-11 23:12:31.000000000 -0800
-@@ -149,6 +149,7 @@
- Optional features:
-   --disable-mencoder     disable mencoder (a/v encoder) compilation [enable]
-   --enable-gui           enable gmplayer compilation (gtk-1.2 GUI) [disable]
-+  --enable-gtk2          enable gtk2 port of the gui [disable]
-   --enable-largefiles    enable support for files > 2 GBytes [disable]
-   --enable-linux-devfs   set default devices to devfs ones [disable]
-   --enable-termcap       use termcap database for key codes [autodetect]
-@@ -1162,6 +1163,7 @@
- _lirc=auto
- _lircc=auto
- _gui=no
-+_gtk2=no
- _termcap=auto
- _termios=auto
- _3dfx=no
-@@ -1363,6 +1365,8 @@
-   --disable-lircc)	_lircc=no	;;
-   --enable-gui)		_gui=yes	;;
-   --disable-gui)	_gui=no		;;
-+  --enable-gtk2)	_gtk2=yes	;;
-+  --disable-gtk2)	_gtk2=no	;;
-   --enable-termcap)	_termcap=yes	;;
-   --disable-termcap)	_termcap=no	;;
-   --enable-termios)	_termios=yes    ;;
-@@ -5537,41 +5541,69 @@
-   fi
-   echores "$_xshape"
- 
-+  #Check for new GTK (2.x.x)
-+  if test "$_gtk2" = yes ; then
- 
--  # Check for GTK:
--  echocheck "gtk version"
--  if test -z "$_gtkconfig" ; then
--    if ( gtk-config --version ) >/dev/null 2>&1 ; then
--      _gtkconfig="gtk-config"
--    elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
--      _gtkconfig="gtk12-config"
--    else
--      die "The GUI requires GTK devel packages (which were not found)."
--    fi
--  fi
--  _gtk=`$_gtkconfig --version 2>&1`
--  _inc_gtk=`$_gtkconfig --cflags 2>&1`
--  _ld_gtk=`$_gtkconfig --libs 2>&1`
--  echores "$_gtk (using $_gtkconfig)"
--
--  # Check for GLIB
--  echocheck "glib version"
--  if test -z "$_glibconfig" ; then
--    if ( glib-config --version ) >/dev/null 2>&1 ; then
--      _glibconfig="glib-config"
--    elif ( glib12-config --version ) >/dev/null 2>&1 ; then
--      _glibconfig="glib12-config"
--    else
--      die "The GUI requires GLib devel packages (which were not found)"
--    fi
--  fi
--  _glib=`$_glibconfig --version 2>&1`
--  _inc_glib=`$_glibconfig --cflags 2>&1`
--  _ld_glib=`$_glibconfig --libs 2>&1`
--  echores "$_glib (using $_glibconfig)"
-+    #Check for GTK:
-+	echocheck "GTK+ version"
- 
--  _def_gui='#define HAVE_NEW_GUI 1'
--  _ld_gui='$(GTKLIB) $(GLIBLIB)'
-+	_gtk=`pkg-config gtk+-2.0 --modversion 2>&1`
-+	_inc_gtk=`pkg-config gtk+-2.0 --cflags 2>&1`
-+	_ld_gtk=`pkg-config gtk+-2.0 --libs 2>&1`
-+	echores "$_gtk"
-+
-+	# Check for GLIB
-+	echocheck "glib version"
-+	_glib=`pkg-config glib-2.0 --modversion 2>&1`
-+	_inc_glib=`pkg-config glib-2.0 --cflags 2>&1`
-+	_ld_glib=`pkg-config glib-2.0 --libs 2>&1`
-+	echores "$_glib"
-+
-+	_def_gui='#define HAVE_NEW_GUI 1'
-+	_def_gtk2_gui='#define HAVE_GTK2_GUI 1'
-+	_ld_gui='$(GTKLIB) $(GLIBLIB)'
-+	
-+  # Check for "old GTK (1.2.x)
-+  else
-+
-+    # Check for GTK:
-+	echochek "GTK+ version"
-+	if test -z "$_gtkconfig" ; then
-+	  if ( gtk-config --version ) >/dev/null 2>&1 ; then
-+	    _gtkconfig="gtk-config"
-+	  elif ( gtk12-config --version ) >/dev/null 2>&1 ; then
-+	    _gtkconfig="gtk12-config"
-+	  else
-+	    die "the GUI requires GTK+ (which was not found)"
-+	  fi
-+	fi
-+	_gtk=`$_gtkconfig --version 2>&1`
-+	_inc_gtk=`$_gtkconfig --cflags 2>&1`
-+	_ld_gtk=`$_gtkconfig --libs 2>&1`
-+	echores "$_gtk (using $_gtkconfig)"
-+
-+	# Check for GLIB
-+	echocheck "glib version"
-+	if test -z "$_glibconfig" ; then
-+	  if ( glib-config --version ) >/dev/null 2>&1 ; then
-+	    _glibconfig="glib-config"
-+	  elif (glib12-config --version ) >/dev/null 2>&1 ; then
-+	    _glibconfig"glib12-config"
-+	  else
-+	    die "the GUI requires GLIB (which was not found)"
-+	  fi
-+	fi
-+
-+	_glib=`$_glibconfig --version 2>&1`
-+	_inc_glib=`$_glibconfig --cflags 2>&1`
-+	_ld_glib=`$_glibconfig --libs 2>&1`
-+	echores "$_glib (using $_glibconfig)"
-+
-+	_def_gui='#define HAVE_NEW_GUI 1'
-+	_def_gtk2_gui='#undef HAVE_GTK2_GUI'
-+	_ld_gui='$(GTKLIB) $(GLIBLIB)'
-+
-+  fi
- 
-   echo "Creating Gui/config.mak"
-   cat > Gui/config.mak << EOF
-@@ -5586,6 +5618,7 @@
- 
- else
-   _def_gui='#undef HAVE_NEW_GUI'
-+  _def_gtk2_gui='#undef HAVE_GTK2_GUI'
- fi
- # --------------- GUI specific tests end -------------------
- 
-@@ -6217,6 +6250,7 @@
- 
- /* gui support, please do not edit this option */
- $_def_gui
-+$_def_gtk2_gui
- 
- /* Audio output drivers */
- $_def_ossaudio
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-alsa-gcc34.patch b/media-video/mplayer/files/mplayer-1.0_pre5-alsa-gcc34.patch
deleted file mode 100644
index f733923c62a0..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-alsa-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libao2/ao_alsa9.c.org	2003-10-04 12:28:58.000000000 -0500
-+++ libao2/ao_alsa9.c	2004-04-10 15:28:37.057002080 -0500
-@@ -341,7 +341,7 @@
-             strcpy(devstr, "surround51");
-             alsa_device = devstr;
-            break;
--          default:
-+          default: ;
-         }
-     }
- 
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-bio2jack.patch b/media-video/mplayer/files/mplayer-1.0_pre5-bio2jack.patch
deleted file mode 100644
index 78a5f0e4b652..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-bio2jack.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-Index: main/libao2/ao_jack.c
-===================================================================
-RCS file: /cvsroot/mplayer/main/libao2/ao_jack.c,v
-retrieving revision 1.2
-diff -u -r1.2 ao_jack.c
---- main/libao2/ao_jack.c	27 Jun 2004 13:18:06 -0000	1.2
-+++ main/libao2/ao_jack.c	10 Aug 2004 17:48:48 -0000
-@@ -34,8 +34,8 @@
- long JACK_Write(int deviceID, char *data, unsigned long bytes); /* returns the number of bytes written */
- long JACK_GetJackLatency(int deviceID); /* return the latency in milliseconds of jack */
- int  JACK_SetState(int deviceID, enum status_enum state); /* playing, paused, stopped */
--int  JACK_SetVolume(int deviceID, int left, int right); /* returns 0 on success */
--void JACK_GetVolume(int deviceID, int *left, int *right);
-+int  JACK_SetVolumeForChannel(int deviceID, unsigned int channel, unsigned int volume); /* return 0 on success */
-+void JACK_GetVolumeForChannel(int deviceID, unsigned int channel, unsigned int *volume);
- //
- 
- 
-@@ -57,9 +57,10 @@
- 		case AOCONTROL_GET_VOLUME:	
- 			{
- 				ao_control_vol_t *vol = (ao_control_vol_t *)arg;
--				int l, r;
-+				unsigned int l, r;
- 				
--				JACK_GetVolume(driver, &l, &r);
-+				JACK_GetVolumeForChannel(driver, 0, &l);
-+				JACK_GetVolumeForChannel(driver, 1, &r);
- 				vol->left = (float )l;
- 				vol->right = (float )r;
- 				
-@@ -68,16 +69,21 @@
- 		case AOCONTROL_SET_VOLUME:
- 			{
- 				ao_control_vol_t *vol = (ao_control_vol_t *)arg;
--				int l = (int )vol->left,
-+				unsigned int l = (int )vol->left,
- 					r = (int )vol->right,
- 					err = 0;
- 
--				if((err = JACK_SetVolume(driver, l, r))) {
-+				if((err = JACK_SetVolumeForChannel(driver, 0, l))) {
- 					mp_msg(MSGT_AO, MSGL_ERR, 
--							"AO: [Jack] Setting volume failed, error %d\n",err);
-+						"AO: [Jack] Setting left volume failed, error %d\n",err);
- 					return CONTROL_ERROR;
- 				}
--				
-+				if((err = JACK_SetVolumeForChannel(driver, 1, r))) {
-+					mp_msg(MSGT_AO, MSGL_ERR, 
-+						"AO: [Jack] Setting right volume failed, error %d\n",err);
-+					return CONTROL_ERROR;
-+				}
-+
- 				return CONTROL_OK;
- 			}
- 	}
---- main/configure.~1.893.~	2004-08-09 15:51:44.000000000 +0300
-+++ main/configure	2004-08-10 20:41:00.000000000 +0300
-@@ -4187,7 +4187,9 @@
- #include <jack/jack.h>
- int main(void) { JACK_Init(); return 0; }
- EOF
--	if test -z "$_bio2jackdir" ; then
-+        if ( ( test ! `bio2jack-config --version|cut -d"." -f2` -ge "2" ) ) ; then
-+	    _jack=no;
-+	elif test -z "$_bio2jackdir" ; then
- 		cc_check -lbio2jack `pkg-config --libs --cflags jack` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _jack=yes
- 	else
- 		cc_check -L "$_bio2jackdir" -lbio2jack `pkg-config --libs --cflags jack` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _jack=yes
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-configure.patch b/media-video/mplayer/files/mplayer-1.0_pre5-configure.patch
deleted file mode 100644
index 641e25d2de54..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-configure.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.old	2004-07-15 07:04:42.000000000 +0900
-+++ configure	2004-08-22 15:19:34.513649456 +0900
-@@ -5900,36 +5900,8 @@
- #############################################################################
- 
- # Checking for CFLAGS
--_stripbinaries=yes
--if test "$_profile" != "" || test "$_debug" != "" ; then
--  CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile"
--  if test "$_cc_major" -ge "3" ; then
--    CFLAGS=`echo "$CFLAGS" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter/'`
--  fi
--  _stripbinaries=no
--elif test -z "$CFLAGS" ; then
--  if test "$host_arch" != "mips" ; then
--    CFLAGS="-O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer"
--  else
--    CFLAGS="-O4 $_march $_mcpu -ffast-math -fomit-frame-pointer"
--  fi
--  # always compile with '-g' if .developer:
--  if test -f ".developer" ; then
--    CFLAGS="-g $CFLAGS"
--    _stripbinaries=no
--  fi
--else
--  cat <<EOF
-+CFLAGS="custom"
- 
--MPlayer compilation will use the CFLAGS set by you, but:
--
--    *** ***  DO NOT REPORT BUGS IF IT DOES NOT COMPILE/WORK!  *** ***
--
--It is strongly recommended to let MPlayer choose the correct CFLAGS!
--To do so, execute 'CFLAGS= ./configure <options>'
--
--EOF
--fi
- if darwin ; then
-   CFLAGS="$CFLAGS -DSYS_DARWIN"
-   if [ "$_cc_major" = 3 ] && [ "$_cc_minor" -lt 1 ]; then
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-gcc_detection.patch b/media-video/mplayer/files/mplayer-1.0_pre5-gcc_detection.patch
deleted file mode 100644
index 3e5d59e4d5e1..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-gcc_detection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	2005-03-16 08:19:07.000000000 +0900
-+++ configure	2005-03-16 08:19:43.000000000 +0900
-@@ -514,7 +514,7 @@
-  for _cc in "$_cc" gcc gcc-3.3 gcc-3.2 gcc-3.1 gcc3 gcc-3.0 cc ; do
-   echocheck "$_cc version"
-   cc_name=`( $_cc -v ) 2>&1 | tail -n 1 | cut -d ' ' -f 1`
--  cc_version=`( $_cc -dumpversion ) 2>&1`
-+  cc_version=`( $_cc -dumpversion ) 2>&1 | cut -f1,2 -d.`
-   if test "$?" -gt 0; then
-     cc_version="not found"
-   fi
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-help_mp-ro.h.patch b/media-video/mplayer/files/mplayer-1.0_pre5-help_mp-ro.h.patch
deleted file mode 100644
index 176364422528..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-help_mp-ro.h.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- MPlayer-1.0pre4-orig/help/help_mp-ro.h	2004-04-27 11:24:31.000000000 -0500
-+++ MPlayer-1.0_pre4/help/help_mp-ro.h	2004-06-29 01:54:54.081359032 -0500
-@@ -32,7 +32,7 @@
- " -fs              afiºare pe tot ecranul (sau -vm, -zoom, detalii în pagina man)\n"
- " -x <x> -y <y>    alege rezoluþia (folosit pentru -vm sau -zoom)\n"
- " -sub <fiºier>    specificã fiºierul cu subtitrãri folosit\n"
--                   (vezi ºi -subfps, -subdelay)\n"
-+"                   (vezi ºi -subfps, -subdelay)\n"
- " -playlist <fiº>  specificã playlist-ul\n"
- " -vid x -aid y    alege pista video (x) ºi audio (y)\n"
- " -fps x -srate y  schimbã rata video (x fps) ºi audio (y Hz)\n"
-@@ -67,9 +67,9 @@
- #define MSGTR_NoHomeDir "Nu gãsesc directorul HOME.\n"
- #define MSGTR_GetpathProblem "get_path(\"config\") problem\n"
- #define MSGTR_CreatingCfgFile "Creez fiºierul de configurare: %s\n"
--#define MSGTR_InvalidVOdriver "Numele driverului de ieºire video e greºit: %s\n"
-+#define MSGTR_InvalidVOdriver "Numele driverului de ieºire video e greºit: %s\n"\
- 	"Încearcã '-vo help' pentru o listã cu driveri video disponibili.\n"
--#define MSGTR_InvalidAOdriver "Numele driverului de ieºire audio e greºit: %s\n"
-+#define MSGTR_InvalidAOdriver "Numele driverului de ieºire audio e greºit: %s\n"\
- 	"Foloseºte '-ao help' pentru lista cu driveri audio disponibili.\n"
- #define MSGTR_BuiltinCodecsConf "Folosesc 'codecs.conf' built-in.\n"
- #define MSGTR_CantLoadFont "Nu pot încãrca fontul: %s\n"
-@@ -109,7 +109,7 @@
- "  - Încearcã '-cache 8192'.\n"\
- "- Foloseºti -cache pentru fiºiere AVI neinterleaved?\n"\
- "  - Încearcã '-nocache'.\n"\
--"Citeºte DOCS/HTML/en/devices.html pentru idei de reglare/accelerare.\n"\ //lang
-+"Citeºte DOCS/HTML/en/devices.html pentru idei de reglare/accelerare.\n"\
- "Dacã tot nu reuºeºti, citeºte DOCS/HTML/en/bugreports.html.\n\n" //lang
- 
- #define MSGTR_NoGui "MPlayer a fost compilat FÃRÃ suport pentru GUI.\n"
-@@ -127,8 +127,7 @@
- #define MSGTR_CannotReadVideoProperties "Video: Nu pot citi proprietãþile.\n"
- #define MSGTR_NoStreamFound "Nu am gãsit nici un canal.\n"
- #define MSGTR_InitializingAudioCodec "Iniþializez codecul audio...\n"
--#define MSGTR_ErrorInitializingVODevice
--"Eroare la activarea ieºirii video (-vo) aleasã.\n"
-+#define MSGTR_ErrorInitializingVODevice "Eroare la activarea ieºirii video (-vo) aleasã.\n"
- #define MSGTR_ForcedVideoCodec "Codec video forþat: %s\n"
- #define MSGTR_ForcedAudioCodec "Codec audio forþat: %s\n"
- #define MSGTR_AODescription_AOAuthor "AO: Descriere: %s\nAO: Autor: %s\n"
-@@ -202,7 +201,7 @@
- " padding=<0-2>\n"\
- "                0: de loc\n"\
- "                1: tot\n"\
--"                2: ajusteazã\n"\ // dunno
-+"                2: ajusteazã\n"\
- "\n"\
- " fast          Activeazã codare rapidã pentru urmãtoarele preseturi VBR,\n"\
- "               la calitate puþin redusã ºi bitrate-uri crescute.\n"\
-@@ -476,7 +475,7 @@
- #define MSGTR_PREFERENCES_DXR3_FAME "Foloseºte FAME"
- #define MSGTR_PREFERENCES_FontEncoding1 "Unicode"
- 
--/* lang
-+// lang 
- #define MSGTR_PREFERENCES_FontEncoding2 "Limbi vest-europene (ISO-8859-1)"
- #define MSGTR_PREFERENCES_FontEncoding3 "Limbi vest-europene cu Euro (ISO-8859-15)"
- #define MSGTR_PREFERENCES_FontEncoding4 "Limbi central-europene sau slavice (ISO-8859-2)"
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-live.patch b/media-video/mplayer/files/mplayer-1.0_pre5-live.patch
deleted file mode 100644
index 1cd4c1143845..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-live.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpdemux/demux_rtp.cpp	2004-07-30 06:38:43.462828624 +0900
-+++ /home/chris/main/libmpdemux/demux_rtp.cpp	2004-07-29 16:15:36.000000000 +0900
-@@ -407,7 +407,7 @@
-   delete rtpState->sdpDescription;
-   delete rtpState;
- 
--  delete env; delete scheduler;
-+  env->reclaim(); delete scheduler;
- }
- 
- ////////// Extra routines that help implement the above interface functions:
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-mga-kernel-2.6.patch b/media-video/mplayer/files/mplayer-1.0_pre5-mga-kernel-2.6.patch
deleted file mode 100644
index df9135bf93e3..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-mga-kernel-2.6.patch
+++ /dev/null
@@ -1,527 +0,0 @@
---- drivers/mga_vid.c	2003-10-04 19:28:54.000000000 +0200
-+++ drivers/mga_vid.c.new	2004-05-11 15:38:17.377090978 +0200
-@@ -1,9 +1,14 @@
-+#define MODULENAME "mga_vid"
-+
- //#define CRTC2
- 
- // YUY2 support (see config.format) added by A'rpi/ESP-team
- // double buffering added by A'rpi/ESP-team
- // brightness/contrast introduced by eyck
- // multiple card support by Attila Kinali <attila@kinali.ch>
-+// ported to the 2.6 series kernels by F.O. Tempel
-+//  thankfully using the ground work done by Ed Sweetman (for the devfs work)
-+//  and Gergely Nagy for pushing into the right direction with his patch for 2.6.0-test1
- 
- // Set this value, if autodetection fails! (video ram size in megabytes)
- // #define MGA_MEMORY_SIZE 16
-@@ -36,6 +41,12 @@
- #include <linux/config.h>
- #include <linux/version.h>
- #include <linux/module.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#include <linux/moduleparam.h>
-+#include <linux/kobject.h>
-+#include <linux/kobj_map.h>
-+#include <linux/cdev.h>
-+#endif
- #include <linux/types.h>
- #include <linux/kernel.h>
- #include <linux/sched.h>
-@@ -43,6 +54,10 @@
- #include <linux/string.h>
- #include <linux/errno.h>
- 
-+#ifdef MGA_ALLOW_IRQ
-+#include <asm/mach-default/irq_vectors.h>
-+#include <linux/interrupt.h>
-+#endif
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,10)
- #include <linux/malloc.h>
- #else
-@@ -117,7 +132,8 @@
- #ifndef min
- #define min(x,y) (((x)<(y))?(x):(y))
- #endif
--
-+// These functions are provided by the 2.6.0 kernel these days.
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
- #include <linux/ctype.h>
- 
-@@ -155,7 +171,7 @@
-         return simple_strtoul(cp,endp,base);
- }
- #endif
--
-+#endif // 2.6.0
- 
- typedef struct bes_registers_s
- {
-@@ -348,17 +364,30 @@
- #define ICLEAR	    0x1e18
- #define STATUS      0x1e14
- 
--
--// global devfs handle for /dev/mga_vid
-+/* Global handles for cdev and devfs */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static struct cdev *mga_vid_cdev;
-+static dev_t mga_cdev_handle;
-+#ifdef CONFIG_DEVFS_FS 
-+typedef struct devfs_entry *devfs_handle_t;
-+devfs_handle_t dev_handle = NULL;
-+#endif
-+#else
- #ifdef CONFIG_DEVFS_FS
--static devfs_handle_t dev_handle = NULL;
-+	devfs_handle_t dev_handle = NULL;
-+#endif
- #endif
- 
- // card local config
- typedef struct mga_card_s {
- 
- // local devfs handle for /dev/mga_vidX
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
- #ifdef CONFIG_DEVFS_FS
-+	struct devfs_entry *devfs_handle_t;
-+#endif
-+#endif
-+#if CONFIG_DEVFS_FS
- 	devfs_handle_t dev_handle;
- #endif
- 
-@@ -397,6 +426,7 @@
- 	int next_frame; 
- } mga_card_t;
- 
-+
- #define MGA_MAX_CARDS 16
- // this is used as init value for the parameter arrays
- // it should have exactly MGA_MAX_CARDS elements
-@@ -411,11 +441,19 @@
- static int mga_contrast[MGA_MAX_CARDS] = MGA_MAX_CARDS_INIT_ARRAY;
- static int mga_top_reserved[MGA_MAX_CARDS] = MGA_MAX_CARDS_INIT_ARRAY;
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+module_param(mga_ram_size, int, 0);
-+module_param(mga_top_reserved, int, 0);
-+module_param(mga_brightness, int, 0);
-+module_param(mga_contrast, int, 0);
-+module_param(major, int, 0);
-+#else
- MODULE_PARM(mga_ram_size, "1-" __MODULE_STRING(MGA_MAX_CARDS) "i");
- MODULE_PARM(mga_top_reserved, "1-" __MODULE_STRING(MGA_MAX_CARDS) "i");
- MODULE_PARM(mga_brightness, "1-" __MODULE_STRING(MGA_MAX_CARDS) "i");
- MODULE_PARM(mga_contrast, "1-" __MODULE_STRING(MGA_MAX_CARDS) "i");
- MODULE_PARM(major, "i");
-+#endif
- 
- #ifdef CRTC2
- static void crtc2_frame_sel(mga_card_t * card, int frame)
-@@ -642,7 +680,7 @@
- 	writel( card->regs.besglobctl + ((readl(card->mmio_base + VCOUNT)+2)<<16),
- 			card->mmio_base + BESGLOBCTL);
- 
--#if 0
-+#ifdef MP_DEBUG
- 	printk(KERN_DEBUG "mga_vid: wrote BES registers\n");
- 	printk(KERN_DEBUG "mga_vid: BESCTL = 0x%08x\n",
- 			readl(card->mmio_base + BESCTL));
-@@ -651,6 +689,7 @@
- 	printk(KERN_DEBUG "mga_vid: BESSTATUS= 0x%08x\n",
- 			readl(card->mmio_base + BESSTATUS));
- #endif
-+
- #ifdef CRTC2
- //	printk("c2ctl:0x%08x c2datactl:0x%08x\n", readl(card->mmio_base + C2CTL), readl(card->mmio_base + C2DATACTL));
- //	printk("c2misc:0x%08x\n", readl(card->mmio_base + C2MISC));
-@@ -1100,7 +1139,7 @@
- 
- #ifdef MGA_ALLOW_IRQ
- 
--static void enable_irq(mga_card_t * card){
-+static void mga_enable_irq(mga_card_t * card){
- 	long int cc;
- 
- 	cc = readl(card->mmio_base + IEN);
-@@ -1116,16 +1155,18 @@
- 
- }
- 
--static void disable_irq(mga_card_t * card){
-+static void mga_disable_irq(mga_card_t * card){
- 
- 	writeb(0x11, card->mmio_base + CRTCX);
- 	writeb(0x20, card->mmio_base + CRTCD);  /* clear 0, enable off */
- 
- }
- 
--static void mga_handle_irq(int irq, void *dev_id, struct pt_regs *pregs) {
-+static int mga_handle_irq(int irq, void *dev_id, struct pt_regs *pregs) {
- //	static int frame=0;
--//	static int counter=0;
-+#ifdef MP_DEBUG
-+	static int counter=0;
-+#endif
- 	long int cc;
- 	mga_card_t * card = dev_id;
- 
-@@ -1136,7 +1177,7 @@
- 	// check whether the interrupt is really for us (irq sharing)
- 	if ( irq != -1 ) {
- 		cc = readl(card->mmio_base + STATUS);
--		if ( ! (cc & 0x10) ) return;  /* vsyncpen */
-+		if ( ! (cc & 0x10) ) return 0;  /* vsyncpen */
- // 		debug_irqcnt++;
- 	} 
- 
-@@ -1152,15 +1193,15 @@
- // i han echt kei ahnig was das obe heisse söll
- 	crtc2_frame_sel(card->next_frame);
- #endif
--	
--#if 0
-+
-+#ifdef MP_DEBUG
- 	++counter;
- 	if(!(counter&63)){
- 	    printk("mga irq counter = %d\n",counter);
- 	}
- #endif
- 
--//    } else {
-+	//    } else {
- //	debug_irqignore = 1;
- //    }
- 
-@@ -1173,7 +1214,7 @@
- //	writel( card->regs.besglobctl, card->mmio_base + BESGLOBCTL);
- 
- 
--	return;
-+	return 0;
- 
- }
- 
-@@ -1257,7 +1298,7 @@
- 				mga_vid_write_regs(card, 0);
- 			}
- #ifdef MGA_ALLOW_IRQ
--			if ( card->irq != -1 ) enable_irq(card);
-+			if ( card->irq != -1 ) mga_enable_irq(card);
- #endif
- 			card->next_frame=0;
- 		break;
-@@ -1268,7 +1309,7 @@
- #endif			
- 			card->vid_src_ready = 0;   
- #ifdef MGA_ALLOW_IRQ
--			if ( card->irq != -1 ) disable_irq(card);
-+			if (card->irq != -1 ) mga_disable_irq(card);
- #endif
- 			card->regs.besctl &= ~1;
-                         card->regs.besglobctl &= ~(1<<6);  // UYVY format selected
-@@ -1317,6 +1358,11 @@
- static void cards_init(mga_card_t * card, struct pci_dev * dev, int card_number, int is_g400);
- 
- // returns the number of found cards
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+#define PCI_DEV_NAME(d) (d)->name
-+#else
-+#define PCI_DEV_NAME(d) pci_name((d))
-+#endif
- static int mga_vid_find_card(void)
- {
- 	struct pci_dev *dev = NULL;
-@@ -1347,27 +1393,27 @@
- 		switch(dev->device) {
- 		case PCI_DEVICE_ID_MATROX_G550:
- 			mga_dev_name = "MGA G550";
--			printk(KERN_INFO "mga_vid: Found %s at %s [%s]\n", mga_dev_name, dev->slot_name, dev->name);
-+			printk(KERN_INFO "mga_vid: Found %s at %s [%s]\n", mga_dev_name, dev->slot_name, PCI_DEV_NAME(dev));
- 			cards_init(card, dev, mga_cards_num - 1, 1);
- 			break;
- 		case PCI_DEVICE_ID_MATROX_G400:
- 			mga_dev_name = "MGA G400/G450";
--			printk(KERN_INFO "mga_vid: Found %s at %s [%s]\n", mga_dev_name, dev->slot_name, dev->name);
-+			printk(KERN_INFO "mga_vid: Found %s at %s [%s]\n", mga_dev_name, dev->slot_name, PCI_DEV_NAME(dev));
- 			cards_init(card, dev, mga_cards_num - 1, 1);
- 			break;
- 		case PCI_DEVICE_ID_MATROX_G200_AGP:
- 			mga_dev_name = "MGA G200 AGP";
--			printk(KERN_INFO "mga_vid: Found %s at %s [%s]\n", mga_dev_name, dev->slot_name, dev->name);
-+			printk(KERN_INFO "mga_vid: Found %s at %s [%s]\n", mga_dev_name, dev->slot_name, PCI_DEV_NAME(dev));
- 			cards_init(card, dev, mga_cards_num - 1, 0);
- 			break;
- 		case PCI_DEVICE_ID_MATROX_G200_PCI:
- 			mga_dev_name = "MGA G200";
--			printk(KERN_INFO "mga_vid: Found %s at %s [%s]\n", mga_dev_name, dev->slot_name, dev->name);
-+			printk(KERN_INFO "mga_vid: Found %s at %s [%s]\n", mga_dev_name, dev->slot_name, PCI_DEV_NAME(dev));
- 			cards_init(card, dev, mga_cards_num - 1, 0);
- 			break;
- 		default:
- 			mga_cards_num--;
--			printk(KERN_INFO "mga_vid: ignoring matrox device (%d) at %s [%s]\n", dev->device, dev->slot_name, dev->name);
-+			printk(KERN_INFO "mga_vid: ignoring matrox device (%d) at %s [%s]\n", dev->device, dev->slot_name, PCI_DEV_NAME(dev));
- 			break;
- 		}
- 	}
-@@ -1473,7 +1519,7 @@
- 		return(-EAGAIN);
- 	}
- 
--	return(0);
-+	return 0;
- }
- 
- static int mga_vid_release(struct inode *inode, struct file *file)
-@@ -1493,8 +1539,9 @@
- //	card->config.colkey_on=0; //!!!
- 	mga_vid_write_regs(card, 1);
- 	card->vid_in_use = 0;
--
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- 	MOD_DEC_USE_COUNT;
-+#endif
- 	return 0;
- }
- 
-@@ -1508,7 +1555,11 @@
- 	mga_card_t * card;
- 	
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,2)
-+#if	LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+	int minor = iminor(inode);
-+#else
- 	int minor = MINOR(inode->i_rdev.value);
-+#endif
- #else
- 	int minor = MINOR(inode->i_rdev);
- #endif
-@@ -1539,8 +1590,10 @@
- 		return(-EBUSY);
- 
- 	card->vid_in_use = 1;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- 	MOD_INC_USE_COUNT;
--	return(0);
-+#endif
-+	return 0;
- }
- 
- #if LINUX_VERSION_CODE >= 0x020400
-@@ -1573,10 +1626,6 @@
- static void cards_init(mga_card_t * card, struct pci_dev * dev, int card_number, int is_g400)
- {
- 	unsigned int card_option;
--// temp buffer for device filename creation used only by devfs
--#ifdef CONFIG_DEVFS_FS
--	char buffer[16];
--#endif
- 
- 	memset(card,0,sizeof(mga_card_t));
- 	card->irq = -1;
-@@ -1647,10 +1696,11 @@
- //		    case 0x13:  card->ram_size = 8; break;
- 		    default: card->ram_size = 8;
- 		}
--	    } 
-+} 
-+
- #if 0
- //	    printk("List resources -----------\n");
--	    for(temp=0;temp<DEVICE_COUNT_RESOURCE;temp++){
-+	    for(int temp=0;temp<DEVICE_COUNT_RESOURCE;temp++){
- 	        struct resource *res=&dev->resource[temp];
- 	        if(res->flags){
- 	          int size=(1+res->end-res->start)>>20;
-@@ -1665,7 +1715,6 @@
- #endif
-         }
- 
--
- #ifdef MGA_ALLOW_IRQ
- 	if ( card->irq != -1 ) {
- 		int tmp = request_irq(card->irq, mga_handle_irq, SA_INTERRUPT | SA_SHIRQ, "Syncfb Time Base", card);
-@@ -1683,16 +1732,15 @@
- 		printk(KERN_INFO "syncfb (mga): IRQ disabled in mga_vid.c\n");
- 		card->irq=-1;
- #endif
--
--	// register devfs, let the kernel give us major and minor numbers
--#ifdef CONFIG_DEVFS_FS
--	snprintf(buffer, 16, "mga_vid%d", card_number);
-+// register devfs, let the kernel give us major and minor numbers
-+#if CONFIG_DEVFS_FS && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+	char buffer[16];
-+	snprintf(buffer, 16, "%s%d", MODULENAME, card_number);
- 	card->dev_handle = devfs_register(NULL, buffer, DEVFS_FL_AUTO_DEVNUM,
- 					0, 0,
- 					S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IFCHR,
- 					&mga_vid_fops, card);
- #endif
--
- }
- 
- /* 
-@@ -1701,71 +1749,101 @@
- 
- static int mga_vid_initialize(void)
- {
-- 	int i;
--
--//	printk(KERN_INFO "Matrox MGA G200/G400 YUV Video interface v0.01 (c) Aaron Holtzman \n");
-+ 		int i;
- 	printk(KERN_INFO "Matrox MGA G200/G400/G450/G550 YUV Video interface v2.01 (c) Aaron Holtzman & A'rpi\n");
--
--	for(i = 0; i < MGA_MAX_CARDS; i++)
-+	
-+	if(mga_vid_find_card()) 
- 	{
--		if (mga_ram_size[i]) {
--			if (mga_ram_size[i]<4 || mga_ram_size[i]>64) {
--				printk(KERN_ERR "mga_vid: invalid RAMSIZE: %d MB\n", mga_ram_size[i]);
--				return -EINVAL;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+		if(register_chrdev(major, MODULENAME, &mga_vid_fops))
-+		{
-+			printk(KERN_ERR "mga_vid: unable to get major: %d\n", major);
-+			return -EIO;
-+		}
-+		/* Have the kernel generate a major device number */
-+		//if(!alloc_chrdev_region(&mga_cdev_handle, 0, mga_cards_num, "mga_vid"))
-+		//								major = MAJOR(mga_cdev_handle);
-+		printk(KERN_INFO "mga_vid: using major: %d\n", major);
-+		/* Allocate a cdev for this character device, and fill in some parameters it needs */
-+		mga_vid_cdev = cdev_alloc();
-+		mga_vid_cdev->owner = THIS_MODULE;
-+		strcpy(mga_vid_cdev->kobj.name, MODULENAME);
-+		mga_vid_cdev->ops = &mga_vid_fops;
-+		/* Add this character device to the system */
-+		cdev_add(mga_vid_cdev, mga_cdev_handle, mga_cards_num);
-+#endif
-+		for(i = 0; i < mga_cards_num; i++)
-+		{
-+#if CONFIG_DEVFS_FS && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+			/* Create the device, and register a symlink for the first card found. 
-+			 * Lets not break default behaviour, eh? */
-+			devfs_mk_cdev(MKDEV(major,i), S_IFCHR | S_IRUSR | S_IRGRP | S_IWUSR, "video/mga_vid%d", i);
-+			if( i == 0 ) {
-+				devfs_mk_symlink(MODULENAME,"video/mga_vid0");
-+			}
-+#endif
-+			if (mga_ram_size[i]) {
-+				if (mga_ram_size[i]<4 || mga_ram_size[i]>64) {
-+					printk(KERN_ERR "mga_vid: invalid RAMSIZE: %d MB\n", mga_ram_size[i]);
-+					return -EINVAL;
-+				}
- 			}
- 		}
--	}
- 	
--	if(register_chrdev(major, "mga_vid", &mga_vid_fops))
--	{
--		printk(KERN_ERR "mga_vid: unable to get major: %d\n", major);
--		return -EIO;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
-+		if(register_chrdev(major, MODULENAME, &mga_vid_fops))
-+		{
-+			printk(KERN_ERR "mga_vid: unable to get major: %d\n", major);
-+			return -EIO;
-+		}
-+#endif
-+		return 0;
- 	}
--
--	if (!mga_vid_find_card())
-+	else
- 	{
--		printk(KERN_ERR "mga_vid: no supported devices found\n");
--		unregister_chrdev(major, "mga_vid");
--		return -EINVAL;
-+		return -EFAULT;
- 	}
--#ifdef CONFIG_DEVFS_FS
--	  else {
--		// we assume that this always succeedes
--		dev_handle = devfs_register(NULL, "mga_vid", DEVFS_FL_AUTO_DEVNUM,
--		                            0,0,
--		                            S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IFCHR,
--		                            &mga_vid_fops, mga_cards[0]);
--	}
--#endif
--
--	return(0);
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+module_init(mga_vid_initialize);
-+#else
- int init_module(void)
- {
- 	return mga_vid_initialize();
- }
-+#endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+static void mga_cleanup_module(void)
-+#else
- void cleanup_module(void)
-+#endif
- {
- 	int i;
- 	mga_card_t * card;
- 
-+	printk(KERN_INFO "mga_vid: Cleaning up module\n");
- 	for (i = 0; i < MGA_MAX_CARDS; i++)
- 	{
- 		card = mga_cards[i];
- 		if(card)
- 		{
- #ifdef MGA_ALLOW_IRQ
--			if (card->irq != -1)
--				free_irq(card->irq, &(card->irq));
-+			if ( card->irq != -1)
-+//				free_irq(card->irq, &(card->irq));
-+					free_irq(card->irq, card);
- #endif
- 
- 			if(card->mmio_base)
- 				iounmap(card->mmio_base);
- 			if(card->param_buff)
- 				kfree(card->param_buff);
--#ifdef CONFIG_DEVFS_FS
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+#ifdef CONFIG_DEVFS_FS 
-+			devfs_remove("video/%s%d",MODULENAME, i);
-+#endif
-+#else
- 			if(card->dev_handle) devfs_unregister(card->dev_handle);
- #endif
- 
-@@ -1775,9 +1853,20 @@
- 	}
- 
- 	//FIXME turn off BES
--	printk(KERN_INFO "mga_vid: Cleaning up module\n");
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
- #ifdef CONFIG_DEVFS_FS
--	if(dev_handle) devfs_unregister(dev_handle);
-+	devfs_unregister(dev_handle);
-+#endif
-+	unregister_chrdev(major, MODULENAME);
-+#else
-+#ifdef CONFIG_DEVFS_FS
-+	devfs_remove(MODULENAME);
-+#endif
-+	cdev_del(mga_vid_cdev);
-+	unregister_chrdev_region(mga_cdev_handle, mga_cards_num);
- #endif
--	unregister_chrdev(major, "mga_vid");
- }
-+
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+module_exit(mga_cleanup_module);
-+#endif
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-mips64.patch b/media-video/mplayer/files/mplayer-1.0_pre5-mips64.patch
deleted file mode 100644
index 926170ce1a66..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-mips64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur MPlayer-1.0pre5.orig/configure MPlayer-1.0pre5/configure
---- MPlayer-1.0pre5.orig/configure      2004-08-23 21:18:26.000000000 -0600
-+++ MPlayer-1.0pre5/configure   2004-08-23 22:16:15.000000000 -0600
-@@ -452,7 +452,7 @@
-       arm*) host_arch=arm ;;
-       s390) host_arch=s390 ;;
-       s390x) host_arch=s390x ;;
--      mips) host_arch=mips ;;
-+      mips*) host_arch=mips ;;
-       vax) host_arch=vax ;;
-       *) host_arch=UNKNOWN ;;
-     esac
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-r1-conf_locale.patch b/media-video/mplayer/files/mplayer-1.0_pre5-r1-conf_locale.patch
deleted file mode 100644
index 8c035f958d24..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-r1-conf_locale.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -r -u MPlayer-1.0pre5_orig/configure MPlayer-1.0pre5/configure
---- MPlayer-1.0pre5_orig/configure	2004-07-23 18:06:56.422863704 +0200
-+++ MPlayer-1.0pre5/configure	2004-07-23 18:08:05.252400024 +0200
-@@ -2079,15 +2079,15 @@
-     break
-   else
-     echo -n "$i not found, "
--    _language=`echo $_language | sed "s/$i *//g"`
-+    _language=`echo $_language | sed "s/\<$i\> *//g"`
-   fi
- done
- test -z "$_language" && _language=en
- for i in $LANGUAGES ; do
-   if test -f "DOCS/man/$i/mplayer.1" ; then
--    LANGUAGES=`echo $LANGUAGES | sed "s/$i *//2" | sed 's/ *$//'`
-+    LANGUAGES=`echo $LANGUAGES | sed "s/\<$i\> *//2" | sed 's/ *$//'`
-   else
--    LANGUAGES=`echo $LANGUAGES | sed "s/$i *//g" | sed 's/ *$//'`
-+    LANGUAGES=`echo $LANGUAGES | sed "s/\<$i\> *//g" | sed 's/ *$//'`
-   fi
- done
- echores "using $_language (man pages: $LANGUAGES)"
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-r4-ppc64.patch b/media-video/mplayer/files/mplayer-1.0_pre5-r4-ppc64.patch
deleted file mode 100644
index b400e76c3105..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-r4-ppc64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur MPlayer-1.0pre5.orig/configure MPlayer-1.0pre5/configure
---- MPlayer-1.0pre5.orig/configure	2004-11-14 12:26:04.826628654 +0900
-+++ MPlayer-1.0pre5/configure	2004-11-14 12:42:46.021422901 +0900
-@@ -445,7 +445,7 @@
-       i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
-       ia64) host_arch=ia64 ;;
-       x86_64|amd64) host_arch=x86_64 ;;
--      macppc|ppc) host_arch=ppc ;;
-+      macppc|ppc|ppc64) host_arch=ppc ;;
-       alpha) host_arch=alpha ;;
-       sparc*) host_arch=sparc ;;
-       parisc*|hppa*|9000*) host_arch=hppa ;;
-
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-r5-configure.patch b/media-video/mplayer/files/mplayer-1.0_pre5-r5-configure.patch
deleted file mode 100644
index ad9fe8a680b0..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-r5-configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.old	2004-12-19 03:16:56.005070176 +0900
-+++ configure	2004-12-19 03:17:24.785694856 +0900
-@@ -5901,13 +5901,7 @@
- 
- # Checking for CFLAGS
- _stripbinaries=yes
--if test "$_profile" != "" || test "$_debug" != "" ; then
--  CFLAGS="-W -Wall -O2 $_march $_mcpu $_debug $_profile"
--  if test "$_cc_major" -ge "3" ; then
--    CFLAGS=`echo "$CFLAGS" | sed -e 's/\(-Wall\)/\1 -Wno-unused-parameter/'`
--  fi
--  _stripbinaries=no
--elif test -z "$CFLAGS" ; then
-+if test -z "$CFLAGS" ; then
-   if test "$host_arch" != "mips" ; then
-     CFLAGS="-O4 $_march $_mcpu -pipe -ffast-math -fomit-frame-pointer"
-   else
diff --git a/media-video/mplayer/files/mplayer-1.0_pre5-yuv2rgb_fix.patch b/media-video/mplayer/files/mplayer-1.0_pre5-yuv2rgb_fix.patch
deleted file mode 100644
index ab2d6e452806..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre5-yuv2rgb_fix.patch
+++ /dev/null
@@ -1,571 +0,0 @@
-diff -urN MPlayer-1.0pre5.old/libvo/vo_x11.c MPlayer-1.0pre5/libvo/vo_x11.c
---- MPlayer-1.0pre5.old/libvo/vo_x11.c	2004-10-15 21:54:24.809523440 -0700
-+++ MPlayer-1.0pre5/libvo/vo_x11.c	2004-10-15 21:52:40.178429784 -0700
-@@ -39,7 +39,6 @@
- #include "sub.h"
- 
- #include "../postproc/swscale.h"
--#include "../postproc/swscale_internal.h"       //FIXME
- #include "../postproc/rgb2rgb.h"
- #include "../libmpcodecs/vf_scale.h"
- 
-@@ -49,6 +48,7 @@
- #include "../Gui/interface.h"
- #include "../mplayer.h"
- #endif
-+#include "../postproc/swscale_internal.h"       //FIXME
- 
- static vo_info_t info = {
-     "X11 ( XImage/Shm )",
-diff -urN MPlayer-1.0pre5.old/postproc/swscale.c MPlayer-1.0pre5/postproc/swscale.c
---- MPlayer-1.0pre5.old/postproc/swscale.c	2004-10-15 21:54:24.812522984 -0700
-+++ MPlayer-1.0pre5/postproc/swscale.c	2004-10-15 21:52:40.181429328 -0700
-@@ -1728,7 +1728,7 @@
- 	//FIXME factorize
- 
- #ifdef HAVE_ALTIVEC
--	yuv2rgb_altivec_init_tables (c, inv_table);
-+	yuv2rgb_altivec_init_tables (c, inv_table, brightness, contrast, saturation);
- #endif	
- 	return 0;
- }
-diff -urN MPlayer-1.0pre5.old/postproc/swscale_internal.h MPlayer-1.0pre5/postproc/swscale_internal.h
---- MPlayer-1.0pre5.old/postproc/swscale_internal.h	2004-10-15 21:54:24.813522832 -0700
-+++ MPlayer-1.0pre5/postproc/swscale_internal.h	2004-10-15 21:55:47.226994080 -0700
-@@ -19,6 +19,16 @@
- #ifndef SWSCALE_INTERNAL_H
- #define SWSCALE_INTERNAL_H
- 
-+#ifdef CONFIG_DARWIN
-+#define AVV(x...) (x)
-+#else
-+#define AVV(x...) {x}
-+#endif
-+
-+#ifdef HAVE_ALTIVEC
-+#include <altivec.h>
-+#endif
-+
- #include "../mp_msg.h"
- 
- #define MSG_WARN(args...) mp_msg(MSGT_SWS,MSGL_WARN, ##args )
-diff -urN MPlayer-1.0pre5.old/postproc/yuv2rgb_altivec.c MPlayer-1.0pre5/postproc/yuv2rgb_altivec.c
---- MPlayer-1.0pre5.old/postproc/yuv2rgb_altivec.c	2004-10-15 21:54:24.818522072 -0700
-+++ MPlayer-1.0pre5/postproc/yuv2rgb_altivec.c	2004-10-15 21:52:40.185428720 -0700
-@@ -64,6 +64,7 @@
- */
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <inttypes.h>
- #include <assert.h>
- #include "config.h"
-@@ -118,13 +119,13 @@
- */
- static
- const vector unsigned char
--  perm_rgb_0 = (vector unsigned char)(0x00,0x01,0x10,0x02,0x03,0x11,0x04,0x05,
-+  perm_rgb_0 = (const vector unsigned char)AVV(0x00,0x01,0x10,0x02,0x03,0x11,0x04,0x05,
- 				      0x12,0x06,0x07,0x13,0x08,0x09,0x14,0x0a),
--  perm_rgb_1 = (vector unsigned char)(0x0b,0x15,0x0c,0x0d,0x16,0x0e,0x0f,0x17,
-+  perm_rgb_1 = (const vector unsigned char)AVV(0x0b,0x15,0x0c,0x0d,0x16,0x0e,0x0f,0x17,
- 				      0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f),
--  perm_rgb_2 = (vector unsigned char)(0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
-+  perm_rgb_2 = (const vector unsigned char)AVV(0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,
- 				      0x00,0x01,0x18,0x02,0x03,0x19,0x04,0x05),
--  perm_rgb_3 = (vector unsigned char)(0x1a,0x06,0x07,0x1b,0x08,0x09,0x1c,0x0a,
-+  perm_rgb_3 = (const vector unsigned char)AVV(0x1a,0x06,0x07,0x1b,0x08,0x09,0x1c,0x0a,
- 				      0x0b,0x1d,0x0c,0x0d,0x1e,0x0e,0x0f,0x1f);
- 
- #define vec_merge3(x2,x1,x0,y0,y1,y2)    \
-@@ -197,39 +198,40 @@
- 
- #define vec_unh(x) \
-   (vector signed short) \
--    vec_perm(x,(typeof(x))(0),\
--             (vector unsigned char)(0x10,0x00,0x10,0x01,0x10,0x02,0x10,0x03,\
-+    vec_perm(x,(typeof(x))AVV(0),\
-+             (vector unsigned char)AVV(0x10,0x00,0x10,0x01,0x10,0x02,0x10,0x03,\
-                                     0x10,0x04,0x10,0x05,0x10,0x06,0x10,0x07))
- #define vec_unl(x) \
-   (vector signed short) \
--    vec_perm(x,(typeof(x))(0),\
--             (vector unsigned char)(0x10,0x08,0x10,0x09,0x10,0x0A,0x10,0x0B,\
-+    vec_perm(x,(typeof(x))AVV(0),\
-+             (vector unsigned char)AVV(0x10,0x08,0x10,0x09,0x10,0x0A,0x10,0x0B,\
-                                     0x10,0x0C,0x10,0x0D,0x10,0x0E,0x10,0x0F))
- 
- #define vec_clip(x) \
--  vec_max (vec_min (x, (typeof(x))(255)), (typeof(x))(0))
-+  vec_max (vec_min (x, (typeof(x))AVV(235)), (typeof(x))AVV(16))
- 
- #define vec_packclp_a(x,y) \
-   (vector unsigned char)vec_pack (vec_clip (x), vec_clip (y))
- 
- #define vec_packclp(x,y) \
-   (vector unsigned char)vec_packs \
--      ((vector unsigned short)vec_max (x,(vector signed short) (0)), \
--       (vector unsigned short)vec_max (y,(vector signed short) (0)))
-+      ((vector unsigned short)vec_max (x,(vector signed short) AVV(0)), \
-+       (vector unsigned short)vec_max (y,(vector signed short) AVV(0)))
- 
--//#define out_pixels(a,b,c,ptr) vec_mstrgb32(typeof(a),((typeof (a))(0)),a,a,a,ptr)
-+//#define out_pixels(a,b,c,ptr) vec_mstrgb32(typeof(a),((typeof (a))AVV(0)),a,a,a,ptr)
- 
- 
--static inline cvtyuvtoRGB (SwsContext *c,
-+static inline void cvtyuvtoRGB (SwsContext *c,
- 			   vector signed short Y, vector signed short U, vector signed short V,
- 			   vector signed short *R, vector signed short *G, vector signed short *B)
- {
-   vector signed   short vx,ux,uvx;
- 
-   Y = vec_mradds (Y, c->CY, c->OY);
--
--  U = vec_sub (U,(vector signed short)(128));
--  V = vec_sub (V,(vector signed short)(128));
-+  U  = vec_sub (U,(vector signed short)
-+  			vec_splat((vector signed short)AVV(128),0));
-+  V  = vec_sub (V,(vector signed short)
-+  			vec_splat((vector signed short)AVV(128),0));
- 
-   //   ux  = (CBU*(u<<c->CSHIFT)+0x4000)>>15;
-   ux = vec_sl (U, c->CSHIFT);
-@@ -323,8 +325,13 @@
-       align_perm = vec_lvsl (0, vi);					   \
-       v = (vector signed char)vec_perm (vivP[0], vivP[1], align_perm);	   \
- 									   \
--      u  = (vector signed char)vec_sub (u, (vector signed char)(128));	   \
--      v  = (vector signed char)vec_sub (v, (vector signed char)(128));	   \
-+      u  = (vector signed char)						   \
-+     		vec_sub (u,(vector signed char)                            \
-+				vec_splat((vector signed char)AVV(128),0));\
-+      v  = (vector signed char)						   \
-+     		vec_sub (v,(vector signed char)				   \
-+				vec_splat((vector signed char)AVV(128),0));\
-+									   \
-       U  = vec_unpackh (u);						   \
-       V  = vec_unpackh (v);						   \
- 									   \
-@@ -341,18 +348,18 @@
- 									   \
- 	/*   ux  = (CBU*(u<<CSHIFT)+0x4000)>>15 */			   \
- 	ux = vec_sl (U, lCSHIFT);					   \
--	ux = vec_mradds (ux, lCBU, (vector signed short)(0));		   \
-+	ux = vec_mradds (ux, lCBU, (vector signed short)AVV(0));		   \
- 	ux0  = vec_mergeh (ux,ux);					   \
- 	ux1  = vec_mergel (ux,ux);					   \
- 									   \
- 	/* vx  = (CRV*(v<<CSHIFT)+0x4000)>>15;	*/			   \
- 	vx = vec_sl (V, lCSHIFT);					   \
--	vx = vec_mradds (vx, lCRV, (vector signed short)(0));		   \
-+	vx = vec_mradds (vx, lCRV, (vector signed short)AVV(0));		   \
- 	vx0  = vec_mergeh (vx,vx);					   \
- 	vx1  = vec_mergel (vx,vx);					   \
- 									   \
- 	/* uvx = ((CGU*u) + (CGV*v))>>15 */				   \
--	uvx = vec_mradds (U, lCGU, (vector signed short)(0));		   \
-+	uvx = vec_mradds (U, lCGU, (vector signed short)AVV(0));		   \
- 	uvx = vec_mradds (V, lCGV, uvx);				   \
- 	uvx0 = vec_mergeh (uvx,uvx);					   \
- 	uvx1 = vec_mergel (uvx,uvx);					   \
-@@ -402,15 +409,167 @@
- }
- 
- 
--#define out_abgr(a,b,c,ptr)  vec_mstrgb32(typeof(a),((typeof (a))(0)),c,b,a,ptr)
--#define out_bgra(a,b,c,ptr)  vec_mstrgb32(typeof(a),c,b,a,((typeof (a))(0)),ptr)
--#define out_rgba(a,b,c,ptr)  vec_mstrgb32(typeof(a),a,b,c,((typeof (a))(0)),ptr)
--#define out_argb(a,b,c,ptr)  vec_mstrgb32(typeof(a),((typeof (a))(0)),a,b,c,ptr)
-+#define out_abgr(a,b,c,ptr)  vec_mstrgb32(typeof(a),((typeof (a))AVV(0)),c,b,a,ptr)
-+#define out_bgra(a,b,c,ptr)  vec_mstrgb32(typeof(a),c,b,a,((typeof (a))AVV(0)),ptr)
-+#define out_rgba(a,b,c,ptr)  vec_mstrgb32(typeof(a),a,b,c,((typeof (a))AVV(0)),ptr)
-+#define out_argb(a,b,c,ptr)  vec_mstrgb32(typeof(a),((typeof (a))AVV(0)),a,b,c,ptr)
- #define out_rgb24(a,b,c,ptr) vec_mstrgb24(a,b,c,ptr)
--#define out_bgr24(a,b,c,ptr) vec_mstrgb24(c,b,a,ptr)
-+#define out_bgr24(a,b,c,ptr) vec_mstbgr24(c,b,a,ptr)
- 
- DEFCSP420_CVT (yuv2_abgr32, out_abgr)
-+#if 1
- DEFCSP420_CVT (yuv2_bgra32, out_argb)
-+#else
-+static int altivec_yuv2_bgra32 (SwsContext *c,                                  
-+				unsigned char **in, int *instrides,	   
-+				int srcSliceY,	int srcSliceH,		   
-+				unsigned char **oplanes, int *outstrides)  
-+{									   
-+  int w = c->srcW;							   
-+  int h = srcSliceH;							   
-+  int i,j;								   
-+  int instrides_scl[3];							   
-+  vector unsigned char y0,y1;						   
-+									   
-+  vector signed char  u,v;						   
-+									   
-+  vector signed short Y0,Y1,Y2,Y3;					   
-+  vector signed short U,V;						   
-+  vector signed short vx,ux,uvx;					   
-+  vector signed short vx0,ux0,uvx0;					   
-+  vector signed short vx1,ux1,uvx1;					   
-+  vector signed short R0,G0,B0;						   
-+  vector signed short R1,G1,B1;						   
-+  vector unsigned char R,G,B;						   
-+									   
-+  vector unsigned char *uivP, *vivP;			   		   
-+  vector unsigned char align_perm;					   
-+									   
-+  vector signed short 							   
-+    lCY  = c->CY,							   
-+    lOY  = c->OY,							   
-+    lCRV = c->CRV,							   
-+    lCBU = c->CBU,							   
-+    lCGU = c->CGU,							   
-+    lCGV = c->CGV;							   
-+									   
-+  vector unsigned short lCSHIFT = c->CSHIFT;				   
-+									   
-+  ubyte *y1i   = in[0];							   
-+  ubyte *y2i   = in[0]+w;						   
-+  ubyte *ui    = in[1];							   
-+  ubyte *vi    = in[2];							   
-+									   
-+  vector unsigned char *oute						   
-+    = (vector unsigned char *)						   
-+        (oplanes[0]+srcSliceY*outstrides[0]);				   
-+  vector unsigned char *outo						   
-+    = (vector unsigned char *)						   
-+        (oplanes[0]+srcSliceY*outstrides[0]+outstrides[0]);		   
-+									   
-+									   
-+  instrides_scl[0] = instrides[0];					   
-+  instrides_scl[1] = instrides[1]-w/2;  /* the loop moves ui by w/2 */	   
-+  instrides_scl[2] = instrides[2]-w/2;  /* the loop moves vi by w/2 */	   
-+									   
-+									   
-+  for (i=0;i<h/2;i++) {							   
-+    vec_dstst (outo, (0x02000002|(((w*3+32)/32)<<16)), 0);                 
-+    vec_dstst (oute, (0x02000002|(((w*3+32)/32)<<16)), 1);                 
-+									   
-+    for (j=0;j<w/16;j++) {						   
-+									   
-+      y0 = vec_ldl (0,y1i);						   
-+      y1 = vec_ldl (0,y2i);						   
-+      uivP = (vector unsigned char *)ui;				   
-+      vivP = (vector unsigned char *)vi;				   
-+									   
-+      align_perm = vec_lvsl (0, ui);					   
-+      u = (vector signed char)vec_perm (uivP[0], uivP[1], align_perm);	   
-+									   
-+      align_perm = vec_lvsl (0, vi);					   
-+      v = (vector signed char)vec_perm (vivP[0], vivP[1], align_perm);
-+      u  = (vector signed char)
-+     		vec_sub (u,(vector signed char)
-+				vec_splat((vector signed char)AVV(128),0));
-+      
-+      v  = (vector signed char)
-+      		vec_sub (v, (vector signed char)
-+				vec_splat((vector signed char)AVV(128),0));
-+      
-+      U  = vec_unpackh (u);						   
-+      V  = vec_unpackh (v);						   
-+									   
-+									   
-+	Y0 = vec_unh (y0);						   
-+	Y1 = vec_unl (y0);						   
-+	Y2 = vec_unh (y1);						   
-+	Y3 = vec_unl (y1);						   
-+									   
-+        Y0 = vec_mradds (Y0, lCY, lOY);					   
-+        Y1 = vec_mradds (Y1, lCY, lOY);					   
-+        Y2 = vec_mradds (Y2, lCY, lOY);					   
-+        Y3 = vec_mradds (Y3, lCY, lOY);					   
-+									   
-+	/*   ux  = (CBU*(u<<CSHIFT)+0x4000)>>15 */			   
-+	ux = vec_sl (U, lCSHIFT);					   
-+	ux = vec_mradds (ux, lCBU, (vector signed short)AVV(0));
-+	ux0  = vec_mergeh (ux,ux);					   
-+	ux1  = vec_mergel (ux,ux);					   
-+									   
-+	/* vx  = (CRV*(v<<CSHIFT)+0x4000)>>15;	*/			   
-+	vx = vec_sl (V, lCSHIFT);					   
-+	vx = vec_mradds (vx, lCRV, (vector signed short)AVV(0));
-+	vx0  = vec_mergeh (vx,vx);
-+	vx1  = vec_mergel (vx,vx);
-+	/* uvx = ((CGU*u) + (CGV*v))>>15 */
-+	uvx = vec_mradds (U, lCGU, (vector signed short)AVV(0));
-+	uvx = vec_mradds (V, lCGV, uvx);
-+	uvx0 = vec_mergeh (uvx,uvx);
-+	uvx1 = vec_mergel (uvx,uvx);
-+	R0 = vec_add (Y0,vx0);
-+	G0 = vec_add (Y0,uvx0);
-+	B0 = vec_add (Y0,ux0);
-+	R1 = vec_add (Y1,vx1);
-+	G1 = vec_add (Y1,uvx1);
-+	B1 = vec_add (Y1,ux1);
-+	R  = vec_packclp (R0,R1);
-+	G  = vec_packclp (G0,G1);
-+	B  = vec_packclp (B0,B1);
-+	
-+	out_argb(R,G,B,oute);
-+	R0 = vec_add (Y2,vx0);
-+	G0 = vec_add (Y2,uvx0);
-+	B0 = vec_add (Y2,ux0);
-+	R1 = vec_add (Y3,vx1);
-+	G1 = vec_add (Y3,uvx1);
-+	B1 = vec_add (Y3,ux1);
-+	R  = vec_packclp (R0,R1);
-+	G  = vec_packclp (G0,G1);
-+	B  = vec_packclp (B0,B1);
-+	
-+	out_argb(R,G,B,outo);
-+	y1i  += 16;							   
-+	y2i  += 16;							   
-+	ui   += 8;
-+	vi   += 8;							   
-+									   
-+    }									   
-+									   
-+    outo += (outstrides[0])>>4;					           
-+    oute += (outstrides[0])>>4;					           
-+									   
-+    ui    += instrides_scl[1];						   
-+    vi    += instrides_scl[2];						   
-+    y1i   += instrides_scl[0];						   
-+    y2i   += instrides_scl[0];						   
-+  }									   
-+  return srcSliceH;							   
-+}
-+
-+#endif
-+
-+
- DEFCSP420_CVT (yuv2_rgba32, out_rgba)
- DEFCSP420_CVT (yuv2_argb32, out_argb)
- DEFCSP420_CVT (yuv2_rgb24,  out_rgb24)
-@@ -421,15 +580,15 @@
- // 0123 4567 89ab cdef
- static
- const vector unsigned char
--  demux_u = (vector unsigned char)(0x10,0x00,0x10,0x00,
-+  demux_u = (const vector unsigned char)AVV(0x10,0x00,0x10,0x00,
- 				   0x10,0x04,0x10,0x04,
- 				   0x10,0x08,0x10,0x08,
- 				   0x10,0x0c,0x10,0x0c),
--  demux_v = (vector unsigned char)(0x10,0x02,0x10,0x02,
-+  demux_v = (const vector unsigned char)AVV(0x10,0x02,0x10,0x02,
- 				   0x10,0x06,0x10,0x06,
- 				   0x10,0x0A,0x10,0x0A,
- 				   0x10,0x0E,0x10,0x0E),
--  demux_y = (vector unsigned char)(0x10,0x01,0x10,0x03,
-+  demux_y = (const vector unsigned char)AVV(0x10,0x01,0x10,0x03,
- 				   0x10,0x05,0x10,0x07,
- 				   0x10,0x09,0x10,0x0B,
- 				   0x10,0x0D,0x10,0x0F);
-@@ -460,25 +619,25 @@
-     for (j=0;j<w/16;j++) {
-       uyvy = vec_ld (0, img);
-       U = (vector signed short)
--	vec_perm (uyvy, (vector unsigned char)(0), demux_u);
-+	vec_perm (uyvy, (vector unsigned char)AVV(0), demux_u);
- 
-       V = (vector signed short)
--	vec_perm (uyvy, (vector unsigned char)(0), demux_v);
-+	vec_perm (uyvy, (vector unsigned char)AVV(0), demux_v);
- 
-       Y = (vector signed short)
--	vec_perm (uyvy, (vector unsigned char)(0), demux_y);
-+	vec_perm (uyvy, (vector unsigned char)AVV(0), demux_y);
- 
-       cvtyuvtoRGB (c, Y,U,V,&R0,&G0,&B0);
- 
-       uyvy = vec_ld (16, img);
-       U = (vector signed short)
--	vec_perm (uyvy, (vector unsigned char)(0), demux_u);
-+	vec_perm (uyvy, (vector unsigned char)AVV(0), demux_u);
- 
-       V = (vector signed short)
--	vec_perm (uyvy, (vector unsigned char)(0), demux_v);
-+	vec_perm (uyvy, (vector unsigned char)AVV(0), demux_v);
- 
-       Y = (vector signed short)
--	vec_perm (uyvy, (vector unsigned char)(0), demux_y);
-+	vec_perm (uyvy, (vector unsigned char)AVV(0), demux_y);
- 
-       cvtyuvtoRGB (c, Y,U,V,&R1,&G1,&B1);
- 
-@@ -492,6 +651,7 @@
-       img += 32;
-     }
-   }
-+  return srcSliceH;
- }
- 
- 
-@@ -554,9 +714,6 @@
-     case IMGFMT_RGB32:
-       MSG_WARN("ALTIVEC: Color Space UYVY -> RGB32\n");
-       return altivec_uyvy_rgb32;
--    case IMGFMT_RGB24:
--    case IMGFMT_BGR32:
--
-     default: return NULL;
-     }
-     break;
-@@ -565,102 +722,38 @@
-   return NULL;
- }
- 
--
--int yuv2rgb_altivec_init_tables (SwsContext *c, const int inv_table[4])
-+void yuv2rgb_altivec_init_tables (SwsContext *c, const int inv_table[4],int brightness,int contrast, int saturation)
- {
--
--  vector signed short
--    CY  = (vector signed short)(0x7fff),
--    CRV = (vector signed short)(22972),
--    CBU = (vector signed short)(29029),
--    CGU = (vector signed short)(-11276),
--    CGV = (vector signed short)(-23400),
--    OY;
--
--  vector unsigned short CSHIFT = (vector unsigned short)(1);
--
--  vector signed short Y0;
--  int brightness = c->brightness,  contrast = c->contrast,  saturation = c->saturation;
--  int64_t crv  __attribute__ ((aligned(16)));
--  int64_t cbu  __attribute__ ((aligned(16)));
--  int64_t cgu  __attribute__ ((aligned(16)));
--  int64_t cgv  __attribute__ ((aligned(16)));
--  short tmp __attribute__ ((aligned(16)));
--
--  int64_t cy  = (1<<16)-1;
--  int64_t oy  = 0;
--
--  if ((c->flags & SWS_CPU_CAPS_ALTIVEC) == 0)
--    return;
--
--  crv = inv_table[0];
--  cbu = inv_table[1];
--  cgu = inv_table[2];
--  cgv = inv_table[3];
--
-+  union {
-+  	signed short tmp[8] __attribute__ ((aligned(16)));
-+	vector signed short vec;
-+	} buf;
-+
-+  buf.tmp[0] =  ( (0xffffLL) * contrast>>8 )>>9;			//cy
-+  buf.tmp[1] =  -256*brightness;					//oy
-+  buf.tmp[2] =  (inv_table[0]>>3) *(contrast>>16)*(saturation>>16);	//crv
-+  buf.tmp[3] =  (inv_table[1]>>3) *(contrast>>16)*(saturation>>16);	//cbu
-+  buf.tmp[4] = -((inv_table[2]>>1)*(contrast>>16)*(saturation>>16));	//cgu
-+  buf.tmp[5] = -((inv_table[3]>>1)*(contrast>>16)*(saturation>>16));	//cgv
-+
-+
-+  c->CSHIFT = (vector unsigned short)vec_splat((vector unsigned short)AVV(2),0);
-+  c->CY  = vec_splat ((vector signed short)buf.vec, 0);
-+  c->OY  = vec_splat ((vector signed short)buf.vec, 1);
-+  c->CRV  = vec_splat ((vector signed short)buf.vec, 2);
-+  c->CBU  = vec_splat ((vector signed short)buf.vec, 3);
-+  c->CGU  = vec_splat ((vector signed short)buf.vec, 4);
-+  c->CGV  = vec_splat ((vector signed short)buf.vec, 5);
- #if 0
--  printf ("crv: %hvx\n", CRV);
--  printf ("cbu: %hvx\n", CBU);
--  printf ("cgv: %hvx\n", CGV);
--  printf ("cgu: %hvx\n", CGU);
--
--  printf ("contrast: %d,   brightness: %d, saturation: %d\n", contrast, brightness, saturation);
--
--  printf("%lld %lld %lld %lld %lld\n", cy, crv, cbu, cgu, cgv);
--#endif
--
--  cy = (cy *contrast             )>>17;
--  crv= (crv*contrast * saturation)>>32;
--  cbu= (cbu*contrast * saturation)>>32;
--  cgu= (cgu*contrast * saturation)>>32;
--  cgv= (cgv*contrast * saturation)>>32;
--
--  oy -= 256*brightness;
--
--
--  //printf("%llx %llx %llx %llx %llx\n", cy, crv, cbu, cgu, cgv);
--
--  //  vector signed short CBU,CRV,CGU,CGY,CY;
--  tmp = cy;
--  CY = vec_lde (0, &tmp);
--  CY  = vec_splat (CY, 0);
--
--  tmp = oy;
--  OY = vec_lde (0, &tmp);
--  OY  = vec_splat (OY, 0);
--
--  tmp = crv>>3;
--  CRV = vec_lde (0, &tmp);
--  CRV  = vec_splat (CRV, 0);
--  tmp = cbu>>3;
--  CBU = vec_lde (0, &tmp);
--  CBU  = vec_splat (CBU, 0);
--
--  tmp = -(cgu>>1);
--  CGU = vec_lde (0, &tmp);
--  CGU  = vec_splat (CGU, 0);
--  tmp = -(cgv>>1);
--  CGV = vec_lde (0, &tmp);
--  CGV  = vec_splat (CGV, 0);
--
--  CSHIFT = (vector unsigned short)(2);
--#if 1
--  c->CSHIFT = CSHIFT;
--  c->CY = CY;
--  c->OY = OY;
--  c->CRV = CRV;
--  c->CBU = CBU;
--  c->CGU = CGU;
--  c->CGV = CGV;
--#endif
--#if 1
--  printf ("cy:  %hvx\n", CY);
--  printf ("oy:  %hvx\n", OY);
--  printf ("crv: %hvx\n", CRV);
--  printf ("cbu: %hvx\n", CBU);
--  printf ("cgv: %hvx\n", CGV);
--  printf ("cgu: %hvx\n", CGU);
-+{
-+int i;
-+char *v[6]={"cy","oy","crv","cbu","cgu","cgv"};
-+for (i=0; i<6;i++)
-+  printf("%s %d ", v[i],buf.tmp[i] );
-+  printf("\n");
-+}
- #endif
-+ return;
- }
- 
- 
-@@ -672,15 +765,16 @@
- {
-   int i,j;
-   short tmp __attribute__((aligned (16)));
--  short *p;
-+  int16_t *p;
-   short *f;
-   vector signed short X,X0,X1,Y0,U0,V0,Y1,U1,V1,U,V;
-   vector signed short R0,G0,B0,R1,G1,B1;
- 
-   vector unsigned char R,G,B,pels[3];
-   vector unsigned char *out,*nout;
--  vector signed short   RND = (vector signed short)(1<<3);
--  vector unsigned short SCL = (vector unsigned short)(4);
-+
-+  vector signed short   RND = vec_splat((vector signed short)AVV(1<<3),0);
-+  vector unsigned short SCL = vec_splat((vector unsigned short)AVV(4),0);
-   unsigned long scratch[16] __attribute__ ((aligned (16)));
- 
-   vector signed short *vYCoeffsBank, *vCCoeffsBank;
-@@ -832,5 +926,3 @@
-   if (vCCoeffsBank) free (vCCoeffsBank);
- 
- }
--
--
diff --git a/media-video/mplayer/files/mplayer-gif.patch b/media-video/mplayer/files/mplayer-gif.patch
deleted file mode 100644
index 5f8ff60003c1..000000000000
--- a/media-video/mplayer/files/mplayer-gif.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- 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/files/mplayer-odml.patch b/media-video/mplayer/files/mplayer-odml.patch
deleted file mode 100644
index 9d6a05e751fc..000000000000
--- a/media-video/mplayer/files/mplayer-odml.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN MPlayer-1.0pre4-orig/libmpdemux/aviheader.c MPlayer-1.0pre4/libmpdemux/aviheader.c
---- MPlayer-1.0pre4-orig/libmpdemux/aviheader.c	2004-04-27 18:08:46.000000000 -0500
-+++ MPlayer-1.0pre4/libmpdemux/aviheader.c	2004-07-22 20:58:18.451988624 -0500
-@@ -225,9 +225,7 @@
-       DWORD i;
-       unsigned msize = 0;
-       avisuperindex_chunk *s;
--      // FIXME: do not use odml index for files that don't need it.
--      // apparently the odml code is buggy!
--      if (demuxer->movi_end < 0x7fffffff) break;
-+/*    if (demuxer->movi_end < 0x7fffffff) break;*/
-       priv->suidx_size++;
-       priv->suidx = realloc(priv->suidx, priv->suidx_size * sizeof (avisuperindex_chunk));
-       s = &priv->suidx[priv->suidx_size-1];
diff --git a/media-video/mplayer/files/mplayer-x11.patch b/media-video/mplayer/files/mplayer-x11.patch
deleted file mode 100644
index 9d58803b39be..000000000000
--- a/media-video/mplayer/files/mplayer-x11.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig      2005-02-03 11:34:09.173887311 +0000
-+++ configure   2005-02-03 11:57:59.202194624 +0000
-@@ -3134,7 +3134,7 @@
-
- echocheck "X11 libs presence"
- if test -z "$_ld_x11" ; then
--  for I in /usr/X11R6/lib /usr/lib/X11R6 /usr/X11/lib /usr/lib32 /usr/openwin/lib /usr/X11R6/lib64 ; do
-+  for I in /usr/X11R6/lib /usr/lib/X11R6 /usr/X11/lib /usr/lib32 /usr/openwin/lib /usr/X11R6/lib64 /usr/lib/X11 /usr/lib; do
-     if test -d "$I" && ( test -f "$I/libX11.so" || test -f "$I/libX11.a" || test -f "$I/libX11.dll.a" ) ; then
-       _ld_x11="-L$I"
-       echores "yes (using $I)"
diff --git a/media-video/mplayer/files/real_demux.patch b/media-video/mplayer/files/real_demux.patch
deleted file mode 100644
index b718f602feb6..000000000000
--- a/media-video/mplayer/files/real_demux.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- libmpdemux/demux_real.c	2004-04-28 05:04:26.000000000 +0900
-+++ libmpdemux/demux_real.c	2004-06-26 03:45:56.000000000 +0900
-@@ -207,7 +207,6 @@
- 	goto read_index;
- 
- end:
--    demuxer->seekable = 1; /* got index, we're able to seek */
-     if (i == -256)
- 	stream_reset(demuxer->stream);
-     stream_seek(demuxer->stream, origpos);
-@@ -221,7 +220,7 @@
- 
- static void add_index_item(demuxer_t *demuxer, int stream_id, int timestamp, int offset)
- {
--  if (index_mode > 0 && (unsigned)stream_id < MAX_STREAMS)
-+  if ((unsigned)stream_id < MAX_STREAMS)
-   {
-     real_priv_t *priv = demuxer->priv;
-     real_index_table_t *index;
-@@ -242,7 +241,6 @@
-     index = &priv->index_table[stream_id][priv->index_table_size[stream_id]++];
-     index->timestamp = timestamp;
-     index->offset = offset;
--    demuxer->seekable = 1;
-   }
- }
- 
-@@ -308,13 +306,11 @@
-     stream_skip(demuxer->stream, 14);
-     add_index_segment(demuxer, -1, -1);
-   }
--  demuxer->seekable = 0;
-   for (i = 0; i < MAX_STREAMS; i++)
-   {
-     if (priv->index_table_size[i] > 0)
-     {
-       dump_index(demuxer, i);
--      demuxer->seekable = 1; /* got index, we're able to seek */
-     }
-   }
-   stream_reset(demuxer->stream);
-@@ -406,7 +402,6 @@
- 	goto read_index;
- 
- end:
--    demuxer->seekable = 1; /* got index, we're able to seek */
-     if (i == -256)
- 	stream_reset(demuxer->stream);
-     stream_seek(demuxer->stream, origpos);
-@@ -1193,10 +1188,6 @@
- 		    sh->wf->cbSize = 0;
- 		    sh->format = MKTAG(buf[0], buf[1], buf[2], buf[3]);
- 
--		    if ((version != 3) && (hdr_size != 0x4e)) {
--		    	mp_msg(MSGT_DEMUX,MSGL_V,"skipping %d extra header bytes\n", hdr_size-0x4e);
--		    	stream_skip(demuxer->stream, hdr_size-0x4e);
--		    }
- #if 0
- 		    switch (sh->format){
- 			case MKTAG('d', 'n', 'e', 't'):
-@@ -1465,16 +1456,35 @@
-     if (priv->num_of_packets == 0)
- 	priv->num_of_packets = -10;
- 
--    /* disable seeking */
--    demuxer->seekable = 0;
- 
-     priv->audio_need_keyframe = 0;
-     priv->video_after_seek = 0;
- 
--    if (index_mode == 2)
--	generate_index(demuxer);
--    else if (priv->index_chunk_offset && (index_mode == 1))
--	parse_index_chunk(demuxer);
-+    switch (index_mode){
-+	case -1: // untouched
-+	    if (priv->index_chunk_offset && (priv->index_chunk_offset < demuxer->movi_end))
-+	    {
-+		parse_index_chunk(demuxer);
-+		demuxer->seekable = 1;
-+	    }
-+	    break;
-+	case 1: // use (generate index)
-+	    if (priv->index_chunk_offset && (priv->index_chunk_offset < demuxer->movi_end))
-+	    {
-+		parse_index_chunk(demuxer);
-+		demuxer->seekable = 1;
-+	    } else {
-+		generate_index(demuxer);
-+		demuxer->seekable = 1;
-+	    }
-+	    break;
-+	case 2: // force generating index
-+	    generate_index(demuxer);
-+	    demuxer->seekable = 1;
-+	    break;
-+	default: // do nothing
-+    	    break;
-+    }
- 
-     // detect streams:
-     if(demuxer->video->id==-1 && v_streams>0){
-@@ -1525,8 +1535,6 @@
-     int streams = 0;
-     int retried = 0;
- 
--    if ((index_mode != 1) && (index_mode != 2))
--	return 0;
- 
-     if (sh_video && (unsigned)vid < MAX_STREAMS && priv->index_table_size[vid])
- 	streams |= 1;
diff --git a/media-video/mplayer/files/str_undefined.patch b/media-video/mplayer/files/str_undefined.patch
deleted file mode 100644
index 58e252676ab8..000000000000
--- a/media-video/mplayer/files/str_undefined.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- MPlayer-1.0pre4/configure	2004-04-26 18:44:06.000000000 +0900
-+++ MPlayer-1.0pre5/configure	2004-07-15 07:04:42.000000000 +0900
-@@ -2649,6 +2766,34 @@
- fi
- echores "$_strsep"
- 
-+echocheck "strlcpy()"
-+cat > $TMPC << EOF
-+#include <string.h>
-+int main (void) { char *s = "Hello, world!", t[20]; (void) strlcpy(t, s, sizeof( t )); return 0; }
-+EOF
-+_strlcpy=no
-+cc_check && _strlcpy=yes
-+if test "$_strlcpy" = yes ; then
-+ _def_strlcpy='#define HAVE_STRLCPY 1'
-+else
-+ _def_strlcpy='#undef HAVE_STRLCPY'
-+fi
-+echores "$_strlcpy"
-+
-+echocheck "strlcat()"
-+cat > $TMPC << EOF
-+#include <string.h>
-+int main (void) { char *s = "Hello, world!", t[20]; (void) strlcat(t, s, sizeof( t )); return 0; }
-+EOF
-+_strlcat=no
-+cc_check && _strlcat=yes
-+if test "$_strlcat" = yes ; then
-+ _def_strlcat='#define HAVE_STRLCAT 1'
-+else
-+ _def_strlcat='#undef HAVE_STRLCAT'
-+fi
-+echores "$_strlcat"
-+
- echocheck "fseeko()"
- cat > $TMPC << EOF
- #include <stdio.h>
-@@ -6272,6 +6448,18 @@
- /* Define this if your system has strsep */
- $_def_strsep
- 
-+/* Define this if your system has strlcpy */
-+$_def_strlcpy
-+#ifndef HAVE_STRLCPY
-+unsigned int strlcpy (char *dest, char *src, unsigned int size);
-+#endif
-+
-+/* Define this if your system has strlcat */
-+$_def_strlcat
-+#ifndef HAVE_STRLCAT
-+unsigned int strlcat (char *dest, char *src, unsigned int size);
-+#endif
-+
- /* Define this if your system has fseeko */
- $_def_fseeko
- #ifndef HAVE_FSEEKO
---- MPlayer-1.0pre4/osdep/Makefile	2004-03-27 00:21:44.000000000 +0900
-+++ MPlayer-1.0pre5/osdep/Makefile	2004-06-28 02:54:31.000000000 +0900
-@@ -3,7 +3,8 @@
- 
- LIBNAME = libosdep.a
- 
--SRCS= shmem.c strsep.c vsscanf.c scandir.c gettimeofday.c fseeko.c # timer.c
-+SRCS= shmem.c strsep.c strl.c vsscanf.c scandir.c gettimeofday.c fseeko.c \
-+      # timer.c
- 
- ifeq ($(TARGET_ARCH_X86),yes)
- ifeq ($(TARGET_OS),Linux)
diff --git a/media-video/mplayer/files/strl.c b/media-video/mplayer/files/strl.c
deleted file mode 100644
index 22e4cb56c307..000000000000
--- a/media-video/mplayer/files/strl.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* strl(cat|cpy) implementation for systems that do not have it in libc */
-/* strl.c - strlcpy/strlcat implementation
- * Time-stamp: <2004-03-14 njk>
- * (C) 2003-2004 Nicholas J. Kain <njk@aerifal.cx>
- */
-
-#include "../config.h"
-
-#ifndef HAVE_STRLCPY
-unsigned int strlcpy (char *dest, char *src, unsigned int size)
-{
-	register unsigned int i;
-
-	for (i=0; size > 0 && src[i] != '\0'; ++i, size--)
-		dest[i] = src[i];
-
-	dest[i] = '\0';
-
-	return i;
-}
-#endif
-
-#ifndef HAVE_STRLCAT
-unsigned int strlcat (char *dest, char *src, unsigned int size)
-{
-#if 0
-	register unsigned int i, j;
-
-	for(i=0; size > 0 && dest[i] != '\0'; size--, i++);
-	for(j=0; size > 0 && src[j] != '\0'; size--, i++, j++)
-		dest[i] = src[j];
-
-	dest[i] = '\0';
-	return i;
-#else
-	register char *d = dest, *s = src;
-
-	for (; size > 0 && *d != '\0'; size--, d++);
-	for (; size > 0 && *s != '\0'; size--, d++, s++)
-		*d = *s;
-
-	*d = '\0';
-	return (d - dest) + (s - src);
-#endif 
-}
-#endif
-
diff --git a/media-video/mplayer/files/vuln02-fix.diff b/media-video/mplayer/files/vuln02-fix.diff
deleted file mode 100644
index b2bed9f0b0c3..000000000000
--- a/media-video/mplayer/files/vuln02-fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r1.17 -r1.18
---- http.c	13 Nov 2002 09:02:55 -0000	1.17
-+++ http.c	30 Mar 2004 10:58:41 -0000	1.18
-@@ -175,7 +175,7 @@
- 	if( http_hdr->method==NULL ) http_set_method( http_hdr, "GET");
- 	if( http_hdr->uri==NULL ) http_set_uri( http_hdr, "/");
- 	else {
--		uri = (char*)malloc(strlen(http_hdr->uri)*2);
-+		uri = (char*)malloc((strlen(http_hdr->uri)*3) + 1);
- 		if( uri==NULL ) {
- 			mp_msg(MSGT_NETWORK,MSGL_ERR,"Memory allocation failed\n");
- 			return NULL;
diff --git a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild b/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
deleted file mode 100644
index 911d84994c4e..000000000000
--- a/media-video/mplayer/mplayer-1.0_pre5-r5.ebuild
+++ /dev/null
@@ -1,624 +0,0 @@
-# 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.31 2005/04/17 14:05:35 lu_zero Exp $
-
-inherit eutils flag-o-matic kernel-mod
-
-RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowext aalib alsa altivec arts win32codecs bidi debug dga 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 mmxext mythtv nas network nls nvidia oggvorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2 X xanim xinerama xmms xv xvid xvmc"
-
-BLUV=1.4
-SVGV=1.9.17
-
-# Handle PREversions as well
-MY_PV="${PV/_/}"
-MY_P="MPlayer-${MY_PV}try2"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://mplayer/releases/${MY_P}.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
-	mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-	mirror://gentoo/${P}-alsa-gui.patch.tar.bz2
-	svga? ( http://mplayerhq.hu/~alex/svgalib_helper-${SVGV}-mplayer.tar.bz2 )
-	gtk? ( mirror://mplayer/Skin/Blue-${BLUV}.tar.bz2 )"
-
-# Only install Skin if GUI should be build (gtk as USE flag)
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-# 'encode' in USE for MEncoder.
-RDEPEND="xvid? ( >=media-libs/xvid-0.9.0 )
-	x86? (
-		divx4linux? (  >=media-libs/divx4linux-20030428 )
-		real? ( >=media-libs/win32codecs-20040916 )
-		)
-	aalib? ( media-libs/aalib )
-	win32codecs? ( >=media-libs/win32codecs-20040916 )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	bidi? ( dev-libs/fribidi )
-	cdparanoia? ( media-sound/cdparanoia )
-	directfb? ( dev-libs/DirectFB )
-	dga? ( virtual/x11 )
-	dvd? ( dvdread? ( media-libs/libdvdread ) )
-	encode? (
-		media-sound/lame
-		>=media-libs/libdv-0.9.5
-		)
-	esd? ( media-sound/esound )
-	gif? ( media-libs/giflib )
-	ggi? ( media-libs/libggi )
-	gtk? (
-		media-libs/libpng
-		virtual/x11
-		=x11-libs/gtk+-1.2*
-		=dev-libs/glib-1.2*
-		)
-	jpeg? ( media-libs/jpeg )
-	libcaca? ( media-libs/libcaca )
-	lirc? ( app-misc/lirc )
-	lzo? ( dev-libs/lzo )
-	mad? ( media-libs/libmad )
-	matroska? ( >=media-libs/libmatroska-0.7.0 )
-	mpeg? ( media-libs/faad2 )
-	nas? ( media-libs/nas )
-	nls? ( sys-devel/gettext )
-	oggvorbis? ( media-libs/libvorbis )
-	opengl? ( virtual/opengl )
-	png? ( media-libs/libpng )
-	samba? ( >=net-fs/samba-2.2.8a )
-	sdl? ( media-libs/libsdl )
-	svga? ( media-libs/svgalib )
-	!ia64? (
-		theora? ( media-libs/libtheora )
-		live? ( >=media-plugins/live-2004.07.20 )
-		)
-	truetype? ( >=media-libs/freetype-2.1 )
-	xinerama? ( virtual/x11 )
-	jack? ( >=media-libs/bio2jack-0.3-r1 )
-	xmms? ( media-sound/xmms )
-	xanim? ( >=media-video/xanim-2.80.1-r4 )
-	sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-SLOT="0"
-LICENSE="GPL-2"
-#KEYWORDS="~x86 ~ppc ~alpha ~amd64 ~ia64 ~hppa ~sparc"
-#agriffis - uncomment this when ia64 is ready - Chris
-KEYWORDS="x86 ppc alpha amd64 ~hppa sparc ppc64"
-
-# ecpu_check
-# Usage:
-#
-# ecpu_check array_of_cpu_flags
-#
-# array_of_cpu_flags - An array of cpu flags to check against USE flags
-#
-# Checks user USE related cpu flags against /proc/cpuinfo.  If user enables a
-# cpu flag that is not supported in their processor flags, it will warn the
-# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
-# obviously using different cpu flags than their own cpu ).  Examples:
-#
-# CPU_FLAGS=(mmx mmx2 sse sse2)
-# ecpu_check CPU_FLAGS
-# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
-
-ecpu_check() {
-	# Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
-	# and dropping the else if you do not plan on adding anything to that
-	# empty block ....
-	# PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
-	if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
-	then
-		CPU_FLAGS=${1}
-		USER_CPU=`grep "flags" /proc/cpuinfo`
-
-		for flags in `seq 1 ${#CPU_FLAGS[@]}`
-		do
-			if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
-			then
-				ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
-				ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
-			fi
-
-			if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU}  && has ${CPU_FLAGS[${flags} -1]} ${USE}
-			then
-				ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
-				ewarn "Seem to support it!  You might be cross compiling or do not have /proc filesystem"
-				ewarn "enabled.  If either is the case, set CROSSCOMPILE to 1 to disable this warning."
-			fi
-		done
-	fi
-}
-
-pkg_setup() {
-	if use real && use x86 && built_with_use win32codecs real; then
-			REALLIBDIR="/usr/$(get_libdir)/real"
-	fi
-}
-
-src_unpack() {
-
-	unpack ${MY_P}.tar.bz2 \
-		font-arial-iso-8859-1.tar.bz2 font-arial-iso-8859-2.tar.bz2 \
-		font-arial-cp1250.tar.bz2
-
-	use svga && unpack svgalib_helper-${SVGV}-mplayer.tar.bz2
-
-	use gtk && unpack Blue-${BLUV}.tar.bz2
-
-	cd ${S}
-
-	# Custom CFLAGS
-	epatch ${FILESDIR}/${PF}-configure.patch
-	sed -e 's:CFLAGS="custom":CFLAGS=${CFLAGS}:' -i configure
-
-	if use !network; then
-		einfo "Please note, a new network USE flag was added for users"
-		einfo "with networkless installs.  If you use mplayer for streaming"
-		einfo "media, please enable the network USE flag or it will not work!"
-		einfo
-	fi
-
-	# Fix head/tail call for new coreutils
-	epatch ${FILESDIR}/${PN}-0.90-coreutils-fixup.patch
-
-	#bug #49669, horrid syntax errors in help/help_mp-ro.h	
-	epatch ${FILESDIR}/mplayer-1.0_pre5-help_mp-ro.h.patch
-
-	#adds mythtv support to mplayer
-	use mythtv && epatch ${FILESDIR}/mplayer-mythtv.patch
-
-	# GCC 3.4 fixes
-	epatch ${FILESDIR}/mplayer-1.0_pre5-alsa-gcc34.patch
-
-	#Workaround for the altivec softscaler issues
-	epatch ${FILESDIR}/mplayer-1.0_pre5-yuv2rgb_fix.patch
-
-	#bug #55936, eradicator's cachefill patch.
-	epatch ${FILESDIR}/cachefill.patch
-
-	#bug #58082.  Fixes LANGUAGE variable issues
-	epatch ${FILESDIR}/mplayer-1.0_pre5-r1-conf_locale.patch
-
-	#fixes recent api changes to the latest live
-	use live && epatch ${FILESDIR}/${P}-live.patch
-
-	#mplayer gui uses oss all the time.
-	#this patch enables true alsa output in
-	#gmplayer.  Fixes Bug #58619.
-	use alsa && epatch ${DISTDIR}/${P}-alsa-gui.patch.tar.bz2
-
-	# Fix hppa compilation
-	[ "${ARCH}" = "hppa" ] && sed -i -e "s/-O4/-O1/" "${S}/configure"
-
-	if use svga
-	then
-		echo
-		einfo "Enabling vidix non-root mode."
-		einfo "(You need a proper svgalib_helper.o module for your kernel"
-		einfo " to actually use this)"
-		echo
-
-		mv ${WORKDIR}/svgalib_helper ${S}/libdha
-	fi
-
-	# 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
-
-	use ppc64 && epatch ${FILESDIR}/${P}-r4-ppc64.patch
-
-	# backport the gif recognition from pre6...
-	# yay! - Chris
-	epatch ${FILESDIR}/${PN}-gif.patch
-
-	# fixes 80564 involved in x11 lib directory
-	# detection
-	epatch ${FILESDIR}/${PN}-x11.patch
-
-	epatch ${FILESDIR}/${P}-gcc_detection.patch
-}
-
-linguas_warn() {
-	ewarn "Language ${LANG[0]} or ${LANG_CC} not avaliable"
-	ewarn "Language set to English"
-	ewarn "If this is a mistake, please set the"
-	ewarn "First LINGUAS language to one of the following"
-	ewarn ""
-	ewarn "bg - Bulgarian"
-	ewarn "cz - Czech"
-	ewarn "de - German"
-	ewarn "dk - Danish"
-	ewarn "el - Greek"
-	ewarn "en - English"
-	ewarn "es - Spanish"
-	ewarn "fr - French"
-	ewarn "hu - Hungarian"
-	ewarn "ja - Japanese"
-	ewarn "ko - Korean"
-	ewarn "mk - FYRO Macedonian"
-	ewarn "nl - Dutch"
-	ewarn "no - Norwegian"
-	ewarn "pl - Polish"
-	ewarn "pt_BR - Portuguese - Brazil"
-	ewarn "ro - Romanian"
-	ewarn "ru - Russian"
-	ewarn "sk - Slovak"
-	ewarn "tr - Turkish"
-	ewarn "uk - Ukranian"
-	ewarn "zh_CN - Chinese - China"
-	ewarn "zh_TW - Chinese - Taiwan"
-	export LINGUAS="en ${LINGUAS}"
-}
-
-src_compile() {
-
-	# have fun with LINGUAS variable
-	if [[ -n $LINGUAS ]]
-	then
-		# LINGUAS has stuff in it, start the logic
-		LANG=( $LINGUAS )
-		if [ -e ${S}/help/help_mp-${LANG[0]}.h ]
-		then
-			einfo "Setting MPlayer messages to language: ${LANG[0]}"
-		else
-			LANG_CC=${LANG[0]}
-			if [ ${#LANG_CC} -ge 2 ]
-			then
-				LANG_CC=${LANG_CC:0:2}
-				if [ -e ${S}/help/help_mp-${LANG_CC}.h ]
-				then
-					einfo "Setting MPlayer messages to language ${LANG_CC}"
-					export LINGUAS="${LANG_CC} ${LINGUAS}"
-				else
-					linguas_warn
-				fi
-			else
-				linguas_warn
-			fi
-		fi
-	else
-		# sending blank LINGUAS, make it default to en
-		einfo "No LINGUAS given, defaulting to English"
-		export LINGUAS="en ${LINGUAS}"
-	fi
-
-	# check cpu flags
-	if use x86
-	then
-		CPU_FLAGS=( 3dnow 3dnowext mmx sse sse2 mmxext )
-		ecpu_check CPU_FLAGS
-	fi
-
-	# let's play the filtration game!  MPlayer hates on all!
-	strip-flags
-
-	# ugly optimizations cause MPlayer to cry on x86 systems!
-	if use x86 ; then
-		replace-flags -O0 -O2
-		replace-flags -O3 -O2
-		filter-flags -fPIC -fPIE
-	fi
-
-	local myconf=
-	################
-	#Optional features#
-	###############
-	myconf="${myconf} $(use_enable bidi fribidi)"
-	myconf="${myconf} $(use_enable cdparanoia)"
-	if use dvd; then
-		myconf="${myconf} $(use_enable dvdread) $(use_enable !dvdread mpdvdkit)"
-	else
-		myconf="${myconf} --disable-dvdread --disable-mpdvdkit"
-	fi
-	myconf="${myconf} $(use_enable edl)"
-	myconf="${myconf} $(use_enable encode mencoder)"
-	myconf="${myconf} $(use_enable gtk gui)"
-
-	if use !gtk && use !X && use !xv && use !xinerama; then
-		myconf="${myconf} --disable-gui --disable-x11 --disable-xv --disable-xmga --disable-xinerama --disable-vm --disable-xvmc"
-	else
-		#note we ain't touching --enable-vm.  That should be locked down in the future.
-		myconf="${myconf} --enable-x11 $(use_enable xinerama) $(use_enable xv) $(use_enable gtk gui)"
-	fi
-
-	# this looks like a hack, but the 
-	# --enable-dga needs a paramter, but there's no surefire
-	# way to tell what it is.. so I'm letting MPlayer decide
-	# the enable part
-	use !dga && myconf="${myconf} --disable-dga"
-
-	# disable png *only* if gtk && png aren't on
-	if use png || use gtk; then
-		myconf="${myconf} --enable-png"
-	else
-		myconf="${myconf} --disable-png"
-	fi
-	myconf="${myconf} $(use_enable ipv6 inet6)"
-	myconf="${myconf} $(use_enable joystick)"
-	myconf="${myconf} $(use_enable lirc)"
-	if use ia64 || use !network; then
-		myconf="${myconf} --disable-live"
-	else
-		myconf="${myconf} $(use_enable live)"
-	fi
-	myconf="${myconf} $(use_enable network) $(use_enable network ftp)"
-	myconf="${myconf} $(use_enable rtc)"
-	myconf="${myconf} $(use_enable samba smb)"
-	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 #
-	########
-	myconf="${myconf} $(use_enable divx4linux)"
-	myconf="${myconf} $(use_enable gif)"
-	myconf="${myconf} $(use_enable jpeg)"
-	myconf="${myconf} $(use_enable lzo liblzo)"
-	myconf="${myconf} $(use_enable matroska external-matroska) $(use_enable !matroska internal-matroska)"
-	myconf="${myconf} $(use_enable mpeg external-faad) $(use_enable !mpeg internal-faad)"
-	myconf="${myconf} $(use_enable oggvorbis vorbis)"
-	if use ia64; then
-		myconf="${myconf} --disable-theora"
-	else
-		myconf="${myconf} $(use_enable theora)"
-	fi
-	myconf="${myconf} $(use_enable xmms)"
-	myconf="${myconf} $(use_enable xvid)"
-
-	if use x86; then
-		myconf="${myconf} $(use_enable win32codecs win32)"
-		myconf="${myconf} $(use_enable real)"
-	fi
-
-	#############
-	# Video Output #
-	#############
-	myconf="${myconf} $(use_enable 3dfx)"
-	if use 3dfx; then
-		myconf="${myconf} --enable-tdfxvid"
-	else
-		myconf="${myconf} --disable-tdfxvid"
-	fi
-	if use fbcon && use 3dfx; then
-		myconf="${myconf} --enable-tdfxfb"
-	else
-		myconf="${myconf} --disable-tdfxfb"
-	fi
-	myconf="${myconf} $(use_enable aalib aa)"
-	myconf="${myconf} $(use_enable directfb)"
-	myconf="${myconf} $(use_enable dvb)"
-	myconf="${myconf} $(use_enable fbcon fbdev)"
-	myconf="${myconf} $(use_enable ggi)"
-	myconf="${myconf} $(use_enable libcaca caca)"
-	if use matrox && use X; then
-		myconf="${myconf} $(use_enable matrox xmga)"
-	fi
-	myconf="${myconf} $(use_enable matrox mga)"
-	myconf="${myconf} $(use_enable opengl gl)"
-	myconf="${myconf} $(use_enable sdl)"
-
-	if use svga
-	then
-		myconf="${myconf} --enable-svga"
-	else
-		myconf="${myconf} --disable-svga --disable-vidix"
-	fi
-
-	myconf="${myconf} $(use_enable tga)"
-
-	( use xvmc && use nvidia ) \
-		&& myconf="${myconf} --enable-xvmc --with-xvmclib=XvMCNVIDIA"
-
-	( use xvmc && use i8x0 ) \
-		&& myconf="${myconf} --enable-xvmc --with-xvmclib=I810XvMC"
-
-	( use xvmc && use nvidia && use i8x0 ) \
-		&& {
-			eerror "Invalid combination of USE flags"
-			eerror "When building support for xvmc, you may only"
-			eerror "include support for one video card:"
-			eerror "   nvidia, i8x0"
-			eerror ""
-			eerror "Emerge again with different USE flags"
-
-			exit 1
-		}
-
-	( use xvmc && ! use nvidia && ! use i8x0 ) && {
-		ewarn "You tried to build with xvmc support."
-		ewarn "No supported graphics hardware was specified."
-		ewarn ""
-		ewarn "No xvmc support will be included."
-		ewarn "Please one appropriate USE flag and re-emerge:"
-		ewarn "   nvidia or i8x0"
-
-		myconf="${myconf} --disable-xvmc"
-	}
-
-	#############
-	# Audio Output #
-	#############
-	myconf="${myconf} $(use_enable alsa)"
-	myconf="${myconf} $(use_enable arts)"
-	myconf="${myconf} $(use_enable esd)"
-	myconf="${myconf} $(use_enable mad)"
-	myconf="${myconf} $(use_enable nas)"
-	myconf="${myconf} $(use_enable oss ossaudio)"
-
-	#################
-	# Advanced Options #
-	#################
-	myconf="${myconf} $(use_enable 3dnow)"
-	myconf="${myconf} $(use_enable 3dnowext 3dnowex)";
-	myconf="${myconf} $(use_enable sse)"
-	myconf="${myconf} $(use_enable sse2)"
-	myconf="${myconf} $(use_enable mmx)"
-	myconf="${myconf} $(use_enable mmxext mmx2)"
-	myconf="${myconf} $(use_enable debug)"
-	myconf="${myconf} $(use_enable nls i18n)"
-
-	if use ppc64
-	then
-		myconf="${myconf} --disable-altivec"
-	else
-		myconf="${myconf} $(use_enable altivec)"
-		use altivec && append-flags -maltivec -mabi=altivec
-	fi
-
-	if use xanim
-	then
-		myconf="${myconf} --with-xanimlibdir=/usr/lib/xanim/mods"
-	fi
-
-	if [ -e /dev/.devfsd ]
-	then
-		myconf="${myconf} --enable-linux-devfs"
-	fi
-
-	#leave this in place till the configure/compilation borkage is completely corrected back to pre4-r4 levels.
-	# it's intended for debugging so we can get the options we configure mplayer w/, rather then hunt about.
-	# it *will* be removed asap; in the meantime, doesn't hurt anything.
-	echo "${myconf}" > ${T}/configure-options
-
-	./configure \
-		--prefix=/usr \
-		--confdir=/usr/share/mplayer \
-		--datadir=/usr/share/mplayer \
-		--disable-runtime-cpudetection \
-		--enable-largefiles \
-		--enable-menu \
-		--with-reallibdir=${REALLIBDIR} \
-		--with-x11incdir=/usr/X11R6/include \
-		${myconf} || die
-
-	einfo "Make"
-	make all || die "Failed to build MPlayer!"
-	einfo "Make completed"
-
-	# We build the shared libpostproc.so here so that our
-	# mplayer binary is not linked to it, ensuring that we
-	# do not run into issues ... (bug #14479)
-	cd ${S}/libavcodec/libpostproc
-	make SHARED_PP="yes" || die "Failed to build libpostproc.so!"
-}
-
-src_install() {
-
-	einfo "Make install"
-	make prefix=${D}/usr \
-	     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!"
-	einfo "Make install completed"
-
-	dodoc AUTHORS ChangeLog README
-	# Install the documentation; DOCS is all mixed up not just html
-	if use doc ; then
-		find "${S}/DOCS" -type d | xargs -- chmod 0755
-		find "${S}/DOCS" -type f | xargs -- chmod 0644
-		cp -r "${S}/DOCS" "${D}/usr/share/doc/${PF}/" || die
-	fi
-
-	# Copy misc tools to documentation path, as they're not installed directly
-	# and yes, we are nuking the +x bit.
-	find "${S}/TOOLS" -type d | xargs -- chmod 0755
-	find "${S}/TOOLS" -type f | xargs -- chmod 0644
-	cp -r "${S}/TOOLS" "${D}/usr/share/doc/${PF}/" || die
-
-	# Install the default Skin and Gnome menu entry
-	if use gtk; then
-		dodir /usr/share/mplayer/Skin
-		cp -r ${WORKDIR}/Blue ${D}/usr/share/mplayer/Skin/default || die
-
-		# Fix the symlink
-		rm -rf ${D}/usr/bin/gmplayer
-		dosym mplayer /usr/bin/gmplayer
-	fi
-
-	if use gnome; then
-		insinto /usr/share/pixmaps
-		newins ${S}/Gui/mplayer/pixmaps/logo.xpm mplayer.xpm
-		insinto /usr/share/gnome/apps/Multimedia
-		doins ${FILESDIR}/mplayer.desktop
-	fi
-
-	dodir /usr/share/mplayer/fonts
-	local x=
-	# Do this generic, as the mplayer people like to change the structure
-	# of their zips ...
-	for x in $(find ${WORKDIR}/ -type d -name 'font-arial-*')
-	do
-		cp -Rd ${x} ${D}/usr/share/mplayer/fonts
-	done
-	# Fix the font symlink ...
-	rm -rf ${D}/usr/share/mplayer/font
-	dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
-
-	insinto /etc
-	newins ${S}/etc/example.conf mplayer.conf
-	dosed -e 's/include =/#include =/' /etc/mplayer.conf
-	dosed -e 's/fs=yes/fs=no/' /etc/mplayer.conf
-	dosym ../../../etc/mplayer.conf /usr/share/mplayer/mplayer.conf
-
-	#mv the midentify script to /usr/bin for emovix.
-	cp ${D}/usr/share/doc/${PF}/TOOLS/midentify ${D}/usr/bin
-	chmod a+x ${D}/usr/bin/midentify
-
-	insinto /usr/share/mplayer
-	doins ${S}/etc/codecs.conf
-	doins ${S}/etc/input.conf
-	doins ${S}/etc/menu.conf
-}
-
-pkg_preinst() {
-
-	if [ -d "${ROOT}/usr/share/mplayer/Skin/default" ]
-	then
-		rm -rf ${ROOT}/usr/share/mplayer/Skin/default
-	fi
-}
-
-pkg_postinst() {
-
-	if use matrox; then
-		depmod -a &>/dev/null || :
-	fi
-
-	if use alsa ; then
-		einfo "For those using alsa, please note the ao driver name is no longer"
-		einfo "alsa9x or alsa1x.  It is now just 'alsa' (omit quotes)."
-		einfo "The syntax for optional drivers has also changed.  For example"
-		einfo "if you use a dmix driver called 'dmixer,' use"
-		einfo "ao=alsa:device=dmixer instead of ao=alsa:dmixer"
-		einfo "Some users may not need to specify the extra driver with the ao="
-		einfo "command."
-	fi
-}
-
-pkg_postrm() {
-
-	# Cleanup stale symlinks
-	if [ -L ${ROOT}/usr/share/mplayer/font -a \
-	     ! -e ${ROOT}/usr/share/mplayer/font ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/font
-	fi
-
-	if [ -L ${ROOT}/usr/share/mplayer/subfont.ttf -a \
-	     ! -e ${ROOT}/usr/share/mplayer/subfont.ttf ]
-	then
-		rm -f ${ROOT}/usr/share/mplayer/subfont.ttf
-	fi
-}
-