Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/games
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29587
Modified Files:
sdl.info sdl.patch
Log Message:
Yet another attempt to make SDL compile for everybody
Index: sdl.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/games/sdl.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sdl.patch 22 Jul 2013 12:19:11 -0000 1.4
+++ sdl.patch 23 Jul 2013 18:40:55 -0000 1.5
@@ -1,5 +1,108 @@
---- a/src/video/quartz/SDL_QuartzVideo.h.orig 2013-02-02 17:53:45.000000000
-0800
-+++ a/src/video/quartz/SDL_QuartzVideo.h 2013-02-02 17:54:15.000000000
-0800
+diff --git a/configure b/configure
+index 4363500..82619e2 100755
+--- a/configure
++++ b/configure
+@@ -24440,6 +24440,62 @@ fi
+ _ACEOF
+
+ fi
++ { echo "$as_me:$LINENO: checking for const parameter to _XData32"
>&5
++echo $ECHO_N "checking for const parameter to _XData32... $ECHO_C" >&6; }
++ have_const_param_xdata32=no
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++ #include <X11/Xlibint.h>
++ extern int _XData32(Display *dpy,register _Xconst long
*data,unsigned len);
++
++int
++main ()
++{
++
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_compile") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++
++ have_const_param_xdata32=yes
++ cat >>confdefs.h <<\_ACEOF
++#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1
++_ACEOF
++
++
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ { echo "$as_me:$LINENO: result: $have_const_param_xdata32" >&5
++echo "${ECHO_T}$have_const_param_xdata32" >&6; }
+ fi
+ fi
+ }
+diff --git a/configure.in b/configure.in
+index 08c8e1e..89c526d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -1127,6 +1127,17 @@ AC_HELP_STRING([--enable-video-x11-xrandr], [enable X11
Xrandr extension for ful
+ if test x$definitely_enable_video_x11_xrandr = xyes; then
+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
+ fi
++ AC_MSG_CHECKING(for const parameter to _XData32)
++ have_const_param_xdata32=no
++ AC_TRY_COMPILE([
++ #include <X11/Xlibint.h>
++ extern int _XData32(Display *dpy,register _Xconst long
*data,unsigned len);
++ ],[
++ ],[
++ have_const_param_xdata32=yes
++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
++ ])
++ AC_MSG_RESULT($have_const_param_xdata32)
+ fi
+ fi
+ }
+diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
+index 8bb1773..78ca747 100644
+--- a/include/SDL_config.h.in
++++ b/include/SDL_config.h.in
+@@ -282,6 +282,7 @@
+ #undef SDL_VIDEO_DRIVER_WINDIB
+ #undef SDL_VIDEO_DRIVER_WSCONS
+ #undef SDL_VIDEO_DRIVER_X11
++#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
+ #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
+ #undef SDL_VIDEO_DRIVER_X11_DYNAMIC
+ #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
+diff --git a/src/video/quartz/SDL_QuartzVideo.h
b/src/video/quartz/SDL_QuartzVideo.h
+index 7506e0c..425896f 100644
+--- a/src/video/quartz/SDL_QuartzVideo.h
++++ b/src/video/quartz/SDL_QuartzVideo.h
@@ -91,7 +91,9 @@ typedef struct SDL_PrivateVideoData {
CGDirectDisplayID display; /* 0 == main display (only support
single display) */
const void *mode; /* current mode of the display */
@@ -10,14 +113,19 @@
NSOpenGLContext *gl_context; /* OpenGL rendering context */
NSGraphicsContext *nsgfx_context; /* Cocoa graphics context */
Uint32 width, height, bpp; /* frequently used data about the
display */
---- a/src/video/x11/SDL_x11sym.h.orig 2013-06-22 20:48:48.000000000 -0400
-+++ a/src/video/x11/SDL_x11sym.h 2013-06-22 20:51:18.000000000 -0400
-@@ -165,7 +165,7 @@
+diff --git a/src/video/x11/SDL_x11sym.h b/src/video/x11/SDL_x11sym.h
+index 4875b98..bd83f7f 100644
+--- a/src/video/x11/SDL_x11sym.h
++++ b/src/video/x11/SDL_x11sym.h
+@@ -165,7 +165,11 @@ SDL_X11_SYM(Bool,XShmQueryExtension,(Display*
a),(a),return)
*/
#ifdef LONG64
SDL_X11_MODULE(IO_32BIT)
--SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned
len),(dpy,data,len),return)
-+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned
len),(dpy,data,len),return)
++#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned
len),(dpy,data,len),return)
++#else
+ SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned
len),(dpy,data,len),return)
++#endif
SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long
len),(dpy,data,len),)
#endif
Index: sdl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/games/sdl.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sdl.info 23 Jul 2013 14:47:08 -0000 1.7
+++ sdl.info 23 Jul 2013 18:40:55 -0000 1.8
@@ -19,19 +19,12 @@
Revision: 2
BuildDependsOnly: True
Depends: %N-shlibs (= %v-%r)
-BuildDepends: pkgconfig, x11-dev, fink (>= 0.24.12)
+BuildDepends: x11-dev, fink (>= 0.24.12)
Maintainer: Max Horn <m...@quendi.de>
Source: http://www.libsdl.org/release/SDL-%v.tar.gz
Source-MD5: 9d96df8417572a2afb781a7c4c811a85
PatchFile: %n.patch
-PatchFile-MD5: 75d392042cf351161585fa4a674fe795
-PatchScript: <<
- #!/bin/bash -ev
-x11vers=`%p/bin/pkg-config --modversion x11 | cut -d. -f1-2`
-if [[ $x11vers > 1.5 ]]; then
- %{default_script}
-fi
-<<
+PatchFile-MD5: 7e736602b44b4240e7a52d93ea19f3fb
ConfigureParams: --mandir=%p/share/man
CompileScript: ./configure %c; DISTCC_HOSTS='' MAKEFLAGS='-j1' make
InstallScript: make install DESTDIR=%d
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
