Commit 4f3f23a5 authored by Vicente Olivert Riera's avatar Vicente Olivert Riera Committed by Peter Korsgaard
Browse files

sdl: Fix compilation with libX11 >= 1.5.99.902 

Applying an upstream patch to fix a compilation error with versions of
libX11 since 1.5.99.902. This patch modifies configure.in so we need to
run autogen.sh to make it working correctly. Running autoreconf will
fail because SDL uses bit tricky automake/autoconf configuration.

Upstream patch URL:
   http://hg.libsdl.org/SDL/rev/91ad7b43317a

Fixes:
   http://autobuild.buildroot.net/results/bf8/bf83466a7bbb0635d97fe279a18778d92f20bea2/



[Peter: add comment why we're doing this, add needed dependencies]
Signed-off-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent bb79b964

package/sdl/sdl-0002-fix-compilation-with-libx11.patch

0 → 100644
+60 −0
Original line number Diff line number Diff line 
sdl: Fix compilation with libX11 >= 1.5.99.902

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>



# HG changeset patch

# User Azamat H. Hackimov <azamat.hackimov@gmail.com>

# Date 1370184533 -21600

# Node ID 91ad7b43317a6387e115ecdf63a49137f47e42c8

# Parent  f7fd5c3951b9ed922fdf696f7182e71b58a13268

Fix compilation with libX11 >= 1.5.99.902.



These changes fixes bug #1769 for SDL 1.2

(http://bugzilla.libsdl.org/show_bug.cgi?id=1769).



diff -r f7fd5c3951b9 -r 91ad7b43317a configure.in

--- a/configure.in	Wed Apr 17 00:56:53 2013 -0700

+++ b/configure.in	Sun Jun 02 20:48:53 2013 +0600

@@ -1169,6 +1169,17 @@

             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 -r f7fd5c3951b9 -r 91ad7b43317a include/SDL_config.h.in

--- a/include/SDL_config.h.in	Wed Apr 17 00:56:53 2013 -0700

+++ b/include/SDL_config.h.in	Sun Jun 02 20:48:53 2013 +0600

@@ -283,6 +283,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 -r f7fd5c3951b9 -r 91ad7b43317a src/video/x11/SDL_x11sym.h

--- a/src/video/x11/SDL_x11sym.h	Wed Apr 17 00:56:53 2013 -0700

+++ b/src/video/x11/SDL_x11sym.h	Sun Jun 02 20:48:53 2013 +0600

@@ -165,7 +165,11 @@

  */

 #ifdef LONG64

 SDL_X11_MODULE(IO_32BIT)

+#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

package/sdl/sdl.mk

+10 −0
Original line number Diff line number Diff line
@@ -11,6 +11,16 @@ SDL_LICENSE = LGPLv2.1+ 
SDL_LICENSE_FILES = COPYING

SDL_INSTALL_STAGING = YES



# we're patching configure.in, but package cannot autoreconf with our version of

# autotools, so we have to do it manually instead of setting SD_AUTORECONF = YES

define SDL_RUN_AUTOGEN

	cd $(@D) && ./autogen.sh

endef



SDL_POST_PATCH_HOOKS += SDL_RUN_AUTOGEN

SDL_DEPENDENCIES += host-automake host-autoconf host-libtool





ifeq ($(BR2_PACKAGE_SDL_FBCON),y)

SDL_CONF_OPT += --enable-video-fbcon=yes

else