summaryrefslogtreecommitdiffstats
path: root/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2016-04-20 10:27:22 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2016-04-20 10:27:22 +0200
commit945db6f3d647a16e252203e578f1cd7cf1b4bcb1 (patch)
treefa200232bcbbe2317d53d988f74b9f00bfc11e54 /patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch
parentef7a21192479aec0f862d636e5dfc3e25914a7f0 (diff)
downloadptxdist-945db6f3d647a16e252203e578f1cd7cf1b4bcb1.tar.gz
ptxdist-945db6f3d647a16e252203e578f1cd7cf1b4bcb1.tar.xz
sdl: add upstream patch to fix building for 64-bit architectures
Without the patch building fails in ARM64 and x86_64 with: In file included from ./src/video/x11/SDL_x11dyn.c:96:0: ./src/video/x11/SDL_x11sym.h:168:92: error: conflicting types for '_XData32' In file included from ./src/video/x11/SDL_x11dyn.h:34:0, from ./src/video/x11/SDL_x11dyn.c:26: [...]/sysroot-target/usr/include/X11/Xlibint.h:568:12: note: previous declaration of '_XData32' was here Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch')
-rw-r--r--patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch b/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch
index 87109359f..7233f65c0 100644
--- a/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch
+++ b/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch
@@ -8,11 +8,11 @@ Teach sdl-config the concept of sysroot, but disable manual prefix overwriting.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
- sdl-config.in | 14 +++++++-------
+ sdl-config.in | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sdl-config.in b/sdl-config.in
-index e0fcc0c..0159c47 100644
+index e0fcc0ced54a..0159c474dfcb 100644
--- a/sdl-config.in
+++ b/sdl-config.in
@@ -23,10 +23,10 @@ while test $# -gt 0; do