- updated for 1-rc8

Changed files:
    xine-lib-syncfb.patch -> 1.2

diff --git a/xine-lib-syncfb.patch b/xine-lib-syncfb.patch
index f93d34ac764e3a28b6f3e1ee84ed1cba0eef97f1..6944c46dc60c9ba5dd7355f50f0129563ee355aa 100644 (file)
--- a/xine-lib-syncfb.patch
+++ b/xine-lib-syncfb.patch
@@ -1,7 +1,7 @@
---- xine-lib-1-rc3c/configure.ac.orig  2004-04-11 16:38:07.000000000 +0200
-+++ xine-lib-1-rc3c/configure.ac       2004-04-11 18:33:05.103846840 +0200
-@@ -407,21 +407,6 @@
- AM_CONDITIONAL(HAVE_OPENGL, [ test x$ac_have_opengl = "xyes" -a x$ac_have_glut="xyes" -o x$ac_have_opengl = "xyes" -a x$ac_have_glu="xyes" ] )
+--- xine-lib-1-rc8/configure.ac.orig   2004-12-14 23:06:47.000000000 +0100
++++ xine-lib-1-rc8/configure.ac        2004-12-21 21:03:55.484299736 +0100
+@@ -460,21 +460,6 @@
+ AM_PATH_OPENGL()
  
  
 -dnl ---------------------------------------------
@@ -22,10 +22,10 @@
  dnl ----------------------------------------------
  dnl Check for usable video-for-linux (v4l) support
  dnl ----------------------------------------------
-@@ -494,6 +479,21 @@
+@@ -555,6 +540,21 @@
+ esac
  AM_CONDITIONAL(PPC_ARCH, test x$ppc_arch = "xyes")
  
- 
 +dnl ---------------------------------------------
 +dnl Check for platform which supports syncfb
 +dnl ---------------------------------------------
@@ -41,6 +41,33 @@
 +AM_CONDITIONAL(HAVE_SYNCFB, test x"$have_syncfb" = "xyes")
 +
 +
- AC_ARG_WITH(xv-path, AC_HELP_STRING([--with-xv-path=path], [where libXv is installed]),
-             xv_path="$withval", xv_path="/usr/X11R6/$XINE_LIBNAME")
+ dnl
+ dnl Check if we can enable the xxmc plugin.
+ dnl
+@@ -2451,7 +2451,7 @@
+ if test x"$no_x" != "xyes"; then
+   echo "   - XShm (X11 shared memory)"
+   dnl synfb
+-  if test x$ac_have_syncfb = "xyes"; then
++  if test x$have_syncfb = "xyes"; then
+     echo "   - SyncFB (for Matrox G200/G400 cards)"
+   fi
+   dnl Xv
+--- xine-lib-1-rc8/src/video_out/video_out_syncfb.c.orig       2004-12-12 23:01:28.000000000 +0100
++++ xine-lib-1-rc8/src/video_out/video_out_syncfb.c    2004-12-21 21:18:33.031892224 +0100
+@@ -46,6 +46,7 @@
+ #include <sys/mman.h>
+ #include <math.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+@@ -566,6 +567,7 @@
  
+ static void syncfb_overlay_blend(vo_driver_t* this_gen, vo_frame_t* frame_gen, vo_overlay_t* overlay)
+ {
++  syncfb_driver_t* this  = (syncfb_driver_t *) this_gen;
+   syncfb_frame_t* frame = (syncfb_frame_t *) frame_gen;
+    
+   /* alpha blend here */