sdl: version bump 1.2.14 -> 1.2.15

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 83 insertions, 0 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
new file mode 100644
index 000000000..87109359f
--- /dev/null
+++ b/patches/SDL-1.2.15/0001-SDL-1.2.10-sdl-config.in.diff.patch
@@ -0,0 +1,50 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:49:04 +0200
+Subject: [PATCH] SDL-1.2.10-sdl-config.in.diff
+
+Subject teach sdl-config about sysroot
+
+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 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/sdl-config.in b/sdl-config.in
+index e0fcc0c..0159c47 100644
+--- a/sdl-config.in
++++ b/sdl-config.in
+@@ -23,10 +23,10 @@ while test $# -gt 0; do
+ 
+   case $1 in
+     --prefix=*)
+-      prefix=$optarg
+-      if test $exec_prefix_set = no ; then
+-        exec_prefix=$optarg
+-      fi
++#      prefix=$optarg
++#      if test $exec_prefix_set = no ; then
++#        exec_prefix=$optarg
++#      fi
+       ;;
+     --prefix)
+       echo $prefix
+@@ -42,14 +42,14 @@ while test $# -gt 0; do
+       echo @SDL_VERSION@
+       ;;
+     --cflags)
+-      echo -I@includedir@/SDL @SDL_CFLAGS@
++      echo -I${SYSROOT}@includedir@/SDL @SDL_CFLAGS@
+       ;;
+ @ENABLE_SHARED_TRUE@    --libs)
+-@ENABLE_SHARED_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
++@ENABLE_SHARED_TRUE@      echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
+ @ENABLE_SHARED_TRUE@      ;;
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
+ @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
+-@ENABLE_STATIC_TRUE@      echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
++@ENABLE_STATIC_TRUE@      echo -L${SYSROOT}@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
+ @ENABLE_STATIC_TRUE@      ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/patches/SDL-1.2.15/0002-fix-parallel-build.patch b/patches/SDL-1.2.15/0002-fix-parallel-build.patch
new file mode 100644
index 000000000..b68aaeb23
--- /dev/null
+++ b/patches/SDL-1.2.15/0002-fix-parallel-build.patch
@@ -0,0 +1,24 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Sat, 29 Oct 2011 18:49:04 +0200
+Subject: [PATCH] fix parallel build
+
+We have to create the objects dir before saving gcc's output into it.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index ab51035..6e24672 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -71,7 +71,7 @@ depend:
+ 
+ include $(depend)
+ 
+-$(objects)/$(TARGET): $(OBJECTS)
++$(objects)/$(TARGET): $(OBJECTS) $(objects)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
diff --git a/patches/SDL-1.2.15/autogen.sh b/patches/SDL-1.2.15/autogen.sh
new file mode 100755
index 000000000..1e5af6e71
--- /dev/null
+++ b/patches/SDL-1.2.15/autogen.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+./autogen.sh
+
diff --git a/patches/SDL-1.2.15/series b/patches/SDL-1.2.15/series
new file mode 100644
index 000000000..bc5578ec9
--- /dev/null
+++ b/patches/SDL-1.2.15/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-SDL-1.2.10-sdl-config.in.diff.patch
+0002-fix-parallel-build.patch
+# eae8d165e3519b04806e60b441740fc3  - git-ptx-patches magic