* [Buildroot] [PATCH 1/2] sdl: rename patches to add sequence numbers
@ 2014-01-09 11:57 Vicente Olivert Riera
2014-01-09 11:57 ` [Buildroot] [PATCH 2/2] sdl: Fix compilation with libX11 >= 1.5.99.902 Vicente Olivert Riera
2014-01-09 12:08 ` [Buildroot] [PATCH 1/2] sdl: rename patches to add sequence numbers Baruch Siach
0 siblings, 2 replies; 9+ messages in thread
From: Vicente Olivert Riera @ 2014-01-09 11:57 UTC (permalink / raw)
To: buildroot
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
.../sdl/sdl-0001-use-correct-directfb-config.patch | 40 ++++++++++++++++++++
package/sdl/sdl-use-correct-directfb-config.patch | 40 --------------------
2 files changed, 40 insertions(+), 40 deletions(-)
create mode 100644 package/sdl/sdl-0001-use-correct-directfb-config.patch
delete mode 100644 package/sdl/sdl-use-correct-directfb-config.patch
diff --git a/package/sdl/sdl-0001-use-correct-directfb-config.patch b/package/sdl/sdl-0001-use-correct-directfb-config.patch
new file mode 100644
index 0000000..2250790
--- /dev/null
+++ b/package/sdl/sdl-0001-use-correct-directfb-config.patch
@@ -0,0 +1,40 @@
+[PATCH] configure.in: use correct directfb-config in version check
+
+The configure script has just checked for the correct directfb-config
+script, so also use it for the version check instead of whatever
+might be in the path.
+
+Also patch the generated configure, as it doesn't cleanly autoreconf.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ configure | 2 +-
+ configure.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: SDL-1.2.15/configure.in
+===================================================================
+--- SDL-1.2.15.orig/configure.in
++++ SDL-1.2.15/configure.in
+@@ -1276,7 +1276,7 @@
+ else
+ set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'`
+ NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
+- set -- `directfb-config --version | sed 's/\./ /g'`
++ set -- `$DIRECTFBCONFIG --version | sed 's/\./ /g'`
+ HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
+ if test $HAVE_VERSION -ge $NEED_VERSION; then
+ DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags`
+Index: SDL-1.2.15/configure
+===================================================================
+--- SDL-1.2.15.orig/configure
++++ SDL-1.2.15/configure
+@@ -24958,7 +24958,7 @@
+ else
+ set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'`
+ NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
+- set -- `directfb-config --version | sed 's/\./ /g'`
++ set -- `$DIRECTFBCONFIG --version | sed 's/\./ /g'`
+ HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
+ if test $HAVE_VERSION -ge $NEED_VERSION; then
+ DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags`
diff --git a/package/sdl/sdl-use-correct-directfb-config.patch b/package/sdl/sdl-use-correct-directfb-config.patch
deleted file mode 100644
index 2250790..0000000
--- a/package/sdl/sdl-use-correct-directfb-config.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-[PATCH] configure.in: use correct directfb-config in version check
-
-The configure script has just checked for the correct directfb-config
-script, so also use it for the version check instead of whatever
-might be in the path.
-
-Also patch the generated configure, as it doesn't cleanly autoreconf.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- configure | 2 +-
- configure.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: SDL-1.2.15/configure.in
-===================================================================
---- SDL-1.2.15.orig/configure.in
-+++ SDL-1.2.15/configure.in
-@@ -1276,7 +1276,7 @@
- else
- set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'`
- NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
-- set -- `directfb-config --version | sed 's/\./ /g'`
-+ set -- `$DIRECTFBCONFIG --version | sed 's/\./ /g'`
- HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
- if test $HAVE_VERSION -ge $NEED_VERSION; then
- DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags`
-Index: SDL-1.2.15/configure
-===================================================================
---- SDL-1.2.15.orig/configure
-+++ SDL-1.2.15/configure
-@@ -24958,7 +24958,7 @@
- else
- set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'`
- NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
-- set -- `directfb-config --version | sed 's/\./ /g'`
-+ set -- `$DIRECTFBCONFIG --version | sed 's/\./ /g'`
- HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3`
- if test $HAVE_VERSION -ge $NEED_VERSION; then
- DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags`
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] sdl: Fix compilation with libX11 >= 1.5.99.902
2014-01-09 11:57 [Buildroot] [PATCH 1/2] sdl: rename patches to add sequence numbers Vicente Olivert Riera
@ 2014-01-09 11:57 ` Vicente Olivert Riera
2014-01-09 12:40 ` Peter Korsgaard
2014-01-09 12:08 ` [Buildroot] [PATCH 1/2] sdl: rename patches to add sequence numbers Baruch Siach
1 sibling, 1 reply; 9+ messages in thread
From: Vicente Olivert Riera @ 2014-01-09 11:57 UTC (permalink / raw)
To: buildroot
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/
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
.../sdl/sdl-0002-fix-compilation-with-libx11.patch | 60 ++++++++++++++++++++
package/sdl/sdl.mk | 6 ++
2 files changed, 66 insertions(+), 0 deletions(-)
create mode 100644 package/sdl/sdl-0002-fix-compilation-with-libx11.patch
diff --git a/package/sdl/sdl-0002-fix-compilation-with-libx11.patch b/package/sdl/sdl-0002-fix-compilation-with-libx11.patch
new file mode 100644
index 0000000..27f2448
--- /dev/null
+++ b/package/sdl/sdl-0002-fix-compilation-with-libx11.patch
@@ -0,0 +1,60 @@
+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
+
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index ef723dd..0032b97 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -67,6 +67,12 @@ define SDL_FIXUP_SDL_CONFIG
$(STAGING_DIR)/usr/bin/sdl-config
endef
+define SDL_RUN_AUTOGEN
+ cd $(@D) && ./autogen.sh
+endef
+
+SDL_POST_PATCH_HOOKS += SDL_RUN_AUTOGEN
+
SDL_POST_INSTALL_STAGING_HOOKS += SDL_FIXUP_SDL_CONFIG
$(eval $(autotools-package))
--
1.7.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] sdl: rename patches to add sequence numbers
2014-01-09 11:57 [Buildroot] [PATCH 1/2] sdl: rename patches to add sequence numbers Vicente Olivert Riera
2014-01-09 11:57 ` [Buildroot] [PATCH 2/2] sdl: Fix compilation with libX11 >= 1.5.99.902 Vicente Olivert Riera
@ 2014-01-09 12:08 ` Baruch Siach
2014-01-09 12:09 ` Vicente Olivert Riera
1 sibling, 1 reply; 9+ messages in thread
From: Baruch Siach @ 2014-01-09 12:08 UTC (permalink / raw)
To: buildroot
Hi Vicente,
On Thu, Jan 09, 2014 at 11:57:32AM +0000, Vicente Olivert Riera wrote:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> .../sdl/sdl-0001-use-correct-directfb-config.patch | 40 ++++++++++++++++++++
> package/sdl/sdl-use-correct-directfb-config.patch | 40 --------------------
> 2 files changed, 40 insertions(+), 40 deletions(-)
> create mode 100644 package/sdl/sdl-0001-use-correct-directfb-config.patch
> delete mode 100644 package/sdl/sdl-use-correct-directfb-config.patch
When generating rename patches like this one please add -M to your 'git
format-patch' or 'git send-email' commands. This makes reviewing easier.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 1/2] sdl: rename patches to add sequence numbers
2014-01-09 12:08 ` [Buildroot] [PATCH 1/2] sdl: rename patches to add sequence numbers Baruch Siach
@ 2014-01-09 12:09 ` Vicente Olivert Riera
0 siblings, 0 replies; 9+ messages in thread
From: Vicente Olivert Riera @ 2014-01-09 12:09 UTC (permalink / raw)
To: buildroot
On 01/09/2014 12:08 PM, Baruch Siach wrote:
> Hi Vicente,
>
> On Thu, Jan 09, 2014 at 11:57:32AM +0000, Vicente Olivert Riera wrote:
>> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
>> ---
>> .../sdl/sdl-0001-use-correct-directfb-config.patch | 40 ++++++++++++++++++++
>> package/sdl/sdl-use-correct-directfb-config.patch | 40 --------------------
>> 2 files changed, 40 insertions(+), 40 deletions(-)
>> create mode 100644 package/sdl/sdl-0001-use-correct-directfb-config.patch
>> delete mode 100644 package/sdl/sdl-use-correct-directfb-config.patch
>
> When generating rename patches like this one please add -M to your 'git
> format-patch' or 'git send-email' commands. This makes reviewing easier.
>
> baruch
>
Oh, ok. I didn't know that, sorry.
--
Vincent
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] sdl: Fix compilation with libX11 >= 1.5.99.902
2014-01-09 11:57 ` [Buildroot] [PATCH 2/2] sdl: Fix compilation with libX11 >= 1.5.99.902 Vicente Olivert Riera
@ 2014-01-09 12:40 ` Peter Korsgaard
2014-01-09 13:09 ` Vicente Olivert Riera
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2014-01-09 12:40 UTC (permalink / raw)
To: buildroot
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
> 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/
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> ---
> .../sdl/sdl-0002-fix-compilation-with-libx11.patch | 60 ++++++++++++++++++++
> package/sdl/sdl.mk | 6 ++
> 2 files changed, 66 insertions(+), 0 deletions(-)
> create mode 100644 package/sdl/sdl-0002-fix-compilation-with-libx11.patch
> diff --git a/package/sdl/sdl-0002-fix-compilation-with-libx11.patch b/package/sdl/sdl-0002-fix-compilation-with-libx11.patch
> new file mode 100644
> index 0000000..27f2448
> --- /dev/null
> +++ b/package/sdl/sdl-0002-fix-compilation-with-libx11.patch
> @@ -0,0 +1,60 @@
> +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
> +
> diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
> index ef723dd..0032b97 100644
> --- a/package/sdl/sdl.mk
> +++ b/package/sdl/sdl.mk
> @@ -67,6 +67,12 @@ define SDL_FIXUP_SDL_CONFIG
> $(STAGING_DIR)/usr/bin/sdl-config
> endef
> +define SDL_RUN_AUTOGEN
> + cd $(@D) && ./autogen.sh
> +endef
Hmm, this ends up relying on the use having compatible auto* tools
installed on the build machine. Are you sure we cannot use our
pkg_AUTORECONF = YES handling? Alternatively, it should depend on
host-automake host-autoconf host-libtool so we build our own versions of
the tools, similar to how AUTORECONF does.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] sdl: Fix compilation with libX11 >= 1.5.99.902
2014-01-09 12:40 ` Peter Korsgaard
@ 2014-01-09 13:09 ` Vicente Olivert Riera
2014-01-09 13:24 ` Peter Korsgaard
0 siblings, 1 reply; 9+ messages in thread
From: Vicente Olivert Riera @ 2014-01-09 13:09 UTC (permalink / raw)
To: buildroot
On 01/09/2014 12:40 PM, Peter Korsgaard wrote:
>>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
>
> > 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/
>
> > Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> > ---
> > .../sdl/sdl-0002-fix-compilation-with-libx11.patch | 60 ++++++++++++++++++++
> > package/sdl/sdl.mk | 6 ++
> > 2 files changed, 66 insertions(+), 0 deletions(-)
> > create mode 100644 package/sdl/sdl-0002-fix-compilation-with-libx11.patch
>
> > diff --git a/package/sdl/sdl-0002-fix-compilation-with-libx11.patch b/package/sdl/sdl-0002-fix-compilation-with-libx11.patch
> > new file mode 100644
> > index 0000000..27f2448
> > --- /dev/null
> > +++ b/package/sdl/sdl-0002-fix-compilation-with-libx11.patch
> > @@ -0,0 +1,60 @@
> > +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
> > +
> > diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
> > index ef723dd..0032b97 100644
> > --- a/package/sdl/sdl.mk
> > +++ b/package/sdl/sdl.mk
> > @@ -67,6 +67,12 @@ define SDL_FIXUP_SDL_CONFIG
> > $(STAGING_DIR)/usr/bin/sdl-config
> > endef
>
> > +define SDL_RUN_AUTOGEN
> > + cd $(@D) && ./autogen.sh
> > +endef
>
> Hmm, this ends up relying on the use having compatible auto* tools
> installed on the build machine. Are you sure we cannot use our
> pkg_AUTORECONF = YES handling?
I tried it but I can't get it working properly. Maybe you could try it.
> Alternatively, it should depend on
> host-automake host-autoconf host-libtool so we build our own versions of
> the tools, similar to how AUTORECONF does.
So, what do you want I do, sending an updated patch adding those
dependencies, or do you prefer to try to use the pkg_AUTORECONF = YES way?
--
Vincent
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] sdl: Fix compilation with libX11 >= 1.5.99.902
2014-01-09 13:09 ` Vicente Olivert Riera
@ 2014-01-09 13:24 ` Peter Korsgaard
2014-01-09 15:24 ` Peter Korsgaard
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2014-01-09 13:24 UTC (permalink / raw)
To: buildroot
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
>> Hmm, this ends up relying on the use having compatible auto* tools
>> installed on the build machine. Are you sure we cannot use our
>> pkg_AUTORECONF = YES handling?
> I tried it but I can't get it working properly. Maybe you could try it.
ok, I'll take a look.
>> Alternatively, it should depend on
>> host-automake host-autoconf host-libtool so we build our own versions of
>> the tools, similar to how AUTORECONF does.
> So, what do you want I do, sending an updated patch adding those
> dependencies, or do you prefer to try to use the pkg_AUTORECONF = YES
> way?
I'll handle it. Thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] sdl: Fix compilation with libX11 >= 1.5.99.902
2014-01-09 13:24 ` Peter Korsgaard
@ 2014-01-09 15:24 ` Peter Korsgaard
2014-01-09 15:28 ` Vicente Olivert Riera
0 siblings, 1 reply; 9+ messages in thread
From: Peter Korsgaard @ 2014-01-09 15:24 UTC (permalink / raw)
To: buildroot
>>>>> "Peter" == Peter Korsgaard <jacmet@uclibc.org> writes:
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
>>> Hmm, this ends up relying on the use having compatible auto* tools
>>> installed on the build machine. Are you sure we cannot use our
>>> pkg_AUTORECONF = YES handling?
>> I tried it but I can't get it working properly. Maybe you could try it.
> ok, I'll take a look.
autoheader indeed errors out (without any error message :/), so I kept
it like this (with a description why and the needed host-* dependencies
added).
Committed series with those changes, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Buildroot] [PATCH 2/2] sdl: Fix compilation with libX11 >= 1.5.99.902
2014-01-09 15:24 ` Peter Korsgaard
@ 2014-01-09 15:28 ` Vicente Olivert Riera
0 siblings, 0 replies; 9+ messages in thread
From: Vicente Olivert Riera @ 2014-01-09 15:28 UTC (permalink / raw)
To: buildroot
On 01/09/2014 03:24 PM, Peter Korsgaard wrote:
>>>>>> "Peter" == Peter Korsgaard <jacmet@uclibc.org> writes:
>
>>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
> >>> Hmm, this ends up relying on the use having compatible auto* tools
> >>> installed on the build machine. Are you sure we cannot use our
> >>> pkg_AUTORECONF = YES handling?
>
> >> I tried it but I can't get it working properly. Maybe you could try it.
>
> > ok, I'll take a look.
>
> autoheader indeed errors out (without any error message :/), so I kept
> it like this (with a description why and the needed host-* dependencies
> added).
>
> Committed series with those changes, thanks.
>
Thanks to you Peter.
Maybe I could try to help you to fix it the way that you want. If you
have some time you can ping me at IRC.
Best regards,
--
Vincent
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-01-09 15:28 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-09 11:57 [Buildroot] [PATCH 1/2] sdl: rename patches to add sequence numbers Vicente Olivert Riera
2014-01-09 11:57 ` [Buildroot] [PATCH 2/2] sdl: Fix compilation with libX11 >= 1.5.99.902 Vicente Olivert Riera
2014-01-09 12:40 ` Peter Korsgaard
2014-01-09 13:09 ` Vicente Olivert Riera
2014-01-09 13:24 ` Peter Korsgaard
2014-01-09 15:24 ` Peter Korsgaard
2014-01-09 15:28 ` Vicente Olivert Riera
2014-01-09 12:08 ` [Buildroot] [PATCH 1/2] sdl: rename patches to add sequence numbers Baruch Siach
2014-01-09 12:09 ` Vicente Olivert Riera
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox