Removed unused and unneeded files in FILESDIR.

Package-Manager: portage-2.0.51.20-r4

19 files changed, 17 insertions, 702 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 7ec005008390..3c061351db88 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.216 2005/04/26 20:08:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.217 2005/04/26 20:43:43 flameeyes Exp $
+
+  26 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/xine-lib-0.9.12-r2-directfb.patch, -files/xineconfig.patch-0.9.13,
+  -files/xine-lib-0.9.13-kxine.patch, -files/protect-CFLAGS.patch-1_rc2,
+  -files/protect-CFLAGS.patch-1_rc3, -files/protect-CFLAGS.patch-1_rc4,
+  -files/protect-CFLAGS.patch-1_rc5-r1,
+  -files/xine-lib-1-rc4-sparc_missing_include.patch,
+  -files/xine-lib-1_rc5-configure-sparc.patch,
+  -files/xine-lib-1_rc5-vcd_overflow.patch,
+  -files/xine-lib-1_rc6-ffmpeg.patch,
+  -files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch,
+  -files/xine-lib-2.6.patch, -files/configure-64bit-define.patch,
+  -files/xine-lib-configure.patch, -files/xine-lib-disable-directfb.patch,
+  -files/xine-lib-gcc34.patch:
+  Removed unused and unneeded files in FILESDIR.
 
   26 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
   +files/xine-lib-1.0.1-configurebis.patch, -xine-lib-1_rc6-r1.ebuild,
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index e7de7ee59ba6..ff1042ef472a 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -3,25 +3,14 @@ MD5 60f92c0bf2f960ee5fe72cfd8b60e60b xine-lib-1_rc8-r1.ebuild 5688
 MD5 85910e7a6aab4d7728ccdd55c1f0664b xine-lib-1.0-r2.ebuild 7506
 MD5 9415e56720946429be1cd7c6142f4351 xine-lib-1.0-r3.ebuild 7578
 MD5 79cd4ff146e065a636eae4001b6d0b6a xine-lib-1.0-r4.ebuild 7845
-MD5 4a5c3d015e4ca71298a156cb5e3c29e6 ChangeLog 5742
+MD5 608df6c363782352259ef57c5d5eef9f ChangeLog 6515
 MD5 029b5cc3a3ba4559d1407612a326180a xine-lib-1_rc6-r2.ebuild 5696
 MD5 85466bc61737b8faccdbd4e25eb86bb8 xine-lib-1.0.1.ebuild 7696
-MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
 MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
 MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
-MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
 MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316
-MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
-MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
-MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
 MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
-MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
 MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
 MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
 MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
@@ -29,16 +18,10 @@ MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch
 MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
 MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
 MD5 3704271d4339b919569b4ea416a4c34e files/xine-lib-1_rc8-configure.ac.patch 2825
-MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
 MD5 d0a2aa9bcd1263077cd8e3fe974b6910 files/xine-lib-configure-xvmc-header.patch 901
 MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926
-MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
-MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
-MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
 MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
 MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
-MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
 MD5 93e50bb9c91e39eb06a74e4d66477100 files/xine-lib-XSA-2004-8.patch 1532
 MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r2 65
 MD5 db77ea2067d040ca948623d374d071d8 files/xine-lib-gcc4.patch 8402
