[patch] libsdl-1.2.11-no-bundled-X.patch

libsdl-1.2.11-no-bundled-X.patch (text/plain), 6.08 KB, created by Stefan Schweizer (RETIRED) on 2006-07-05 03:14:55 UTC

diff -ur SDL-1.2.11.orig/configure.in SDL-1.2.11/configure.in
--- SDL-1.2.11.orig/configure.in	2006-07-05 10:46:47.000000000 +0200
+++ SDL-1.2.11/configure.in	2006-07-05 10:56:58.000000000 +0200
@@ -914,9 +914,9 @@
             AC_ARG_ENABLE(dga,
 AC_HELP_STRING([--enable-dga], [allow use of X11 DGA code [[default=yes]]]),
                           , enable_dga=yes)
-            if test x$enable_dga = xyes; then
-                SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86dga/*.c"
-            fi
+	    if test x$enable_dga = xyes; then
+	    	EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXxf86dga"
+	    fi
             AC_ARG_ENABLE(video-dga,
 AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]),
                   , enable_video_dga=yes)
@@ -935,21 +935,21 @@
                           , enable_video_x11_vm=yes)
             if test x$enable_video_x11_vm = xyes; then
                 AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE)
-                SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c"
+		EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXxf86vm"
             fi
             AC_ARG_ENABLE(video-x11-xv,
 AC_HELP_STRING([--enable-video-x11-xv], [use X11 XvImage extension for video [[default=yes]]]),
                           , enable_video_x11_xv=yes)
             if test x$enable_video_x11_xv = xyes; then
                 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XV)
-                SOURCES="$SOURCES $srcdir/src/video/Xext/Xv/*.c"
+		EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXv"
             fi
             AC_ARG_ENABLE(video-x11-xinerama,
 AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]),
                             , enable_video_x11_xinerama=yes)
             if test x$enable_video_x11_xinerama = xyes; then
                 AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA)
-                SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c"
+		EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lXinerama"
             fi
             AC_ARG_ENABLE(video-x11-xme,
 AC_HELP_STRING([--enable-video-x11-xme], [enable Xi Graphics XME for fullscreen [[default=yes]]]),
diff -ur SDL-1.2.11.orig/src/video/dga/SDL_dgaevents.c SDL-1.2.11/src/video/dga/SDL_dgaevents.c
--- SDL-1.2.11.orig/src/video/dga/SDL_dgaevents.c	2006-07-05 10:46:47.000000000 +0200
+++ SDL-1.2.11/src/video/dga/SDL_dgaevents.c	2006-07-05 10:44:46.000000000 +0200
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include <X11/Xlib.h>
-#include "../Xext/extensions/xf86dga.h"
+#include <X11/extensions/xf86dga.h>
 
 #include "../SDL_sysvideo.h"
 #include "../../events/SDL_events_c.h"
@@ -34,6 +34,7 @@
 
 /* get function pointers... */
 #include "../x11/SDL_x11dyn.h"
+#define SDL_NAME(X) X
 
 /* Heheh we're using X11 event code */
 extern int X11_Pending(Display *display);
diff -ur SDL-1.2.11.orig/src/video/dga/SDL_dgavideo.c SDL-1.2.11/src/video/dga/SDL_dgavideo.c
--- SDL-1.2.11.orig/src/video/dga/SDL_dgavideo.c	2006-07-05 10:46:47.000000000 +0200
+++ SDL-1.2.11/src/video/dga/SDL_dgavideo.c	2006-07-05 10:44:46.000000000 +0200
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 #include <X11/Xlib.h>
-#include "../Xext/extensions/xf86dga.h"
+#include <X11/extensions/xf86dga.h>
 
 #include "SDL_video.h"
 #include "SDL_mouse.h"
@@ -37,6 +37,7 @@
 #include "SDL_dgavideo.h"
 #include "SDL_dgamouse_c.h"
 #include "SDL_dgaevents_c.h"
+#define SDL_NAME(X) X
 
 /* get function pointers... */
 #include "../x11/SDL_x11dyn.h"
