change directfb disable method

2 files changed, 75 insertions, 9 deletions

diff --git a/media-libs/xine-lib/files/xine-lib-disable-direcfb.patch b/media-libs/xine-lib/files/xine-lib-disable-direcfb.patch
new file mode 100644
index 000000000000..5fa5e22c9f50
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-disable-direcfb.patch
@@ -0,0 +1,72 @@
+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/xine-lib-0.9.12.ebuild b/media-libs/xine-lib/xine-lib-0.9.12.ebuild
index 2b22616f5de0..fe6059bf88d9 100644
--- a/media-libs/xine-lib/xine-lib-0.9.12.ebuild
+++ b/media-libs/xine-lib/xine-lib-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2 
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.12.ebuild,v 1.1 2002/06/23 15:49:00 lostlogic Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-0.9.12.ebuild,v 1.2 2002/06/23 16:30:45 lostlogic Exp $ 
 
 DESCRIPTION="Xine is a free gpl-licensed video player for unix-like systems"
 HOMEPAGE="http://xine.sourceforge.net/"
@@ -30,15 +30,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	use directfb &&  ( \
-		# Patch for framebuffer support.
+	use directfb && ( \
 		patch -p0 < ${FILESDIR}/xineconfig.patch-${PV} || die
-	) || ( \
-		for file in `find . -iname "Makefile.*"`; do 
-			grep -i -v "directfb" ${file} > ${file}.hacked
-			mv ${file}.hacked ${file}
-		done 
-	)
+	) || patch -p1 < ${FILESDIR}/xine-lib-disable-directfb.patch || die
 }
 
 src_compile() {