MPlayer clutter removed. Cleanup on aisle 5.

23 files changed, 0 insertions, 1752 deletions

diff --git a/media-video/mplayer/files/amd64_fix_the_blue_love.patch b/media-video/mplayer/files/amd64_fix_the_blue_love.patch
deleted file mode 100644
index 9b96c00dc529..000000000000
--- a/media-video/mplayer/files/amd64_fix_the_blue_love.patch
+++ /dev/null
@@ -1,411 +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;
- 
- 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/ws.c MPlayer-1.0pre5/Gui/wm/ws.c
---- MPlayer-1.0pre4/Gui/wm/ws.c	2003-12-01 01:36:04.000000000 +0900
-+++ MPlayer-1.0pre5/Gui/wm/ws.c	2004-07-12 07:27:18.000000000 +0900
-@@ -754,37 +770,57 @@
- 
-  if ( win->isFullScreen )
-   {
--   win->X=win->OldX;
--   win->Y=win->OldY;
--   win->Width=win->OldWidth;
--   win->Height=win->OldHeight;
--   win->isFullScreen=False;
--   decoration=win->Decorations;
-+   vo_x11_ewmh_fullscreen( 0 ); // removes fullscreen state if wm supports EWMH
-+   if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // shouldn't be needed with EWMH fs
-+    {
-+     win->X=win->OldX;
-+     win->Y=win->OldY;
-+     win->Width=win->OldWidth;
-+     win->Height=win->OldHeight;
-+     decoration=win->Decorations;
-+    }
-+
- #ifdef ENABLE_DPMS
-    wsScreenSaverOn( wsDisplay );
- #endif
-+
-+   win->isFullScreen=False;
-   }
-   else
-    {
--    win->OldX=win->X; win->OldY=win->Y;
--    win->OldWidth=win->Width; win->OldHeight=win->Height;
--    win->X=wsOrgX; win->Y=wsOrgY;
--    win->Width=wsMaxX; win->Height=wsMaxY;
-+    if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // shouldn't be needed with EWMH fs
-+     {
-+      win->OldX=win->X; win->OldY=win->Y;
-+      win->OldWidth=win->Width; win->OldHeight=win->Height;
-+      win->X=wsOrgX; win->Y=wsOrgY;
-+      win->Width=wsMaxX; win->Height=wsMaxY;
-+     }
-+
-     win->isFullScreen=True;
- #ifdef ENABLE_DPMS
-     wsScreenSaverOff( wsDisplay );
- #endif
-+    
-+     vo_x11_ewmh_fullscreen( 1 ); // adds fullscreen state if wm supports EWMH
-    }
- 
-- vo_x11_decoration( wsDisplay,win->WindowID,decoration );
-- vo_x11_sizehint( win->X,win->Y,win->Width,win->Height,0 );
-- vo_x11_setlayer( wsDisplay,win->WindowID,win->isFullScreen );
-+  if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // shouldn't be needed with EWMH fs
-+   {
-+    vo_x11_decoration( wsDisplay,win->WindowID,decoration );
-+    vo_x11_sizehint( win->X,win->Y,win->Width,win->Height,0 );
-+    vo_x11_setlayer( wsDisplay,win->WindowID,win->isFullScreen );
- 
--if ((!(win->isFullScreen)) & vo_ontop) vo_x11_setlayer(wsDisplay, win->WindowID,1);
-+    if ((!(win->isFullScreen)) & vo_ontop) vo_x11_setlayer(wsDisplay, win->WindowID,1);
-+
-+    XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height );
-+   }
- 
-  if ( vo_wm_type == 0 && !(vo_fsmode&16) )
--  XWithdrawWindow( wsDisplay,win->WindowID,wsScreen );
-- XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height );
-+  {
-+   XWithdrawWindow( wsDisplay,win->WindowID,wsScreen );
-+  }
-+
-+
-  XMapRaised( wsDisplay,win->WindowID );
-  XRaiseWindow( wsDisplay,win->WindowID );
-  XFlush( wsDisplay );
diff --git a/media-video/mplayer/files/default-skin.diff b/media-video/mplayer/files/default-skin.diff
deleted file mode 100644
index 1d64dfdcb2ed..000000000000
--- a/media-video/mplayer/files/default-skin.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- skin.orig	Mon Oct  1 22:25:44 2001
-+++ skin	Mon Oct  1 22:24:25 2001
-@@ -36,7 +36,7 @@
-   hpotmeter = pos, 14, 9, NULL, 100, 50, 310, 63,  42, 9, evSetBalance
- 
-   ; potmeter=phasebitmaps,phases,default value,x,y,sx,sy,msg
--  potmeter =volume, 51, 0, 311, 17, 40, 40, evSetVolume
-+  potmeter =volume, 50, 0, 311, 17, 40, 40, evSetVolume
- 
-   ; font=fontname,fontid
-   font = symbols, symbols
diff --git a/media-video/mplayer/files/digest-mplayer-0.92-r1 b/media-video/mplayer/files/digest-mplayer-0.92-r1
deleted file mode 100644
index 0e4aafd4f213..000000000000
--- a/media-video/mplayer/files/digest-mplayer-0.92-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 c4e003fc6c6f82c1cae96a95eb9b2d28 MPlayer-0.92.tar.bz2 3466985
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 64e2d18438bbef16822c141d846884f6 Blue-1.0.tar.bz2 219130
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre2-r1 b/media-video/mplayer/files/digest-mplayer-1.0_pre2-r1
deleted file mode 100644
index 3a9d6d622ba7..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre2-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 a60c179468f85e83e3f9e1922e81ad64 MPlayer-1.0pre2.tar.bz2 4341127
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 64e2d18438bbef16822c141d846884f6 Blue-1.0.tar.bz2 219130
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre3-r4 b/media-video/mplayer/files/digest-mplayer-1.0_pre3-r4
deleted file mode 100644
index 89f8208a6f50..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre3-r4
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 998becb79417c6a14d15c07e85188b82 MPlayer-1.0pre3.tar.bz2 4714725
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 64e2d18438bbef16822c141d846884f6 Blue-1.0.tar.bz2 219130
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre3-r5 b/media-video/mplayer/files/digest-mplayer-1.0_pre3-r5
deleted file mode 100644
index 89f8208a6f50..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre3-r5
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 998becb79417c6a14d15c07e85188b82 MPlayer-1.0pre3.tar.bz2 4714725
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 64e2d18438bbef16822c141d846884f6 Blue-1.0.tar.bz2 219130
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre4 b/media-video/mplayer/files/digest-mplayer-1.0_pre4
deleted file mode 100644
index 7d0a61f16837..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre4
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 83ebac0f05b192516a41fca2350ca01a MPlayer-1.0pre4.tar.bz2 4913390
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 64e2d18438bbef16822c141d846884f6 Blue-1.0.tar.bz2 219130
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r1 b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r1
deleted file mode 100644
index 7d0a61f16837..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 83ebac0f05b192516a41fca2350ca01a MPlayer-1.0pre4.tar.bz2 4913390
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 64e2d18438bbef16822c141d846884f6 Blue-1.0.tar.bz2 219130
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r2 b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r2
deleted file mode 100644
index 7d0a61f16837..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 83ebac0f05b192516a41fca2350ca01a MPlayer-1.0pre4.tar.bz2 4913390
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 64e2d18438bbef16822c141d846884f6 Blue-1.0.tar.bz2 219130
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r3 b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r3
deleted file mode 100644
index 7d0a61f16837..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r3
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 83ebac0f05b192516a41fca2350ca01a MPlayer-1.0pre4.tar.bz2 4913390
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-MD5 64e2d18438bbef16822c141d846884f6 Blue-1.0.tar.bz2 219130
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r4 b/media-video/mplayer/files/digest-mplayer-1.0_pre4-r4
deleted file mode 100644
index 18d8bea4d6ed..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre4-r4
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 83ebac0f05b192516a41fca2350ca01a MPlayer-1.0pre4.tar.bz2 4913390
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-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/mencoder-segfault.patch b/media-video/mplayer/files/mencoder-segfault.patch
deleted file mode 100644
index bf20145139af..000000000000
--- a/media-video/mplayer/files/mencoder-segfault.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: mencoder.c
-===================================================================
-RCS file: /cvsroot/mplayer/main/mencoder.c,v
-retrieving revision 1.218
-diff -u -r1.218 mencoder.c
---- mencoder.c	13 Aug 2003 16:29:00 -0000	1.218
-+++ mencoder.c	20 Aug 2003 22:34:31 -0000
-@@ -488,7 +488,7 @@
- sh_audio=d_audio->sh;
- sh_video=d_video->sh;
- 
--  if(!video_read_properties(sh_video)){
-+  if(!sh_video || !video_read_properties(sh_video)){
-       printf(MSGTR_CannotReadVideoProperties);
-       mencoder_exit(1,NULL);
-   }
diff --git a/media-video/mplayer/files/mplayer-0.90-divx.patch b/media-video/mplayer/files/mplayer-0.90-divx.patch
deleted file mode 100644
index 9240b4cc2db8..000000000000
--- a/media-video/mplayer/files/mplayer-0.90-divx.patch
+++ /dev/null
@@ -1,722 +0,0 @@
-diff -u -r1.719 configure
---- configure	30 May 2003 18:23:52 -0000	1.719
-+++ configure	3 Jun 2003 20:07:37 -0000
-@@ -4607,7 +4607,7 @@
- # ld: Warning: type of symbol `dering' changed from 1 to 2 in opendivx/postprocess.o
- cat > $TMPC << EOF
- #include <decore.h>
--int main(void) { (void) decore(0, 0, 0, 0);  return DEC_OPT_MEMORY_REQS; }
-+int main(void) { (void) decore(0, 0, 0, 0);  return DEC_OPT_INIT; }
- EOF
- if test "$_divx4linux" != no && cc_check -lm -ldivxdecore -lm ; then
-   _opendivx=no
-Index: libmpcodecs/vd_divx4.c
-===================================================================
-RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_divx4.c,v
-retrieving revision 1.14
-diff -u -r1.14 vd_divx4.c
---- libmpcodecs/vd_divx4.c	6 Feb 2003 20:24:14 -0000	1.14
-+++ libmpcodecs/vd_divx4.c	3 Jun 2003 20:07:55 -0000
-@@ -42,22 +42,41 @@
- 
- #define USE_DIVX_BUILTIN_PP
- 
-+#ifndef DECORE_VERSION
-+#define DECORE_VERSION 0
-+#endif
-+
-+#if DECORE_VERSION >= 20021112
-+static void* dec_handle = NULL;
-+#endif
-+
- // to set/get/query special features/parameters
- static int control(sh_video_t *sh,int cmd,void* arg,...){
-     switch(cmd){
- #ifdef USE_DIVX_BUILTIN_PP
-     case VDCTRL_QUERY_MAX_PP_LEVEL:
--	return 9; // for divx4linux
-+#if DECORE_VERSION >= 20021112
-+        return 6; // divx4linux >= 5.0.5 -> 0..60
-+#else
-+        return 10; // divx4linux < 5.0.5 -> 0..100
-+#endif 
-     case VDCTRL_SET_PP_LEVEL: {
-+        int quality=*((int*)arg);
-+#if DECORE_VERSION >= 20021112
-+        int32_t iInstruction, iPostproc;
-+        if(quality<0 || quality>6) quality=6;
-+        iInstruction = DEC_ADJ_POSTPROCESSING | DEC_ADJ_SET;
-+        iPostproc = quality*10;
-+        decore(dec_handle, DEC_OPT_ADJUST, &iInstruction, &iPostproc);
-+#else
- 	DEC_SET dec_set;
--	int quality=*((int*)arg);
--	if(quality<0 || quality>9) quality=9;
-+	if(quality<0 || quality>10) quality=10;
- 	dec_set.postproc_level=quality*10;
- 	decore(0x123,DEC_OPT_SETPP,&dec_set,NULL);
-+#endif
- 	return CONTROL_OK;
-     }
- #endif
--#ifdef DECORE_VERSION
- #if DECORE_VERSION >= 20011010
-     case VDCTRL_SET_EQUALIZER: {
- 	va_list ap;
-@@ -67,17 +86,35 @@
- 	value=va_arg(ap, int);
- 	va_end(ap);
- 
--        if(!strcasecmp(arg,"Brightness")) option=DEC_GAMMA_BRIGHTNESS;
--        else if(!strcasecmp(arg, "Contrast")) option=DEC_GAMMA_CONTRAST;
--        else if(!strcasecmp(arg,"Saturation")) option=DEC_GAMMA_SATURATION;
-+        if(!strcasecmp(arg,"Brightness"))
-+#if DECORE_VERSION >= 20021112
-+            option=DEC_ADJ_BRIGHTNESS | DEC_ADJ_SET;
-+#else
-+            option=DEC_GAMMA_BRIGHTNESS;
-+#endif
-+        else if(!strcasecmp(arg, "Contrast"))
-+#if DECORE_VERSION >= 20021112
-+            option=DEC_ADJ_CONTRAST | DEC_ADJ_SET;
-+#else
-+            option=DEC_GAMMA_CONTRAST;
-+#endif
-+        else if(!strcasecmp(arg,"Saturation"))
-+#if DECORE_VERSION >= 20021112
-+            option=DEC_ADJ_SATURATION | DEC_ADJ_SET;
-+#else
-+            option=DEC_GAMMA_SATURATION;
-+#endif
-         else return CONTROL_FALSE;
- 	
-         value = (value * 128) / 100;
-+#if DECORE_VERSION >= 20021112
-+        decore(dec_handle, DEC_OPT_ADJUST, &option, &value);
-+#else
-         decore(0x123, DEC_OPT_GAMMA, (void *)option, (void *) value);
-+#endif
- 	return CONTROL_OK;
-     }
- #endif
--#endif
-     
-     }
- 
-@@ -86,6 +123,89 @@
- 
- // init driver
- static int init(sh_video_t *sh){
-+#if DECORE_VERSION >= 20021112
-+    DEC_INIT dec_init;
-+    int iSize=sizeof(DivXBitmapInfoHeader);
-+    DivXBitmapInfoHeader* pbi=malloc(iSize);
-+    int32_t iInstruction;
-+
-+    if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2)) return 0;
-+
-+    memset(&dec_init, 0, sizeof(dec_init));
-+    memset(pbi, 0, iSize);
-+
-+    switch(sh->format) {
-+      case mmioFOURCC('D','I','V','3'):
-+        dec_init.codec_version = 311;
-+        break;
-+      case mmioFOURCC('D','I','V','X'):
-+        dec_init.codec_version = 412;
-+        break;
-+      case mmioFOURCC('D','X','5','0'):
-+      default: // Fallback to DivX 5 behaviour
-+        dec_init.codec_version = 500;
-+    }
-+
-+    // no smoothing of the CPU load
-+    dec_init.smooth_playback = 0;
-+
-+    pbi->biSize=iSize;
-+
-+    switch(sh->codec->outfmt[sh->outfmtidx]){
-+        case IMGFMT_YV12: {
-+            pbi->biCompression=mmioFOURCC('Y','V','1','2');
-+            break;
-+        }
-+        case IMGFMT_YUY2: {
-+            pbi->biCompression=mmioFOURCC('Y','U','Y','2');
-+            break;
-+        }
-+        case IMGFMT_UYVY: {
-+            pbi->biCompression=mmioFOURCC('U','Y','V','Y');
-+            break;
-+        }
-+        case IMGFMT_I420: {
-+            pbi->biCompression=mmioFOURCC('I','4','2','0');
-+            break;
-+        }
-+        case IMGFMT_BGR15: {
-+            pbi->biCompression=0;
-+            pbi->biBitCount=16;
-+            break;
-+        }
-+        case IMGFMT_BGR16: {
-+            pbi->biCompression=3;
-+            pbi->biBitCount=16;
-+            break;
-+        }
-+        case IMGFMT_BGR24: {
-+            pbi->biCompression=0;
-+            pbi->biBitCount=24;
-+            break;
-+        }
-+        case IMGFMT_BGR32: {
-+            pbi->biCompression=0;
-+            pbi->biBitCount=32;
-+            break;
-+        }
-+        default:
-+          mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Unsupported out_fmt: 0x%X\n",sh->codec->outfmt[sh->outfmtidx]);
-+          return 0;
-+    }
-+
-+    pbi->biWidth = sh->disp_w;
-+    pbi->biHeight = sh->disp_h;
-+
-+    decore(&dec_handle, DEC_OPT_INIT, &dec_init, NULL);
-+    decore(dec_handle, DEC_OPT_SETOUT, pbi, NULL);
-+
-+#ifdef USE_DIVX_BUILTIN_PP
-+    iInstruction = DEC_ADJ_POSTPROCESSING | DEC_ADJ_SET;
-+    decore(dec_handle, DEC_OPT_ADJUST, &iInstruction, &divx_quality);
-+#endif
-+
-+    free(pbi);
-+#else // DECORE_VERSION < 20021112
-     DEC_PARAM dec_param;
-     DEC_SET dec_set;
-     int bits=16;
-@@ -142,7 +262,8 @@
-     dec_set.postproc_level = divx_quality;
-     decore(0x123, DEC_OPT_SETPP, &dec_set, NULL);
- #endif
--    
-+#endif // DECORE_VERSION    
-+
-     mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: DivX4Linux video codec init OK!\n");
- 
-     return 1;
-@@ -150,7 +271,12 @@
- 
- // uninit driver
- static void uninit(sh_video_t *sh){
-+#if DECORE_VERSION >= 20021112
-+    decore(dec_handle, DEC_OPT_RELEASE, NULL, NULL);
-+    dec_handle = NULL;
-+#else
-     decore(0x123,DEC_OPT_RELEASE,NULL,NULL);
-+#endif
- }
- 
- //mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h);
-@@ -176,7 +302,12 @@
-     dec_frame.bmp=mpi->planes[0];
-     dec_frame.stride=mpi->width;
- 
--    decore(0x123,
-+    decore(
-+#if DECORE_VERSION >= 20021112
-+        dec_handle,
-+#else
-+        0x123,
-+#endif
- #ifndef DEC_OPT_FRAME_311
-         DEC_OPT_FRAME,
- #else
-Index: libmpcodecs/vd_odivx.c
-===================================================================
-RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_odivx.c,v
-retrieving revision 1.14
-diff -u -r1.14 vd_odivx.c
---- libmpcodecs/vd_odivx.c	6 Feb 2003 20:24:14 -0000	1.14
-+++ libmpcodecs/vd_odivx.c	3 Jun 2003 20:07:56 -0000
-@@ -53,6 +53,14 @@
- #include <decore.h>
- #endif
- 
-+#ifndef DECORE_VERSION
-+#define DECORE_VERSION 0
-+#endif
-+
-+#if DECORE_VERSION >= 20021112
-+static void* dec_handle = NULL;
-+#endif
-+
- //**************************************************************************//
- //             The OpenDivX stuff:
- //**************************************************************************//
-@@ -85,21 +93,33 @@
-     switch(cmd){
-     case VDCTRL_QUERY_MAX_PP_LEVEL:
- #ifdef NEW_DECORE
--	return 9; // for divx4linux
-+#if DECORE_VERSION >= 20021112
-+        return 6; // divx4linux >= 5.0.5 -> 0..60
-+#else
-+        return 10; // divx4linux < 5.0.5 -> 0..100
-+#endif
- #else
- 	return PP_QUALITY_MAX;  // for opendivx
- #endif
-     case VDCTRL_SET_PP_LEVEL: {
--	DEC_SET dec_set;
- 	int quality=*((int*)arg);
-+#if DECORE_VERSION >= 20021112
-+        int32_t iInstruction, iPostproc;
-+        if(quality<0 || quality>6) quality=6;
-+        iInstruction = DEC_ADJ_POSTPROCESSING | DEC_ADJ_SET;
-+        iPostproc = quality*10;
-+        decore(dec_handle, DEC_OPT_ADJUST, &iInstruction, &iPostproc);
-+#else
-+        DEC_SET dec_set;
- #ifdef NEW_DECORE
--	if(quality<0 || quality>9) quality=9;
-+	if(quality<0 || quality>10) quality=10;
- 	dec_set.postproc_level=quality*10;
- #else
- 	if(quality<0 || quality>PP_QUALITY_MAX) quality=PP_QUALITY_MAX;
- 	dec_set.postproc_level=getPpModeForQuality(quality);
- #endif
- 	decore(0x123,DEC_OPT_SETPP,&dec_set,NULL);
-+#endif
- 	return CONTROL_OK;
-     }
-     
-@@ -110,6 +130,45 @@
- 
- // init driver
- static int init(sh_video_t *sh){
-+#if DECORE_VERSION >= 20021112
-+    DEC_INIT dec_init;
-+    int iSize=sizeof(DivXBitmapInfoHeader);
-+    DivXBitmapInfoHeader* pbi=malloc(iSize);
-+    int32_t iInstruction;
-+
-+    memset(&dec_init, 0, sizeof(dec_init));
-+    memset(pbi, 0, iSize);
-+
-+    switch(sh->format) {
-+      case mmioFOURCC('D','I','V','3'):
-+        dec_init.codec_version = 311;
-+        break;
-+      case mmioFOURCC('D','I','V','X'):
-+        dec_init.codec_version = 412;
-+        break;
-+      case mmioFOURCC('D','X','5','0'):
-+      default: // Fallback to DivX 5 behaviour
-+        dec_init.codec_version = 500;
-+    }
-+
-+    // no smoothing of the CPU load
-+    dec_init.smooth_playback = 0;
-+
-+    pbi->biSize=iSize;
-+
-+    pbi->biCompression=mmioFOURCC('U','S','E','R');
-+
-+    pbi->biWidth = sh->disp_w;
-+    pbi->biHeight = sh->disp_h;
-+
-+    decore(&dec_handle, DEC_OPT_INIT, &dec_init, NULL);
-+    decore(dec_handle, DEC_OPT_SETOUT, pbi, NULL);
-+
-+    iInstruction = DEC_ADJ_POSTPROCESSING | DEC_ADJ_SET;
-+    decore(dec_handle, DEC_OPT_ADJUST, &iInstruction, &divx_quality);
-+
-+    free(pbi);
-+#else // DECORE_VERSION < 20021112
-     DEC_PARAM dec_param;
-     DEC_SET dec_set;
- 
-@@ -152,6 +211,7 @@
- 
-     dec_set.postproc_level = divx_quality;
-     decore(0x123, DEC_OPT_SETPP, &dec_set, NULL);
-+#endif // DECORE_VERSION
-     
-     mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: OpenDivX video codec init OK!\n");
- 
-@@ -160,7 +220,12 @@
- 
- // uninit driver
- static void uninit(sh_video_t *sh){
-+#if DECORE_VERSION >= 20021112
-+    decore(dec_handle, DEC_OPT_RELEASE, NULL, NULL);
-+    dec_handle = NULL;
-+#else
-     decore(0x123,DEC_OPT_RELEASE,NULL,NULL);
-+#endif
- }
- 
- //mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h);
-@@ -170,8 +235,12 @@
-     mp_image_t* mpi;
-     DEC_FRAME dec_frame;
- #ifdef NEW_DECORE
-+#if DECORE_VERSION >= 20021112
-+    DEC_FRAME_INFO dec_pic;
-+#else
-     DEC_PICTURE dec_pic;
- #endif
-+#endif
- 
-     if(len<=0) return NULL; // skipped frame
- 
-@@ -179,7 +248,15 @@
-     dec_frame.bitstream = data;
-     dec_frame.render_flag = (flags&3)?0:1;
- 
-+    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE,
-+        sh->disp_w, sh->disp_h);
-+    if(!mpi) return NULL;
-+
- #ifdef NEW_DECORE
-+#if DECORE_VERSION >= 20021112
-+    dec_frame.stride=mpi->width;
-+    decore(dec_handle, DEC_OPT_FRAME, &dec_frame, &dec_pic);
-+#else
-     dec_frame.bmp=&dec_pic;
-     dec_pic.y=dec_pic.u=dec_pic.v=NULL;
- #ifndef DEC_OPT_FRAME_311
-@@ -187,6 +264,7 @@
- #else
-     decore(0x123, (sh->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL);
- #endif
-+#endif
- #else
-     // opendivx:
-     opendivx_src[0]=NULL;
-@@ -200,10 +278,6 @@
- #else
-     if(!opendivx_src[0]) return NULL; // bad frame
- #endif
--    
--    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE,
--	sh->disp_w, sh->disp_h);
--    if(!mpi) return NULL;
-     
- #ifdef NEW_DECORE
-     mpi->planes[0]=dec_pic.y;
-Index: libmpcodecs/ve_divx4.c
-===================================================================
-RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_divx4.c,v
-retrieving revision 1.12
-diff -u -r1.12 ve_divx4.c
---- libmpcodecs/ve_divx4.c	6 Feb 2003 20:24:14 -0000	1.12
-+++ libmpcodecs/ve_divx4.c	3 Jun 2003 20:07:58 -0000
-@@ -1,4 +1,3 @@
--#define HAVE_XVID_VBR
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -37,11 +36,6 @@
- 
- //===========================================================================//
- 
--#include "divx4_vbr.h"
--#ifdef HAVE_XVID_VBR
--#include "xvid_vbr.h"
--#endif
--
- static int pass;
- extern char* passtmpfile;
- 
-@@ -55,7 +49,19 @@
- #define ENCORE_MAJOR_VERSION 4000
- #endif
- 
-+#if ENCORE_MAJOR_VERSION < 5200
-+#include "divx4_vbr.h"
-+#define HAVE_XVID_VBR
-+#ifdef HAVE_XVID_VBR
-+#include "xvid_vbr.h"
-+#endif
-+#endif
-+
-+#if ENCORE_MAJOR_VERSION >= 5200
-+SETTINGS divx4_param;
-+#else
- ENC_PARAM divx4_param;
-+#endif
- int divx4_crispness;
- #ifdef HAVE_XVID_VBR
- static int vbrpass = -1;
-@@ -67,29 +73,96 @@
- struct config divx4opts_conf[]={
- 	{"pass", &pass, CONF_TYPE_INT, CONF_RANGE,0,2, NULL},
- 	{"br", &divx4_param.bitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000, NULL},
-+#if ENCORE_MAJOR_VERSION < 5200
- 	{"rc_period", &divx4_param.rc_period, CONF_TYPE_INT, 0,0,0, NULL},
- 	{"rc_reaction_period", &divx4_param.rc_reaction_period, CONF_TYPE_INT, 0,0,0, NULL},
- 	{"rc_reaction_ratio", &divx4_param.rc_reaction_ratio, CONF_TYPE_INT, 0,0,0, NULL},
- 	{"min_quant", &divx4_param.min_quantizer, CONF_TYPE_INT, CONF_RANGE,0,32, NULL},
- 	{"max_quant", &divx4_param.max_quantizer, CONF_TYPE_INT, CONF_RANGE,0,32, NULL},
-+#endif
- 	{"key", &divx4_param.max_key_interval, CONF_TYPE_INT, CONF_MIN,0,0, NULL},
- 	{"deinterlace", &divx4_param.deinterlace, CONF_TYPE_FLAG, 0,0,1, NULL},
- 	{"q", &divx4_param.quality, CONF_TYPE_INT, CONF_RANGE, 1, 5, NULL},
- 	{"crispness", &divx4_crispness, CONF_TYPE_INT, CONF_RANGE,0,100, NULL},
- #if ENCORE_MAJOR_VERSION >= 5010
-+#if ENCORE_MAJOR_VERSION >= 5200
-+/* rate control modes:
-+	0 (VBV 1-pass)
-+	1 (1-pass constant quality)
-+	2 (VBV multipass 1st-pass)
-+	3 (VBV multipass nth-pass)
-+	4 (original 1-pass)
-+	5 (original 1st pass)
-+	6 (original 2nd pass)
-+	7 (1-pass constant frame size)
-+*/
-+        {"vbr", &divx4_param.vbr_mode, CONF_TYPE_INT, CONF_RANGE,0,7, NULL},
-+        {"bidirect", &divx4_param.use_bidirect, CONF_TYPE_FLAG, 0,0,1, NULL},
-+        {"key_frame_threshold", &divx4_param.key_frame_threshold, CONF_TYPE_INT, CONF_RANGE,1,100, NULL},
-+/* default values from the DivX Help Guide:
-+	bitrate     size   occupancy
-+	 128000    262144    196608   (Handheld)
-+	 768000   1048576    786432   (Portable)
-+	4000000   3145728   2359296   (Home Theatre)
-+	8000000   6291456   4718592   (High Definition)
-+Do not mess with these values unless you are absolutely sure of what you are doing!
-+*/
-+        {"vbv_bitrate", &divx4_param.vbv_bitrate, CONF_TYPE_INT, 0,0,0, NULL},
-+        {"vbv_size", &divx4_param.vbv_size, CONF_TYPE_INT, 0,0,0, NULL},
-+        {"vbv_occupancy", &divx4_param.vbv_occupancy, CONF_TYPE_INT, 0,0,0, NULL},
-+        {"complexity", &divx4_param.complexity_modulation, CONF_TYPE_FLOAT, CONF_RANGE,0.0,1.0, NULL},
-+        {"readlog", &divx4_param.log_file_read, CONF_TYPE_STRING, 0,0,1, NULL},
-+        {"writelog", &divx4_param.log_file_write, CONF_TYPE_STRING, 0,0,1, NULL},
-+        {"mv_file", &divx4_param.mv_file, CONF_TYPE_STRING, 0,0,1, NULL},
-+        {"data_partitioning", &divx4_param.data_partitioning, CONF_TYPE_FLAG, 0,0,1, NULL},
-+        {"qpel", &divx4_param.quarter_pel, CONF_TYPE_FLAG, 0,0,1, NULL},
-+        {"gmc", &divx4_param.use_gmc, CONF_TYPE_FLAG, 0,0,1, NULL},
-+        {"pv", &divx4_param.psychovisual, CONF_TYPE_FLAG, 0,0,1, NULL},
-+        {"pv_strength_frame", &divx4_param.pv_strength_frame, CONF_TYPE_FLOAT, CONF_RANGE,0.0,1.0, NULL},
-+        {"pv_strength_MB", &divx4_param.pv_strength_MB, CONF_TYPE_FLOAT, CONF_RANGE,0.0,1.0, NULL},
-+        {"interlace_mode", &divx4_param.interlace_mode, CONF_TYPE_INT, CONF_RANGE,0,3, NULL},
-+        {"crop", &divx4_param.enable_crop, CONF_TYPE_FLAG, 0,0,1, NULL},
-+        {"resize", &divx4_param.enable_resize, CONF_TYPE_FLAG, 0,0,1, NULL},
-+        {"width", &divx4_param.resize_width, CONF_TYPE_INT, 0,0,0, NULL},
-+        {"height", &divx4_param.resize_height, CONF_TYPE_INT, 0,0,0, NULL},
-+        {"left", &divx4_param.crop_left, CONF_TYPE_INT, 0,0,0, NULL},
-+        {"right", &divx4_param.crop_right, CONF_TYPE_INT, 0,0,0, NULL},
-+        {"top", &divx4_param.crop_top, CONF_TYPE_INT, 0,0,0, NULL},
-+        {"bottom", &divx4_param.crop_bottom, CONF_TYPE_INT, 0,0,0, NULL},
-+        {"resize_mode", &divx4_param.resize_mode, CONF_TYPE_FLAG, 0,0,1, NULL},
-+        {"temporal", &divx4_param.temporal_enable, CONF_TYPE_FLAG, 0,0,1, NULL},
-+        {"spatial", &divx4_param.spatial_passes, CONF_TYPE_INT, CONF_RANGE,0,3, NULL},
-+        {"temporal_level", &divx4_param.temporal_level, CONF_TYPE_FLOAT, CONF_RANGE,0.0,1.0, NULL},
-+        {"spatial_level", &divx4_param.spatial_level, CONF_TYPE_FLOAT, CONF_RANGE,0.0,1.0, NULL},
-+#else
- 	{"bidirect", &divx4_param.extensions.use_bidirect, CONF_TYPE_FLAG, 0,0,1, NULL},
- 	{"obmc", &divx4_param.extensions.obmc, CONF_TYPE_FLAG, 0,0,1, NULL},
- 	{"data_partitioning", &divx4_param.extensions.data_partitioning, CONF_TYPE_FLAG, 0,0,1, NULL},
-+	{"mpeg2", &divx4_param.extensions.mpeg2_quant, CONF_TYPE_FLAG, 0,0,1, NULL},
- 	{"qpel", &divx4_param.extensions.quarter_pel, CONF_TYPE_FLAG, 0,0,1, NULL},
- 	{"intra_frame_threshold", &divx4_param.extensions.intra_frame_threshold, CONF_TYPE_INT, CONF_RANGE,1,100, NULL},
--	{"psychovisual", &divx4_param.extensions.psychovisual, CONF_TYPE_FLAG, 0,0,1, NULL},
-+	{"pv", &divx4_param.extensions.psychovisual, CONF_TYPE_FLAG, 0,0,1, NULL},
-+	{"pv_strength_frame", &divx4_param.extensions.pv_strength_frame, CONF_TYPE_FLOAT, CONF_RANGE,0.0,1.0, NULL},
-+	{"pv_strength_MB", &divx4_param.extensions.pv_strength_MB, CONF_TYPE_FLOAT, CONF_RANGE,0.0,1.0, NULL},
- 	{"testing_param", &divx4_param.extensions.testing_param, CONF_TYPE_FLAG, 0,0,1, NULL},
- 	{"gmc", &divx4_param.extensions.use_gmc, CONF_TYPE_FLAG, 0,0,1, NULL},
- 	{"interlace_mode", &divx4_param.extensions.interlace_mode, CONF_TYPE_INT, CONF_RANGE,0,2, NULL},
-+	{"crop", &divx4_param.extensions.enable_crop, CONF_TYPE_FLAG, 0,0,1, NULL},
-+	{"resize", &divx4_param.extensions.enable_resize, CONF_TYPE_FLAG, 0,0,1, NULL},
-+	{"width", &divx4_param.extensions.resize_width, CONF_TYPE_INT, 0,0,0, NULL},
-+	{"height", &divx4_param.extensions.resize_height, CONF_TYPE_INT, 0,0,0, NULL},
-+	{"left", &divx4_param.extensions.crop_left, CONF_TYPE_INT, 0,0,0, NULL},
-+	{"right", &divx4_param.extensions.crop_right, CONF_TYPE_INT, 0,0,0, NULL},
-+	{"top", &divx4_param.extensions.crop_top, CONF_TYPE_INT, 0,0,0, NULL},
-+	{"bottom", &divx4_param.extensions.crop_bottom, CONF_TYPE_INT, 0,0,0, NULL},
-+	{"resize_mode", &divx4_param.extensions.resize_mode, CONF_TYPE_FLAG, 0,0,1, NULL},
- 	{"temporal", &divx4_param.extensions.temporal_enable, CONF_TYPE_FLAG, 0,0,1, NULL},
--	{"spatial", &divx4_param.extensions.spatial_passes, CONF_TYPE_INT, 0,0,1, NULL},
-+	{"spatial", &divx4_param.extensions.spatial_passes, CONF_TYPE_INT, CONF_RANGE,0,3, NULL},
-+	{"temporal_level", &divx4_param.extensions.temporal_level, CONF_TYPE_FLOAT, CONF_RANGE,0.0,1.0, NULL},
-+	{"spatial_level", &divx4_param.extensions.spatial_level, CONF_TYPE_FLOAT, CONF_RANGE,0.0,1.0, NULL},
- 	{"mv_file", &divx4_param.extensions.mv_file, CONF_TYPE_STRING, 0,0,1, NULL},
- #endif
-+#endif
- #ifdef HAVE_XVID_VBR
- 	{"vbrpass", &vbrpass, CONF_TYPE_INT, CONF_RANGE, 0, 2, NULL},
- 	{"vbrdebug", &vbrdebug, CONF_TYPE_INT, CONF_RANGE, 0, 1, NULL},
-@@ -114,24 +187,55 @@
-         int width, int height, int d_width, int d_height,
- 	unsigned int flags, unsigned int outfmt){
- 
-+#if ENCORE_MAJOR_VERSION >= 5200
-+    DivXBitmapInfoHeader format;
-+    char profile = (char) encore(0, ENC_OPT_PROFILE, 0, 0);
-+
-+    mp_msg(MSGT_MENCODER, MSGL_INFO, "encoder binary profile: %c\n", profile);
-+
-+    if((pass <= 1 && (divx4_param.vbr_mode == RCMODE_VBV_MULTIPASS_NTH ||
-+                      divx4_param.vbr_mode == RCMODE_502_2PASS_2ND))   ||
-+       (pass == 2 && (divx4_param.vbr_mode == RCMODE_VBV_1PASS         ||
-+                      divx4_param.vbr_mode == RCMODE_1PASS_CONSTANT_Q  ||
-+                      divx4_param.vbr_mode == RCMODE_VBV_MULTIPASS_1ST ||
-+                      divx4_param.vbr_mode == RCMODE_502_1PASS         ||
-+                      divx4_param.vbr_mode == RCMODE_502_2PASS_1ST     ||
-+                      divx4_param.vbr_mode == RCMODE_IMAGE_COMPRESS))) {
-+        mp_msg(MSGT_MENCODER, MSGL_ERR, "pass (%i) and rate control mode (%i) doesn't match, please consult encore2.h\n",
-+               pass, divx4_param.vbr_mode);
-+        abort();
-+    }
-+#endif
-+
-     mux_v->bih->biWidth=width;
-     mux_v->bih->biHeight=height;
--
--    divx4_param.x_dim=width;
--    divx4_param.y_dim=height;
--    divx4_param.framerate=(float)mux_v->h.dwRate/mux_v->h.dwScale;
--    mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*3;
-+    mux_v->bih->biSizeImage=width*height*3;
- 
-     if(!divx4_param.bitrate) divx4_param.bitrate=800000;
-     else if(divx4_param.bitrate<=16000) divx4_param.bitrate*=1000;
-     if(!divx4_param.quality) divx4_param.quality=5; // the quality of compression ( 1 - fastest, 5 - best )
- 
-+#if ENCORE_MAJOR_VERSION >= 5200
-+    format.biSize=sizeof(DivXBitmapInfoHeader);
-+    format.biWidth=width;
-+    format.biHeight=height;
-+    format.biSizeImage=mux_v->bih->biSizeImage;
-+    if(divx4_param.vbv_bitrate > 0) {
-+        divx4_param.vbv_bitrate   = ((divx4_param.vbv_bitrate   - 1) /   400 + 1) *   400;
-+        divx4_param.vbv_size      = ((divx4_param.vbv_size      - 1) / 16384 + 1) * 16384;
-+        divx4_param.vbv_occupancy = ((divx4_param.vbv_occupancy - 1) /    64 + 1) *    64;
-+    }
-+#else
-+    divx4_param.x_dim=width;
-+    divx4_param.y_dim=height;
-+    divx4_param.framerate=(float)mux_v->h.dwRate/mux_v->h.dwScale;
-     // set some usefull defaults:
-     if(!divx4_param.min_quantizer) divx4_param.min_quantizer=2;
-     if(!divx4_param.max_quantizer) divx4_param.max_quantizer=31;
-     if(!divx4_param.rc_period) divx4_param.rc_period=2000;
-     if(!divx4_param.rc_reaction_period) divx4_param.rc_reaction_period=10;
-     if(!divx4_param.rc_reaction_ratio) divx4_param.rc_reaction_ratio=20;
-+#endif
- 
- #ifdef HAVE_XVID_VBR
-     if (vbrpass >= 0) {
-@@ -159,6 +263,54 @@
-     }
- #endif
- 
-+#if ENCORE_MAJOR_VERSION >= 5200
-+    switch(outfmt){
-+        case IMGFMT_YV12: {
-+            format.biCompression=mmioFOURCC('Y','V','1','2');
-+            break;
-+        }
-+        case IMGFMT_IYUV: {
-+            format.biCompression=mmioFOURCC('I','Y','U','V');
-+            break;
-+        }
-+        case IMGFMT_I420: {
-+            format.biCompression=mmioFOURCC('I','4','2','0');
-+            break;
-+        }
-+        case IMGFMT_YUY2: {
-+            format.biCompression=mmioFOURCC('Y','U','Y','2');
-+            break;
-+        }
-+        case IMGFMT_V422: {
-+            format.biCompression=mmioFOURCC('V','4','2','2');
-+            break;
-+        }
-+        case IMGFMT_UYVY: {
-+            format.biCompression=mmioFOURCC('U','Y','V','Y');
-+            break;
-+        }
-+        case IMGFMT_YVYU: {
-+            format.biCompression=mmioFOURCC('Y','V','Y','U');
-+            break;
-+        }
-+        case IMGFMT_BGR24: {
-+            format.biCompression=0;
-+            format.biBitCount=24;
-+            break;
-+        }
-+        case IMGFMT_BGR32: {
-+            format.biCompression=0;
-+            format.biBitCount=32;
-+            break;
-+        }
-+        default:
-+            mp_msg(MSGT_MENCODER,MSGL_ERR,"divx4: unsupported picture format (%s)!\n",
-+                   vo_format_name(outfmt));
-+            return 0;
-+    }
-+
-+    encore(&vf->priv->enc_handle, ENC_OPT_INIT, &format, &divx4_param);
-+#else
-     divx4_param.handle=NULL;
-     encore(NULL,ENC_OPT_INIT,&divx4_param,NULL);
-     vf->priv->enc_handle=divx4_param.handle;
-@@ -195,6 +347,7 @@
- 	}
- 	break;
-     }
-+#endif
- 
-     return 1;
- }
-@@ -204,6 +357,11 @@
-     if (vbrpass >= 0 && vbrFinish(&vf->priv->vbr_state) == -1)
- 	    abort();
- }
-+#else
-+static void uninit(struct vf_instance_s* vf){
-+    encore(vf->priv->enc_handle, ENC_OPT_RELEASE, 0, 0);
-+    vf->priv->enc_handle = NULL;
-+}
- #endif
- 
- static int control(struct vf_instance_s* vf, int request, void* data){
-@@ -232,6 +390,14 @@
-     vf->priv->enc_frame.image=mpi->planes[0];
-     vf->priv->enc_frame.bitstream=mux_v->buffer;
-     vf->priv->enc_frame.length=mux_v->buffer_size;
-+#if ENCORE_MAJOR_VERSION >= 5200
-+    vf->priv->enc_frame.produce_empty_frame = 0;
-+    encore(vf->priv->enc_handle, ENC_OPT_ENCODE, &vf->priv->enc_frame, &enc_result);
-+    if(enc_result.cType == 'I')
-+        muxer_write_chunk(mux_v,vf->priv->enc_frame.length,0x10);
-+    else
-+        muxer_write_chunk(mux_v,vf->priv->enc_frame.length,0);
-+#else
-     vf->priv->enc_frame.mvs=NULL;
- #ifdef HAVE_XVID_VBR
-     if (vbrpass >= 0) {
-@@ -277,6 +443,7 @@
- 	}
-     }
-     muxer_write_chunk(mux_v,vf->priv->enc_frame.length,enc_result.is_key_frame?0x10:0);
-+#endif
-     return 1;
- }
- 
-@@ -287,9 +454,9 @@
-     vf->control=control;
-     vf->query_format=query_format;
-     vf->put_image=put_image;
--#ifdef HAVE_XVID_VBR
-+//#ifdef HAVE_XVID_VBR
-     vf->uninit = uninit;
--#endif
-+//#endif
-     vf->priv=malloc(sizeof(struct vf_priv_s));
-     memset(vf->priv,0,sizeof(struct vf_priv_s));
-     vf->priv->mux=(muxer_stream_t*)args;
-
-
diff --git a/media-video/mplayer/files/mplayer-0.90-ppc-benh-2.patch b/media-video/mplayer/files/mplayer-0.90-ppc-benh-2.patch
deleted file mode 100644
index 04f50bba9955..000000000000
--- a/media-video/mplayer/files/mplayer-0.90-ppc-benh-2.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- configure.orig	2003-04-07 05:12:59.000000000 +0200
-+++ configure	2003-04-07 05:15:05.000000000 +0200
-@@ -550,14 +550,24 @@
-   fi
- 
-   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 -n 1`
-   if test -z "$pparam" ; then
--    pparam=`$_cpuinfo | grep 'flags' | cut -d ':' -f 2 | head -n 1`
-+    pparam=`$_cpuinfo | grep '^flags' | cut -d ':' -f 2 | head -n 1`
-+  fi
-+  
-+  # Fix for benh kernel on ppc
-+  if test -z "$pname" ; then
-+    pname=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -n 1`
-+  fi
-+  if test -z "$pparam" ; then
-+    pparam=`$_cpuinfo | grep 'cpu' | cut -d ':' -f 2 | cut -d ' ' -f 3 | head -n 1`
-   fi
- 
-   _mmx=no
-@@ -843,12 +853,43 @@
-     proc=''
-     _march=''
-     _mcpu=''
--    cpu750=`$_cpuinfo | grep "cpu.*750"`
--    if test -n "$cpu750"; then
--	_march='-mcpu=750'
--	_mcpu='-mtune=750'
-+
-+    echocheck "Using ppc ($pname) optimizations"
-+
-+    case "$pname" in
-+    603*)
-+      _march="-mcpu=603"
-+      _mcpu="-mtune=603"
-+    ;;
-+    604*)
-+      _march="-mcpu=604"
-+      _mcpu="-mtune=604"
-+    ;;
-+    74[10]0*)
-+      _march="-mcpu=7400"
-+      _mcpu="-mtune=7400"
-+    ;;
-+    745[570]*)
-+      _march="-mcpu=7450"
-+      _mcpu="-mtune=7450"
-+    ;;
-+    7[45][50]*)
-+      _march="-mcpu=750"
-+      _mcpu="-mtune=750"
-+    ;;
-+    82[46][50]*)
-+      _march="-mcpu=603e"
-+      _mcpu="-mtune=603e"
-+    ;;
-+    esac
-+    
-+    if test "$_altivec" = yes ; then
-+	_march="$_march -maltivec -mabi=altivec"
-     fi
-+
-+    echores "$_mcpu and $_march"
-     ;;
-+    
- 
-   alpha)
-     _def_arch='#define ARCH_ALPHA 1'
diff --git a/media-video/mplayer/files/mplayer-0.90_rc4-gtk2.patch b/media-video/mplayer/files/mplayer-0.90_rc4-gtk2.patch
deleted file mode 100644
index d4bff45128ba..000000000000
--- a/media-video/mplayer/files/mplayer-0.90_rc4-gtk2.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Files MPlayer-0.90rc4/Gui/mplayer/gtk/.about.c.rej.swp and MPlayer-0.90rc4.gtk2/Gui/mplayer/gtk/.about.c.rej.swp differ
-diff -urN MPlayer-0.90rc4/Gui/mplayer/gtk/about.c MPlayer-0.90rc4.gtk2/Gui/mplayer/gtk/about.c
---- MPlayer-0.90rc4/Gui/mplayer/gtk/about.c	2003-02-01 10:37:05.000000000 +0200
-+++ MPlayer-0.90rc4.gtk2/Gui/mplayer/gtk/about.c	2003-02-16 07:57:43.000000000 +0200
-@@ -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-0.90rc4/configure MPlayer-0.90rc4.gtk2/configure
---- MPlayer-0.90rc4/configure	2003-02-09 00:29:05.000000000 +0200
-+++ MPlayer-0.90rc4.gtk2/configure	2003-02-16 07:53:12.000000000 +0200
-@@ -140,6 +140,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]
-@@ -1032,6 +1033,7 @@
- _opendivx=no
- _lirc=auto
- _gui=no
-+_gtk2=no
- _termcap=auto
- _termios=auto
- _3dfx=no
-@@ -1207,6 +1209,8 @@
-   --disable-lirc)	_lirc=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    ;;
-@@ -4595,42 +4599,70 @@
-   fi
-   echores "$_xshape"
- 
-+  # Check for new GTK (2.x.x)
-+  if test "$_gtk2" = yes ; then 
-+  
-+    # Check for GTK:
-+    echocheck "GTK+ version"
- 
--  # 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 (which was not found)"
-+    _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:
-+    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+ (which was not found)"
-+      fi
-     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)"
-+    _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
--  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'
--  _ld_gui='$(GTKLIB) $(GLIBLIB)'
- 
-+    _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
- # -------- Generated by configure -----------
-@@ -4644,6 +4676,7 @@
- 
- else
-   _def_gui='#undef HAVE_NEW_GUI'
-+  _def_gtk2_gui='#undef HAVE_GTK2_GUI'
- fi
- # --------------- GUI specific tests end -------------------
- 
-@@ -5179,6 +5212,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_pre3-alsa-gcc34.patch b/media-video/mplayer/files/mplayer-1.0_pre3-alsa-gcc34.patch
deleted file mode 100644
index f733923c62a0..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre3-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_pre3-libavcodec-gcc34.patch b/media-video/mplayer/files/mplayer-1.0_pre3-libavcodec-gcc34.patch
deleted file mode 100644
index 934c7eca5ea1..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre3-libavcodec-gcc34.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -uprN ffmpeg/libavcodec/i386/dsputil_mmx.c ffmpeg_new/libavcodec/i386/dsputil_mmx.c
---- ffmpeg/libavcodec/i386/dsputil_mmx.c	2004-02-06 03:12:37.000000000 +0100
-+++ ffmpeg_new/libavcodec/i386/dsputil_mmx.c	2004-02-15 23:56:39.665798024 +0100
-@@ -31,14 +31,14 @@ extern const uint8_t ff_h263_loop_filter
- int mm_flags; /* multimedia extension flags */
- 
- /* pixel operations */
--static const uint64_t mm_bone __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
--static const uint64_t mm_wone __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
--static const uint64_t mm_wtwo __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
--
--static const uint64_t ff_pw_20 __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
--static const uint64_t ff_pw_3  __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
--static const uint64_t ff_pw_16 __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
--static const uint64_t ff_pw_15 __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
-+static const uint64_t mm_bone __attribute_used__ __attribute__ ((aligned(8))) = 0x0101010101010101ULL;
-+static const uint64_t mm_wone __attribute_used__ __attribute__ ((aligned(8))) = 0x0001000100010001ULL;
-+static const uint64_t mm_wtwo __attribute_used__ __attribute__ ((aligned(8))) = 0x0002000200020002ULL;
-+
-+static const uint64_t ff_pw_20 __attribute_used__ __attribute__ ((aligned(8))) = 0x0014001400140014ULL;
-+static const uint64_t ff_pw_3  __attribute_used__ __attribute__ ((aligned(8))) = 0x0003000300030003ULL;
-+static const uint64_t ff_pw_16 __attribute_used__ __attribute__ ((aligned(8))) = 0x0010001000100010ULL;
-+static const uint64_t ff_pw_15 __attribute_used__ __attribute__ ((aligned(8))) = 0x000F000F000F000FULL;
- 
- static const uint64_t ff_pb_FC __attribute__ ((aligned(8))) = 0xFCFCFCFCFCFCFCFCULL;
- 
-diff -uprN ffmpeg/libavcodec/i386/motion_est_mmx.c ffmpeg_new/libavcodec/i386/motion_est_mmx.c
---- ffmpeg/libavcodec/i386/motion_est_mmx.c	2004-01-10 17:04:55.000000000 +0100
-+++ ffmpeg_new/libavcodec/i386/motion_est_mmx.c	2004-02-15 23:54:54.595771096 +0100
-@@ -27,7 +27,7 @@ static const __attribute__ ((aligned(8))
- 0x0002000200020002ULL,
- };
- 
--static __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
-+static __attribute_used__ __attribute__ ((aligned(8), unused)) uint64_t bone= 0x0101010101010101LL;
- 
- static inline void sad8_1_mmx(uint8_t *blk1, uint8_t *blk2, int stride, int h)
- {
-diff -uprN ffmpeg/libavcodec/i386/simple_idct_mmx.c ffmpeg_new/libavcodec/i386/simple_idct_mmx.c
---- ffmpeg/libavcodec/i386/simple_idct_mmx.c	2003-09-15 21:18:28.000000000 +0200
-+++ ffmpeg_new/libavcodec/i386/simple_idct_mmx.c	2004-02-15 23:49:54.101453176 +0100
-@@ -45,8 +45,8 @@
- #define ROW_SHIFT 11
- #define COL_SHIFT 20 // 6
- 
--static const uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
--static const uint64_t __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
-+static const uint64_t __attribute_used__ __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000ULL;
-+static const uint64_t __attribute_used__ __attribute__((aligned(8))) d40000= 0x0000000000040000ULL;
- 
- static const int16_t __attribute__((aligned(8))) coeffs[]= {
- 	1<<(ROW_SHIFT-1), 0, 1<<(ROW_SHIFT-1), 0,
-diff -uprN ffmpeg/libavcodec/libpostproc/postprocess.c ffmpeg_new/libavcodec/libpostproc/postprocess.c
---- ffmpeg/libavcodec/libpostproc/postprocess.c	2004-01-31 23:58:32.000000000 +0100
-+++ ffmpeg_new/libavcodec/libpostproc/postprocess.c	2004-02-15 23:59:26.014509176 +0100
-@@ -104,13 +104,13 @@ try to unroll inner for(x=0 ... loop to 
- //#define NUM_BLOCKS_AT_ONCE 16 //not used yet
- 
- #ifdef ARCH_X86
--static uint64_t __attribute__((aligned(8))) w05=		0x0005000500050005LL;
--static uint64_t __attribute__((aligned(8))) w20=		0x0020002000200020LL;
--static uint64_t __attribute__((aligned(8))) b00= 		0x0000000000000000LL;
--static uint64_t __attribute__((aligned(8))) b01= 		0x0101010101010101LL;
--static uint64_t __attribute__((aligned(8))) b02= 		0x0202020202020202LL;
--static uint64_t __attribute__((aligned(8))) b08= 		0x0808080808080808LL;
--static uint64_t __attribute__((aligned(8))) b80= 		0x8080808080808080LL;
-+static uint64_t __attribute_used__ __attribute__((aligned(8))) w05=		0x0005000500050005LL;
-+static uint64_t __attribute_used__ __attribute__((aligned(8))) w20=		0x0020002000200020LL;
-+static uint64_t __attribute_used__ __attribute__((aligned(8))) b00= 		0x0000000000000000LL;
-+static uint64_t __attribute_used__ __attribute__((aligned(8))) b01= 		0x0101010101010101LL;
-+static uint64_t __attribute_used__ __attribute__((aligned(8))) b02= 		0x0202020202020202LL;
-+static uint64_t __attribute_used__ __attribute__((aligned(8))) b08= 		0x0808080808080808LL;
-+static uint64_t __attribute_used__ __attribute__((aligned(8))) b80= 		0x8080808080808080LL;
- #endif
- 
- 
-@@ -119,7 +119,7 @@ static uint8_t * const clip_tab= clip_ta
- 
- static int verbose= 0;
- 
--static const int deringThreshold= 20;
-+const int deringThreshold= 20;
- 
- 
- static struct PPFilter filters[]=
diff --git a/media-video/mplayer/files/mplayer-1.0_pre3-libmatroska063.diff b/media-video/mplayer/files/mplayer-1.0_pre3-libmatroska063.diff
deleted file mode 100644
index 30fe7026bc63..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre3-libmatroska063.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- libmpdemux/demux_mkv.cpp	2004-03-16 21:43:06.000000000 +0100
-+++ libmpdemux/demux_mkv.cpp.fixed	2004-03-16 21:44:30.000000000 +0100
-@@ -1226,7 +1226,6 @@
-   KaxCueClusterPosition *ccpos;
-   KaxCueTrack *ctrack;
-   KaxCueTrackPositions *ctrackpos;
--  KaxCueReference *cref;
-   int upper_lvl_el, i, k;
-   uint64_t tc_scale, filepos = 0, timecode = 0;
-   uint32_t tnum = 0;
-@@ -1300,9 +1299,7 @@
-       mp_msg(MSGT_DEMUX, MSGL_DBG2, "[mkv] |   + found cue cluster "
-              "position: %llu\n", filepos);
- 
--      cref = FINDFIRST(ctrackpos, KaxCueReference);
--      add_index_entry(mkv_d, tnum, filepos, timecode,
--                      cref == NULL ? 1 : 0);
-+      add_index_entry(mkv_d, tnum, filepos, timecode, 1);
-      
-       ctrackpos = FINDNEXT(cpoint, KaxCueTrackPositions, ctrackpos);
-     }
diff --git a/media-video/mplayer/files/mplayer-1.0_pre3-xmms.patch b/media-video/mplayer/files/mplayer-1.0_pre3-xmms.patch
deleted file mode 100644
index 36340bd78c57..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre3-xmms.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure	2004-03-22 12:49:44.866704864 +0000
-+++ configure	2004-03-22 12:50:00.397343848 +0000
-@@ -1294,6 +1294,7 @@
-   --enable-external-faad)	_faad_external=yes	_faad_internal=no	;;
-   --disable-external-faad)	_faad_external=no	;;
-   --enable-xmms)	_xmms=yes	;;
-+  --disable-xmms)	_xmms=no	;;
-   --enable-flac)	_flac=yes	;;
-   --disable-flac)	_flac=no	;;
-   --enable-external-flac)	_external_flac=yes	;;
diff --git a/media-video/mplayer/files/mplayer-1.0_pre4-gcc34-mtune.patch b/media-video/mplayer/files/mplayer-1.0_pre4-gcc34-mtune.patch
deleted file mode 100644
index 221943f8f27e..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre4-gcc34-mtune.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- configure.old	2004-04-29 23:56:20.926581760 +0200
-+++ configure	2004-04-30 00:04:54.743469720 +0200
-@@ -732,21 +732,27 @@
-     # check that gcc supports our CPU, if not, fall back to earlier ones
-     # LGB: check -mcpu and -march swithing step by step with enabling
-     # to fall back till 386.
--
-+# gcc >= 3.4.0  doesn't support -mcpu, we have to use -mtune instead
-+if [ "$_cc_major" -gt 3 ] || ( [ "$_cc_major" = 3 ] && [ "$_cc_minor" -ge 4 ]) ; then
-+	cpuopt=-mtune
-+	else
-+	cpuopt=-mcpu
-+	fi
-+	
-     echocheck "GCC & CPU optimization abilities"
- cat > $TMPC << EOF
- int main(void) { return 0; }
- EOF
-   if test "$_runtime_cpudetection" = no ; then
-     if test "$proc" = "athlon-xp" || test "$proc" = "athlon-4" || test "$proc" = "athlon-tbird"; then
--      cc_check -march=$proc -mcpu=$proc || proc=athlon
-+      cc_check -march=$proc $cpuopt=$proc || proc=athlon
-     fi
-     if test "$proc" = "k6-3" || test "$proc" = "k6-2"; then
--      cc_check -march=$proc -mcpu=$proc  || proc=k6
-+      cc_check -march=$proc $cpuopt=$proc  || proc=k6
-     fi
-     if test "$proc" = "k6"; then
--      if not cc_check -march=$proc -mcpu=$proc; then
--        if cc_check -march=i586 -mcpu=i686; then
-+      if not cc_check -march=$proc -$cpuopt=$proc; then
-+        if cc_check -march=i586 $cpuopt=i686; then
-           proc=i586-i686
-         else 
-           proc=i586
-@@ -754,37 +760,37 @@
-       fi
-     fi
-     if test "$proc" = "pentium4" || test "$proc" = "pentium3" || test "$proc" = "pentium2" || test "$proc" = "athlon"; then
--      cc_check -march=$proc -mcpu=$proc  || proc=i686
-+      cc_check -march=$proc $cpuopt=$proc  || proc=i686
-     fi
-     if test "$proc" = "i686" || test "$proc" = "pentium-mmx"; then
--      cc_check -march=$proc -mcpu=$proc  || proc=i586
-+      cc_check -march=$proc $cpuopt=$proc  || proc=i586
-     fi
-     if test "$proc" = "i586" ; then
--      cc_check -march=$proc -mcpu=$proc  || proc=i486
-+      cc_check -march=$proc $cpuopt=$proc  || proc=i486
-     fi
-     if test "$proc" = "i486" ; then
--      cc_check -march=$proc -mcpu=$proc  || proc=i386
-+      cc_check -march=$proc $cpuopt=$proc  || proc=i386
-     fi
-     if test "$proc" = "i386" ; then
--      cc_check -march=$proc -mcpu=$proc  || proc=error
-+      cc_check -march=$proc $cpuopt=$proc  || proc=error
-     fi
-     if test "$proc" = "error" ; then
--      echores "Your $_cc does not even support \"i386\" for '-march' and '-mcpu'."
-+      echores "Your $_cc does not even support \"i386\" for '-march' and '$cpuopt'."
-       _mcpu=""
-       _march=""
-       _optimizing=""
-     elif test "$proc" = "i586-i686"; then
-       _march="-march=i586"
--      _mcpu="-mcpu=i686"
-+      _mcpu="$cpuopt=i686"
-       _optimizing="$proc"
-     else
-       _march="-march=$proc"
--      _mcpu="-mcpu=$proc"
-+      _mcpu="$cpuopt=$proc"
-       _optimizing="$proc"
-     fi
-   else
-     # i686 is probably the most common CPU - optimize for it
--    _mcpu="-mcpu=i686"
-+    _mcpu="$cpuopt=i686"
-     # at least i486 required, for bswap instruction
-     _march="-march=i486"
-     cc_check $_mcpu || _mcpu=""
-@@ -797,10 +803,10 @@
-       # TODO: it may be a good idea to check GCC and fall back in all cases
-       if test "$host_arch" = "i586-i686"; then
-         _march="-march=i586"
--        _mcpu="-mcpu=i686"
-+        _mcpu="$cpuopt=i686"
-       else      
-         _march="-march=$host_arch"
--        _mcpu="-mcpu=$host_arch"
-+        _mcpu="$cpuopt=$host_arch"
-       fi
-     
-       proc="$host_arch"
diff --git a/media-video/mplayer/files/noenca.patch b/media-video/mplayer/files/noenca.patch
deleted file mode 100644
index b78adbd570bc..000000000000
--- a/media-video/mplayer/files/noenca.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpdemux/demux_mkv_old.old	2004-07-14 22:44:36.685325824 +0900
-+++ libmpdemux/demux_mkv_old.cpp	2004-07-14 22:45:09.691308152 +0900
-@@ -1552,7 +1552,7 @@
-   qt_image_description_t *idesc;
- 
- #ifdef USE_ICONV
--  subcp_open();
-+  subcp_open_noenca();
- #endif
- 
-   s = demuxer->stream;
diff --git a/media-video/mplayer/files/ppc750FX-fix.patch b/media-video/mplayer/files/ppc750FX-fix.patch
deleted file mode 100644
index a3482254f653..000000000000
--- a/media-video/mplayer/files/ppc750FX-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure	2003-12-08 22:33:31.000000000 +0100
-+++ configure	2004-03-10 14:37:09.000000000 +0100
-@@ -890,7 +890,7 @@
- 	    603e|603ev) _march='-mcpu=603e' _mcpu='-mtune=603e' ;;
- 	    604|604e|604r|604ev) _march='-mcpu=604' _mcpu='-mtune=604' ;;
- 	    740|740/750|745/755) _march='-mcpu=740' _mcpu='-mtune=740' ;;
-+	    750|750CX|750FX) _march='-mcpu=750' _mcpu='-mtune=750' ;;
--	    750|750CX) _march='-mcpu=750' _mcpu='-mtune=750' ;;
-     	    *) ;;
-         esac
- 	# gcc 3.1(.1) and up supports 7400 and 7450
diff --git a/media-video/mplayer/files/vuln01-fix.diff b/media-video/mplayer/files/vuln01-fix.diff
deleted file mode 100644
index 407bc804165f..000000000000
--- a/media-video/mplayer/files/vuln01-fix.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Update of /cvsroot/mplayer/main/libmpdemux
-In directory mail:/var/tmp.root/cvs-serv19707/libmpdemux
-
-Modified Files:
-	asf_streaming.c 
-Log Message:
-simple fix for buffer overflow (remotely exploitable). feel free to
-commit a better fix if you don't like it.
-
-
-Index: asf_streaming.c
-===================================================================
-RCS file: /cvsroot/mplayer/main/libmpdemux/asf_streaming.c,v
-retrieving revision 1.40
-retrieving revision 1.41
-diff -u -r1.40 -r1.41
---- asf_streaming.c	15 Aug 2003 19:13:23 -0000	1.40
-+++ asf_streaming.c	25 Sep 2003 00:36:04 -0000	1.41
-@@ -502,11 +502,11 @@
- 			return NULL;
- 		}
- 		http_set_uri( http_hdr, server_url->url );
--		sprintf( str, "Host: %s:%d", server_url->hostname, server_url->port );
-+		sprintf( str, "Host: %.220s:%d", server_url->hostname, server_url->port );
- 		url_free( server_url );
- 	} else {
- 		http_set_uri( http_hdr, url->file );
--		sprintf( str, "Host: %s:%d", url->hostname, url->port );
-+		sprintf( str, "Host: %.220s:%d", url->hostname, url->port );
- 	}
- 	
- 	http_set_field( http_hdr, str );
-
-_______________________________________________
-Mplayer-cvslog mailing list
-Mplayer-cvslog@mplayerhq.hu
-http://mplayerhq.hu/mailman/listinfo/mplayer-cvslog