diff -ur SDL-1.2.11.orig/src/video/x11/SDL_x11dyn.h SDL-1.2.11/src/video/x11/SDL_x11dyn.h
--- SDL-1.2.11.orig/src/video/x11/SDL_x11dyn.h	2006-07-05 10:46:47.000000000 +0200
+++ SDL-1.2.11/src/video/x11/SDL_x11dyn.h	2006-07-05 10:44:46.000000000 +0200
@@ -30,8 +30,8 @@
 #include <X11/Xlibint.h>
 #include <X11/Xproto.h>
 
-#include "../Xext/extensions/Xext.h"
-#include "../Xext/extensions/extutil.h"
+#include <X11/extensions/Xext.h>
+#include <X11/extensions/extutil.h>
 
 #ifndef NO_SHARED_MEMORY
 #include <sys/ipc.h>
diff -ur SDL-1.2.11.orig/src/video/x11/SDL_x11sym.h SDL-1.2.11/src/video/x11/SDL_x11sym.h
--- SDL-1.2.11.orig/src/video/x11/SDL_x11sym.h	2006-07-05 10:46:47.000000000 +0200
+++ SDL-1.2.11/src/video/x11/SDL_x11sym.h	2006-07-05 10:44:46.000000000 +0200
@@ -127,7 +127,6 @@
 SDL_X11_SYM(SDL_X11_XSynchronizeRetType,XSynchronize,(Display* a,Bool b),(a,b),return)
 SDL_X11_SYM(SDL_X11_XESetWireToEventRetType,XESetWireToEvent,(Display* a,int b,SDL_X11_XESetWireToEventRetType c),(a,b,c),return)
 SDL_X11_SYM(SDL_X11_XESetEventToWireRetType,XESetEventToWire,(Display* a,int b,SDL_X11_XESetEventToWireRetType c),(a,b,c),return)
-SDL_X11_SYM(XExtensionErrorHandler,XSetExtensionErrorHandler,(XExtensionErrorHandler a),(a),return)
 
 #if NeedWidePrototypes
 SDL_X11_SYM(KeySym,XKeycodeToKeysym,(Display* a,unsigned int b,int c),(a,b,c),return)
diff -ur SDL-1.2.11.orig/src/video/x11/SDL_x11video.h SDL-1.2.11/src/video/x11/SDL_x11video.h
--- SDL-1.2.11.orig/src/video/x11/SDL_x11video.h	2006-07-05 10:46:47.000000000 +0200
+++ SDL-1.2.11/src/video/x11/SDL_x11video.h	2006-07-05 10:55:01.000000000 +0200
@@ -32,16 +32,16 @@
 #include "../SDL_sysvideo.h"
 
 #if SDL_VIDEO_DRIVER_X11_DGAMOUSE
-#include "../Xext/extensions/xf86dga.h"
+#include <X11/extensions/xf86dga.h>
 #endif
 #if SDL_VIDEO_DRIVER_X11_XINERAMA
-#include "../Xext/extensions/Xinerama.h"
+#include <X11/extensions/Xinerama.h>
 #endif 
 #if SDL_VIDEO_DRIVER_X11_XRANDR
 #include <X11/extensions/Xrandr.h>
 #endif
 #if SDL_VIDEO_DRIVER_X11_VIDMODE
-#include "../Xext/extensions/xf86vmode.h"
+#include <X11/extensions/xf86vmode.h>
 #endif
 #if SDL_VIDEO_DRIVER_X11_XME
 #include "../Xext/extensions/xme.h"
@@ -52,6 +52,8 @@
 
 #include "SDL_x11dyn.h"
 
+#define SDL_NAME(X) X
+
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_VideoDevice *this
 
diff -ur SDL-1.2.11.orig/src/video/x11/SDL_x11yuv.c SDL-1.2.11/src/video/x11/SDL_x11yuv.c
--- SDL-1.2.11.orig/src/video/x11/SDL_x11yuv.c	2006-07-05 10:46:47.000000000 +0200
+++ SDL-1.2.11/src/video/x11/SDL_x11yuv.c	2006-07-05 10:44:46.000000000 +0200
@@ -31,7 +31,7 @@
 #include <sys/shm.h>
 #include <X11/extensions/XShm.h>
 #endif
-#include "../Xext/extensions/Xvlib.h"
+#include <X11/extensions/Xvlib.h>
 
 #include "SDL_x11yuv_c.h"
 #include "../SDL_yuvfuncs.h"