diff --git a/media-libs/xine-lib/files/configure-64bit-define.patch b/media-libs/xine-lib/files/configure-64bit-define.patch
deleted file mode 100644
index 1647a471ee17..000000000000
--- a/media-libs/xine-lib/files/configure-64bit-define.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2004-05-17 17:06:13.646459416 +0100
-+++ configure	2004-05-17 17:06:38.812633576 +0100
-@@ -38238,7 +38238,7 @@
- 
- 
- cat >>confdefs.h <<\_ACEOF
--#define FPM_INTEL 1
-+#define FPM_64BIT 1
- _ACEOF
- 
-     ;;
diff --git a/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc2 b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc2
deleted file mode 100644
index 5634a5ad3280..000000000000
--- a/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc2
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	2003-10-05 09:10:26.000000000 -0400
-+++ configure	2003-10-12 13:32:27.000000000 -0400
-@@ -33439,7 +33439,7 @@
-         k7cpu="i686"
-     fi
- 
--		CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions $CFLAGS"
-+		CFLAGS="$CFLAGS"
- 
- 	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
- 
-@@ -33491,10 +33491,6 @@
- 		;;
- 
- 	    esac
--	    if test x"$archopt_val" != x; then
--		CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--		DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--	    fi
- 
- 	fi
-       else
diff --git a/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc3 b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc3
deleted file mode 100644
index c42e6a87cf1a..000000000000
--- a/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc3
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	2003-12-15 11:28:29.000000000 +0100
-+++ configure	2003-12-17 23:26:25.000000000 +0100
-@@ -39143,7 +39143,7 @@
-         k7cpu="i686"
-     fi
- 
--		CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions $CFLAGS"
-+		CFLAGS="$CFLAGS"
- 
- 	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
- 
-@@ -39195,10 +39195,6 @@
- 		;;
- 
- 	    esac
--	    if test x"$archopt_val" != x; then
--		CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--		DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--	    fi
- 
- 	fi
-       else
diff --git a/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc4 b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc4
deleted file mode 100644
index c42e6a87cf1a..000000000000
--- a/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc4
+++ /dev/null
@@ -1,22 +0,0 @@
---- configure.orig	2003-12-15 11:28:29.000000000 +0100
-+++ configure	2003-12-17 23:26:25.000000000 +0100
-@@ -39143,7 +39143,7 @@
-         k7cpu="i686"
-     fi
- 
--		CFLAGS="-O3 -pipe -fomit-frame-pointer $f_af $f_al $f_aj $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions $CFLAGS"
-+		CFLAGS="$CFLAGS"
- 
- 	DEBUG_CFLAGS="-O $DEBUG_CFLAGS"
- 
-@@ -39195,10 +39195,6 @@
- 		;;
- 
- 	    esac
--	    if test x"$archopt_val" != x; then
--		CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--		DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--	    fi
- 
- 	fi
-       else
diff --git a/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc5-r1 b/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc5-r1
deleted file mode 100644
index 2d93c108172f..000000000000
--- a/media-libs/xine-lib/files/protect-CFLAGS.patch-1_rc5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	2003-12-15 11:28:29.000000000 +0100
-+++ configure	2003-12-17 23:26:25.000000000 +0100
-@@ -39195,10 +39195,6 @@
- 		;;
- 
- 	    esac
--	    if test x"$archopt_val" != x; then
--		CFLAGS="$sarchopt=$archopt_val $CFLAGS"
--		DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS"
--	    fi
- 
- 	fi
-       else
diff --git a/media-libs/xine-lib/files/xine-lib-0.9.12-r2-directfb.patch b/media-libs/xine-lib/files/xine-lib-0.9.12-r2-directfb.patch
deleted file mode 100644
index 88b99680c558..000000000000
--- a/media-libs/xine-lib/files/xine-lib-0.9.12-r2-directfb.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- xine/xine-lib/src/video_out/Makefile.am	2002/07/16 19:33:37	1.46
-+++ xine/xine-lib/src/video_out/Makefile.am	2002/07/22 17:48:40	1.47
-@@ -2,8 +2,8 @@
- 
- VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix -I$(top_srcdir)/src/video_out/vidix
- 
--CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
--DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS)
-+CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) $(DIRECTFB_CFLAGS)
-+DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) $(DIRECTFB_CFLAGS)
- 
- LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
- 
-
diff --git a/media-libs/xine-lib/files/xine-lib-0.9.13-kxine.patch b/media-libs/xine-lib/files/xine-lib-0.9.13-kxine.patch
deleted file mode 100644
index 4ce6500732ab..000000000000
--- a/media-libs/xine-lib/files/xine-lib-0.9.13-kxine.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-diff -ur xine-lib-0.9.13/src/video_out/video_out_x11.h xine-lib-0.9.13-new/src/video_out/video_out_x11.h
---- xine-lib-0.9.13/src/video_out/video_out_x11.h	Thu Mar 21 18:29:51 2002
-+++ xine-lib-0.9.13-new/src/video_out/video_out_x11.h	Tue Aug  6 23:00:54 2002
-@@ -109,6 +109,12 @@
- /* int *data */
- #define GUI_DATA_EX_VIDEOWIN_VISIBLE	   5
- 
-+/* void (*data[])(Display*) */
-+/* i.e. a pointer to an array of function-pointers
-+ * the first is the XLockDisplay replacement
-+ * the second is the XUnlockDisplay replacement */
-+#define GUI_DATA_EX_CHANGE_LOCK_FUNCTIONS  6
-+
- /* *data contains chosen visual, select a new one or change it to NULL
-  * to indicate the visual to use or that no visual will work */
- /* XVisualInfo **data */
-diff -ur xine-lib-0.9.13/src/video_out/video_out_xshm.c xine-lib-0.9.13-new/src/video_out/video_out_xshm.c
---- xine-lib-0.9.13/src/video_out/video_out_xshm.c	Thu Aug  1 16:26:53 2002
-+++ xine-lib-0.9.13-new/src/video_out/video_out_xshm.c	Tue Aug  6 23:06:54 2002
-@@ -26,6 +26,9 @@
-  *
-  * xine-specific code by Guenter Bartsch <bartscgr@studbox.uni-stuttgart.de>
-  * 
-+ * locking function change support for KDE front end by Mark Thomas
-+ * <markbt@users.sourceforge.net> - August 2002
-+ *
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -173,6 +176,9 @@
- 			int video_width, int video_height, 
- 			int *dest_width, int *dest_height);
- 
-+  void (*x11_LockDisplay)   (Display *);
-+  void (*x11_UnlockDisplay) (Display *);
-+
- } xshm_driver_t;
- 
- 
-@@ -404,9 +410,9 @@
-   xshm_driver_t *this = (xshm_driver_t *) vo_img->driver;
- 
-   if (frame->image) {
--    XLockDisplay (this->display); 
-+    this->x11_LockDisplay (this->display); 
-     dispose_ximage (this, &frame->shminfo, frame->image);
--    XUnlockDisplay (this->display); 
-+    this->x11_UnlockDisplay (this->display); 
-   }
- 
-   free (frame);
-@@ -627,7 +633,7 @@
- 	    frame->output_width, frame->output_height);
- #endif
- 
--    XLockDisplay (this->display); 
-+    this->x11_LockDisplay (this->display); 
- 
-     /*
-      * (re-) allocate XImage
-@@ -656,7 +662,7 @@
-     frame->image = create_ximage (this, &frame->shminfo,
- 				  frame->output_width, frame->output_height);
- 
--    XUnlockDisplay (this->display); 
-+    this->x11_UnlockDisplay (this->display); 
- 
-     if (format == IMGFMT_YV12) {
-       frame->vo_frame.pitches[0] = 8*((width + 7) / 8);
-@@ -768,7 +774,7 @@
- 
- static void clean_output_area (xshm_driver_t *this) {
- 
--  XLockDisplay (this->display);
-+  this->x11_LockDisplay (this->display);
- 
-   XSetForeground (this->display, this->gc, this->black.pixel);
- 
-@@ -804,7 +810,7 @@
-   
- #endif
- 
--  XUnlockDisplay (this->display);
-+  this->x11_UnlockDisplay (this->display);
- }
- 
- static int xshm_redraw_needed (vo_driver_t *this_gen) {
-@@ -913,7 +919,7 @@
-     xoffset  = (this->gui_width - frame->output_width) / 2 + this->gui_x;
-     yoffset  = (this->gui_height - frame->output_height) / 2 + this->gui_y;
- 
--    XLockDisplay (this->display);
-+    this->x11_LockDisplay (this->display);
- #ifdef LOG
-     printf ("video_out_xshm: display locked...\n");
- #endif
-@@ -946,7 +952,7 @@
-       XFlush(this->display);
-     }
- 
--    XUnlockDisplay (this->display);
-+    this->x11_UnlockDisplay (this->display);
- 
-   }
- 
-@@ -1103,7 +1109,7 @@
-       
-       if (xev->count == 0) {
- 	
--	XLockDisplay (this->display);
-+	this->x11_LockDisplay (this->display);
- 	
- 	xoffset  = (this->cur_frame->gui_width  - this->cur_frame->output_width) / 2;
- 	yoffset  = (this->cur_frame->gui_height - this->cur_frame->output_height) / 2;
-@@ -1145,7 +1151,7 @@
- 
- 	XFlush (this->display);
- 	
--	XUnlockDisplay (this->display);
-+	this->x11_UnlockDisplay (this->display);
-       }
-       
-     }
-@@ -1181,6 +1187,14 @@
-     
-     break;
- 
-+  case GUI_DATA_EX_CHANGE_LOCK_FUNCTIONS:
-+  {
-+    void (**func)(void) = data;
-+    this -> x11_LockDisplay = func[0];
-+    this -> x11_UnlockDisplay = func[1];
-+  }
-+  break;
-+
-   default:
-     return -1;
-   }
-@@ -1305,6 +1319,9 @@
-   this->gc		    = XCreateGC (this->display, this->drawable,
- 					 0, NULL);
- 
-+  this->x11_LockDisplay     = XLockDisplay;
-+  this->x11_UnlockDisplay   = XUnlockDisplay;
-+
-   this->vo_driver.get_capabilities     = xshm_get_capabilities;
-   this->vo_driver.alloc_frame          = xshm_alloc_frame;
-   this->vo_driver.update_frame_format  = xshm_update_frame_format;
-diff -ur xine-lib-0.9.13/src/video_out/video_out_xv.c xine-lib-0.9.13-new/src/video_out/video_out_xv.c
---- xine-lib-0.9.13/src/video_out/video_out_xv.c	Sat Jul 20 22:46:06 2002
-+++ xine-lib-0.9.13-new/src/video_out/video_out_xv.c	Tue Aug  6 23:06:17 2002
-@@ -29,6 +29,9 @@
-  * xine-specific code by Guenter Bartsch <bartscgr@studbox.uni-stuttgart.de>
-  *
-  * overlay support by James Courtier-Dutton <James@superbug.demon.co.uk> - July 2001
-+ *
-+ * locking function change support for KDE front-end by Mark Thomas
-+ * <markbt@users.sourceforge.net> - August 2002
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -196,6 +199,9 @@
- 
-   int                use_colorkey;
-   uint32_t           colorkey;
-+
-+  void (*x11_LockDisplay)   (Display *);
-+  void (*x11_UnlockDisplay) (Display *);
- };
- 
- int gX11Fail;
-@@ -219,18 +225,18 @@
-   if (frame->image) {
-     
-     if (this->use_shm) {
--      XLockDisplay (this->display);
-+      this->x11_LockDisplay (this->display);
-       XShmDetach (this->display, &frame->shminfo);
-       XFree (frame->image);
--      XUnlockDisplay (this->display);
-+      this->x11_UnlockDisplay (this->display);
- 
-       shmdt (frame->shminfo.shmaddr);
-       shmctl (frame->shminfo.shmid, IPC_RMID, NULL);
-     }
-     else {
--      XLockDisplay (this->display);
-+      this->x11_LockDisplay (this->display);
-       XFree (frame->image);
--      XUnlockDisplay (this->display);
-+      this->x11_UnlockDisplay (this->display);
-     }
-   }
- 
-@@ -450,7 +456,7 @@
- 
-     /* printf ("video_out_xv: updating frame to %d x %d (ratio=%d, format=%08x)\n",width,height,ratio_code,format); */
- 
--    XLockDisplay (this->display);
-+    this->x11_LockDisplay (this->display);
- 
-     /*
-      * (re-) allocate xvimage
-@@ -474,7 +480,7 @@
-     frame->height = height;
-     frame->format = format;
- 
--    XUnlockDisplay (this->display);
-+    this->x11_UnlockDisplay (this->display);
-   }
- 
-   frame->ratio_code = ratio_code;
-@@ -494,7 +500,7 @@
-        || (frame->width != this->deinterlace_frame.width)
-        || (frame->height / xvscaling != this->deinterlace_frame.height )
-        || (frame->format != this->deinterlace_frame.format)) {
--    XLockDisplay (this->display);
-+    this->x11_LockDisplay (this->display);
- 
-     if( this->deinterlace_frame.image )
-       dispose_ximage (this, &this->deinterlace_frame.shminfo,
-@@ -507,7 +513,7 @@
-     this->deinterlace_frame.height = frame->height / xvscaling;
-     this->deinterlace_frame.format = frame->format;
- 
--    XUnlockDisplay (this->display);
-+    this->x11_UnlockDisplay (this->display);
-   }
- 
-   
-@@ -584,7 +590,7 @@
- 
- static void xv_clean_output_area (xv_driver_t *this) {
- 
--  XLockDisplay (this->display);
-+  this->x11_LockDisplay (this->display);
- 
-   XSetForeground (this->display, this->gc, this->black.pixel);
- 
-@@ -598,7 +604,7 @@
- 		    this->output_width, this->output_height);
-   }
-   
--  XUnlockDisplay (this->display);
-+  this->x11_UnlockDisplay (this->display);
- }
- 
- /*
-@@ -865,7 +871,7 @@
-      */
-     xv_redraw_needed (this_gen);
- 
--    XLockDisplay (this->display);
-+    this->x11_LockDisplay (this->display);
- 
-     if (this->use_shm) {
-       XvShmPutImage(this->display, this->xv_port,
-@@ -887,7 +893,7 @@
- 
-     XFlush(this->display);
- 
--    XUnlockDisplay (this->display);
-+    this->x11_UnlockDisplay (this->display);
-     
-   }
-   /*
-@@ -1034,7 +1040,7 @@
-     /* FIXME : take care of completion events */
-     
-     if (this->cur_frame) {
--      XLockDisplay (this->display);
-+      this->x11_LockDisplay (this->display);
-       
-       if (this->use_shm) {
- 	XvShmPutImage(this->display, this->xv_port,
-@@ -1075,7 +1081,7 @@
- 
-       XFlush(this->display);
-       
--      XUnlockDisplay (this->display);
-+      this->x11_UnlockDisplay (this->display);
-     }
-   }
-   break;
-@@ -1101,6 +1107,14 @@
-     }
-     break;
- 
-+  case GUI_DATA_EX_CHANGE_LOCK_FUNCTIONS:
-+  {
-+    void (**func)(void) = data;
-+    this->x11_LockDisplay = func[0];
-+    this->x11_UnlockDisplay = func[1];
-+  }
-+  break;
-+  
-   default:
-     return -1;
-   }
-@@ -1119,11 +1133,11 @@
-     this->deinterlace_frame.image = NULL;
-   }
- 
--  XLockDisplay (this->display);
-+  this->x11_LockDisplay (this->display);
-   if(XvUngrabPort (this->display, this->xv_port, CurrentTime) != Success) {
-     printf ("video_out_xv: xv_exit: XvUngrabPort() failed.\n");
-   }
--  XUnlockDisplay (this->display);
-+  this->x11_UnlockDisplay (this->display);
- 
-   for( i=0; i < VO_NUM_RECENT_FRAMES; i++ )
-   {
-@@ -1352,6 +1366,8 @@
-   this->deinterlace_frame.image = NULL;
-   this->use_colorkey      = 0;
-   this->colorkey          = 0;
-+  this->x11_LockDisplay   = XLockDisplay;
-+  this->x11_UnlockDisplay = XUnlockDisplay;
- 
-   XAllocNamedColor(this->display,
- 		   DefaultColormap(this->display, this->screen),
diff --git a/media-libs/xine-lib/files/xine-lib-1-rc4-sparc_missing_include.patch b/media-libs/xine-lib/files/xine-lib-1-rc4-sparc_missing_include.patch
deleted file mode 100644
index b72ec5eb31d9..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1-rc4-sparc_missing_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xine-lib-1-rc4/src/libmpeg2/Makefile.in	2004-05-04 16:06:46.000000000 -0500
-+++ xine-lib-1-rc4-patched/src/libmpeg2/Makefile.in	2004-05-05 11:23:49.000000000 -0500
-@@ -305,7 +305,7 @@
- 	$(am_xineplug_decode_mpeg2_la_OBJECTS)
- 
- DEFS = @DEFS@
--DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/src/libffmpeg/libavcodec/sparc
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
diff --git a/media-libs/xine-lib/files/xine-lib-1_rc5-configure-sparc.patch b/media-libs/xine-lib/files/xine-lib-1_rc5-configure-sparc.patch
deleted file mode 100644
index e9c943f7c980..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1_rc5-configure-sparc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- xine-lib-1-rc3/configure.ac.org	2003-12-29 14:44:22.000000000 +0100
-+++ xine-lib-1-rc3/configure.ac	2003-12-29 14:47:43.000000000 +0100
-@@ -1505,9 +1505,9 @@
-     ;;
- 
-   sparc*-*-linux*)
--    case $host_alias in
--    sparc-*)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
--    sparc64-*)
-+    case `uname -m` in
-+    sparc)    cpu_cflags="-mcpu=supersparc -mtune=supersparc" ;;
-+    sparc64)
-       cpu_cflags="-mcpu=ultrasparc -mtune=ultrasparc"
-       if test x$enable_vis = xyes; then
-         AC_DEFINE_UNQUOTED(ENABLE_VIS,,[Define this if you have Sun UltraSPARC CPU])
diff --git a/media-libs/xine-lib/files/xine-lib-1_rc5-vcd_overflow.patch b/media-libs/xine-lib/files/xine-lib-1_rc5-vcd_overflow.patch
deleted file mode 100644
index 5fd9ea6fc701..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1_rc5-vcd_overflow.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/input/vcd/xineplug_inp_vcd.c.old	2004-08-11 02:55:35.296492264 +0900
-+++ src/input/vcd/xineplug_inp_vcd.c	2004-08-11 02:59:45.897395136 +0900
-@@ -48,6 +48,7 @@
- #define SHORT_PLUGIN_NAME "VCD"
- #define MRL_PREFIX "vcd://"
- #define MRL_PREFIX_LEN strlen(MRL_PREFIX)
-+#define MRL_MAX_LEN 1024
- 
- #define xine_config_entry_t xine_cfg_entry_t
- 
-@@ -474,7 +475,7 @@
-     return false;
-   }
- 
--  count = sscanf (p, "%[^@]@%1[EePpSsTt]%u", 
-+  count = sscanf (p, "%1024[^@]@%1[EePpSsTt]%u", 
- 		  device_str, type_str, &num);
-   itemid->num = num;
-   
-@@ -498,7 +499,7 @@
-     {
-       /* No device/file given, so use the default device and try again. */
-       if (NULL == default_vcd_device) return false;
--      strcpy(device_str, default_vcd_device);
-+      strncpy(device_str, default_vcd_device, MRL_MAX_LEN);
-       if (p[0] == '@') p++;
-       count = sscanf (p, "%1[EePpSsTt]%u", type_str, &num);
-       type_str[0] = toupper(type_str[0]);
-@@ -790,7 +791,7 @@
- vcd_class_get_dir (input_class_t *this_gen, const char *filename, 
-                     int *num_files) {
- 
--  char             intended_vcd_device[1024]="";
-+  char             intended_vcd_device[MRL_MAX_LEN+1]="";
-   vcdinfo_itemid_t itemid;
- 
-   vcd_input_class_t *class = (vcd_input_class_t *) this_gen;
-@@ -922,7 +923,7 @@
- static char *
- vcd_class_get_identifier (input_class_t *this_gen) {
-   dbg_print((INPUT_DBG_CALL|INPUT_DBG_EXT), "called\n");
--  return SHORT_PLUGIN_NAME;
-+  return strdup(SHORT_PLUGIN_NAME);
- }
- 
- /* 
-@@ -1452,7 +1453,7 @@
- {
-   vcd_input_class_t  *class = (vcd_input_class_t *) class_gen;
- 
--  char intended_vcd_device[1024]="";
-+  char intended_vcd_device[MRL_MAX_LEN+1]="";
-   vcdinfo_itemid_t itemid;
-   char *check_mrl=NULL;
-   bool used_default;
diff --git a/media-libs/xine-lib/files/xine-lib-1_rc6-ffmpeg.patch b/media-libs/xine-lib/files/xine-lib-1_rc6-ffmpeg.patch
deleted file mode 100644
index 1a254f71f6eb..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1_rc6-ffmpeg.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/libffmpeg/xine_decoder.h_old	2004-09-18 23:42:37.480104064 +0900
-+++ src/libffmpeg/xine_decoder.h	2004-09-18 23:42:50.224166672 +0900
-@@ -41,7 +41,7 @@
- #endif
- 
- #ifdef HAVE_FFMPEG
--#  include <avcodec.h>
-+#  include <ffmpeg/avcodec.h>
- #else
- #  include "libavcodec/avcodec.h"
- #endif
---- src/libffmpeg/video_decoder.c_old	2004-09-19 00:13:50.512359880 +0900
-+++ src/libffmpeg/video_decoder.c	2004-09-19 00:14:29.522429448 +0900
-@@ -48,7 +48,7 @@
- #include "mpeg_parser.h"
- 
- #ifdef HAVE_FFMPEG
--#  include <postprocess.h>
-+#  include <postproc/postprocess.h>
- #else
- #  include "libavcodec/libpostproc/postprocess.h"
- #endif
---- src/libffmpeg/dvaudio_decoder.c_old	2004-09-19 00:28:37.116575552 +0900
-+++ src/libffmpeg/dvaudio_decoder.c	2004-09-19 00:28:56.180677368 +0900
-@@ -57,7 +57,7 @@
- #endif
- 
- #ifdef HAVE_FFMPEG
--#  include <avcodec.h>
-+#  include <ffmpeg/avcodec.h>
- #  include "libavcodec/dvdata.h"
- #else
- #  include "libavcodec/avcodec.h"
---- src/libffmpeg/xine_encoder.c_old	2004-09-19 00:27:52.558349432 +0900
-+++ src/libffmpeg/xine_encoder.c	2004-09-19 00:28:21.745912248 +0900
-@@ -41,7 +41,7 @@
- #include "video_out_dxr3.h"
- 
- #ifdef HAVE_FFMPEG
--#  include <avcodec.h>
-+#  include <ffmpeg/avcodec.h>
- #else
- #  include "libavcodec/avcodec.h"
- #endif
diff --git a/media-libs/xine-lib/files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch b/media-libs/xine-lib/files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch
deleted file mode 100644
index 6bf20e0ce627..000000000000
--- a/media-libs/xine-lib/files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xine-lib-1-rc4/ltmain.sh	2004-05-05 15:33:22.000000000 -0500
-+++ xine-lib-1-rc4/ltmain.sh	2004-05-05 15:33:54.000000000 -0500
-@@ -947,7 +947,7 @@
-     thread_safe=no
-     vinfo=
-     vinfo_number=no
--
-+    shrext_cmds=".so"
-     func_infer_tag $base_compile
- 
-     # We need to know -static, to get the right output filenames.
diff --git a/media-libs/xine-lib/files/xine-lib-2.6.patch b/media-libs/xine-lib/files/xine-lib-2.6.patch
deleted file mode 100644
index 88e9d6033a71..000000000000
--- a/media-libs/xine-lib/files/xine-lib-2.6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/xine-utils/xine_check.c	2003-12-08 10:36:27.000000000 +0000
-+++ src/xine-utils/xine_check.c.plasmaroo	2003-12-27 14:20:36.000000000 +0000
-@@ -276,6 +276,11 @@
-     return hc;
-   }
- 
-+  #define SCSI_DISK_MAJOR(M) ((M) == SCSI_DISK0_MAJOR || \
-+    ((M) >= SCSI_DISK1_MAJOR && (M) <= SCSI_DISK7_MAJOR))
-+
-+  #define SCSI_BLK_MAJOR(M) (SCSI_DISK_MAJOR(M) || (M) == SCSI_CDROM_MAJOR)
-+
-   if (SCSI_BLK_MAJOR(major(st.st_rdev))) {
-     is_scsi_dev = 1;
-     set_hc_result(hc, XINE_HEALTH_CHECK_OK, "SKIPPED - Operation not supported on SCSI drives or drives that use the ide-scsi module.");
diff --git a/media-libs/xine-lib/files/xine-lib-configure.patch b/media-libs/xine-lib/files/xine-lib-configure.patch
deleted file mode 100644
index 2d4be8f65210..000000000000
--- a/media-libs/xine-lib/files/xine-lib-configure.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xine-lib-0.9.12/configure.in	Sun Jun 23 03:55:20 2002
-+++ xine-lib-0.9.12/configure.in.new	Wed Jul 31 10:37:35 2002
-@@ -723,10 +723,6 @@
- 		archopt_val=athlon ;;
- 	    esac
- 
--	    if test x"$archopt_val" != x; then
--		CFLAGS="$CFLAGS $sarchopt=$archopt_val"
--		DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=$archopt_val"
--	    fi
- 	    ]
- 	fi
- 
diff --git a/media-libs/xine-lib/files/xine-lib-disable-directfb.patch b/media-libs/xine-lib/files/xine-lib-disable-directfb.patch
deleted file mode 100644
index 5fa5e22c9f50..000000000000
--- a/media-libs/xine-lib/files/xine-lib-disable-directfb.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -Nru xine-lib-0.9.12/src/video_out/Makefile.in xine-lib-0.9.12.new/src/video_out/Makefile.in
---- xine-lib-0.9.12/src/video_out/Makefile.in	Sun Jun 23 04:51:37 2002
-+++ xine-lib-0.9.12.new/src/video_out/Makefile.in	Sun Jun 23 11:25:49 2002
-@@ -84,8 +84,6 @@
- DATADIRNAME = @DATADIRNAME@
- DEPCOMP = @DEPCOMP@
- DEPMOD = @DEPMOD@
--DIRECTFB_CFLAGS = @DIRECTFB_CFLAGS@
--DIRECTFB_LIBS = @DIRECTFB_LIBS@
- DIVX4_LIBS = @DIVX4_LIBS@
- DLLTOOL = @DLLTOOL@
- DOXYGEN = @DOXYGEN@
-@@ -206,8 +204,6 @@
- 
- @HAVE_FB_TRUE@fb_module = xineplug_vo_out_fb.la
- 
--@HAVE_DIRECTFB_TRUE@directfb_module = xineplug_vo_out_directfb.la
--
- @HAVE_SDL_TRUE@sdl_module = xineplug_vo_out_sdl.la
- 
- # important:
-@@ -215,7 +211,7 @@
- # all xine video out plugins should be named  
- # "xineplug_vo_out_*"
- 
--lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(directfb_module) $(aa_module)                   $(syncfb_module) $(fb_module) $(opengl_module) $(sdl_module) $(vidix_module)
-+lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(aa_module)                   $(syncfb_module) $(fb_module) $(opengl_module) $(sdl_module) $(vidix_module)
- 
- 
- xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c
-@@ -247,10 +243,6 @@
- xineplug_vo_out_fb_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la
- xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module
- 
--xineplug_vo_out_directfb_la_SOURCES = alphablend.c video_out_directfb.c
--xineplug_vo_out_directfb_la_LIBADD = $(DIRECTFB_LIBS)
--xineplug_vo_out_directfb_la_LDFLAGS = -avoid-version -module
--
- xineplug_vo_out_sdl_la_SOURCES = alphablend.c video_out_sdl.c
- xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS)
- xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module
-@@ -284,9 +276,6 @@
- $(top_builddir)/src/xine-utils/libxineutils.la
- xineplug_vo_out_xv_la_OBJECTS =  deinterlace.lo alphablend.lo \
- video_out_xv.lo
--xineplug_vo_out_directfb_la_DEPENDENCIES = 
--xineplug_vo_out_directfb_la_OBJECTS =  alphablend.lo \
--video_out_directfb.lo
- xineplug_vo_out_aa_la_DEPENDENCIES = 
- xineplug_vo_out_aa_la_OBJECTS =  video_out_aa.lo
- xineplug_vo_out_syncfb_la_DEPENDENCIES =  \
-@@ -317,8 +306,8 @@
- 
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(xineplug_vo_out_xshm_la_SOURCES) $(xineplug_vo_out_xv_la_SOURCES) $(xineplug_vo_out_directfb_la_SOURCES) $(xineplug_vo_out_aa_la_SOURCES) $(xineplug_vo_out_syncfb_la_SOURCES) $(xineplug_vo_out_fb_la_SOURCES) $(xineplug_vo_out_opengl_la_SOURCES) $(xineplug_vo_out_sdl_la_SOURCES) $(xineplug_vo_out_vidix_la_SOURCES)
--OBJECTS = $(xineplug_vo_out_xshm_la_OBJECTS) $(xineplug_vo_out_xv_la_OBJECTS) $(xineplug_vo_out_directfb_la_OBJECTS) $(xineplug_vo_out_aa_la_OBJECTS) $(xineplug_vo_out_syncfb_la_OBJECTS) $(xineplug_vo_out_fb_la_OBJECTS) $(xineplug_vo_out_opengl_la_OBJECTS) $(xineplug_vo_out_sdl_la_OBJECTS) $(xineplug_vo_out_vidix_la_OBJECTS)
-+SOURCES = $(xineplug_vo_out_xshm_la_SOURCES) $(xineplug_vo_out_xv_la_SOURCES) $(xineplug_vo_out_aa_la_SOURCES) $(xineplug_vo_out_syncfb_la_SOURCES) $(xineplug_vo_out_fb_la_SOURCES) $(xineplug_vo_out_opengl_la_SOURCES) $(xineplug_vo_out_sdl_la_SOURCES) $(xineplug_vo_out_vidix_la_SOURCES)
-+OBJECTS = $(xineplug_vo_out_xshm_la_OBJECTS) $(xineplug_vo_out_xv_la_OBJECTS) $(xineplug_vo_out_aa_la_OBJECTS) $(xineplug_vo_out_syncfb_la_OBJECTS) $(xineplug_vo_out_fb_la_OBJECTS) $(xineplug_vo_out_opengl_la_OBJECTS) $(xineplug_vo_out_sdl_la_OBJECTS) $(xineplug_vo_out_vidix_la_OBJECTS)
- 
- all: all-redirect
- .SUFFIXES:
-@@ -406,9 +395,6 @@
- xineplug_vo_out_xv.la: $(xineplug_vo_out_xv_la_OBJECTS) $(xineplug_vo_out_xv_la_DEPENDENCIES)
- 	$(LINK) -rpath $(libdir) $(xineplug_vo_out_xv_la_LDFLAGS) $(xineplug_vo_out_xv_la_OBJECTS) $(xineplug_vo_out_xv_la_LIBADD) $(LIBS)
- 
--xineplug_vo_out_directfb.la: $(xineplug_vo_out_directfb_la_OBJECTS) $(xineplug_vo_out_directfb_la_DEPENDENCIES)
--	$(LINK) -rpath $(libdir) $(xineplug_vo_out_directfb_la_LDFLAGS) $(xineplug_vo_out_directfb_la_OBJECTS) $(xineplug_vo_out_directfb_la_LIBADD) $(LIBS)
--
- xineplug_vo_out_aa.la: $(xineplug_vo_out_aa_la_OBJECTS) $(xineplug_vo_out_aa_la_DEPENDENCIES)
- 	$(LINK) -rpath $(libdir) $(xineplug_vo_out_aa_la_LDFLAGS) $(xineplug_vo_out_aa_la_OBJECTS) $(xineplug_vo_out_aa_la_LIBADD) $(LIBS)
- 
diff --git a/media-libs/xine-lib/files/xine-lib-gcc34.patch b/media-libs/xine-lib/files/xine-lib-gcc34.patch
deleted file mode 100644
index 29103c40a080..000000000000
--- a/media-libs/xine-lib/files/xine-lib-gcc34.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/libffmpeg/libavcodec/mpegvideo.h.old	2004-04-27 15:11:22.072712048 -0400
-+++ src/libffmpeg/libavcodec/mpegvideo.h	2004-04-27 15:11:45.477154032 -0400
-@@ -892,7 +892,7 @@
- int ff_h263_resync(MpegEncContext *s);
- int ff_h263_get_gob_height(MpegEncContext *s);
- int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my);
--inline int ff_h263_round_chroma(int x);
-+int ff_h263_round_chroma(int x);
- 
- 
- /* rv10.c */
diff --git a/media-libs/xine-lib/files/xineconfig.patch-0.9.13 b/media-libs/xine-lib/files/xineconfig.patch-0.9.13
deleted file mode 100644
index d8b99700bebc..000000000000
--- a/media-libs/xine-lib/files/xineconfig.patch-0.9.13
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Jun 20 16:54:36 2002
-+++ configure	Thu Jun 20 16:55:03 2002
-@@ -13350,7 +13350,7 @@
- 
- 
- 
--INCLUDES='-I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/xine-engine -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-utils -I$(top_builddir)/src/xine-utils $(INTLDIR)'
-+INCLUDES='-I/usr/include/directfb -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/src/xine-engine -I$(top_builddir)/src/xine-engine -I$(top_srcdir)/src/xine-utils -I$(top_builddir)/src/xine-utils $(INTLDIR)'
- 
- 
-