summaryrefslogtreecommitdiffstats
path: root/patches/SDL2_test-2.0.9
diff options
context:
space:
mode:
authorMichael Grzeschik <m.grzeschik@pengutronix.de>2018-11-26 13:45:21 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-12-07 10:53:18 +0100
commit350661ff6ebcde53e2fc02a678eef9405b952c53 (patch)
treec90f7595fba9ec040280c516ba56401168152677 /patches/SDL2_test-2.0.9
parent2d6711a0e3343f55f0b8c345c33ace3bc254d24b (diff)
downloadptxdist-350661ff6ebcde53e2fc02a678eef9405b952c53.tar.gz
ptxdist-350661ff6ebcde53e2fc02a678eef9405b952c53.tar.xz
sdl2: version bump to 2.0.9
Update to 2.0.9 and remove already mainlined patch. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/SDL2_test-2.0.9')
-rw-r--r--patches/SDL2_test-2.0.9/0001-sdl-2.0.8-tests-configure-opengl.patch44
-rwxr-xr-xpatches/SDL2_test-2.0.9/autogen.sh4
-rw-r--r--patches/SDL2_test-2.0.9/series4
3 files changed, 52 insertions, 0 deletions
diff --git a/patches/SDL2_test-2.0.9/0001-sdl-2.0.8-tests-configure-opengl.patch b/patches/SDL2_test-2.0.9/0001-sdl-2.0.8-tests-configure-opengl.patch
new file mode 100644
index 000000000..8be0b1a89
--- /dev/null
+++ b/patches/SDL2_test-2.0.9/0001-sdl-2.0.8-tests-configure-opengl.patch
@@ -0,0 +1,44 @@
+From: Jaret Cantu <jaret.cantu@timesys.com>
+Date: Tue, 16 Jan 2018 12:16:16 -0500
+Subject: [PATCH] sdl-2.0.8: tests: configure opengl
+
+ Allow OpenGL to be configured manually
+
+ The autodetection uses the presence of a header file which
+ SDL2 always installs, regardless of whether or not OpenGL was
+ enabled. This causes the SDL2 tests to use OpenGL when SDL2
+ itself was not configured for it.
+
+ Configure certain tests not to build, depending on the
+ configuration. Tests which require OpenGL development files
+ will fail when no OpenGL is detected (which should be obvious,
+ but it apparently wasn't for whoever designed this).
+---
+ test/configure.in | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/test/configure.in b/test/configure.in
+index fd3f3022bc2e..8ae15159b8f8 100644
+--- a/test/configure.in
++++ b/test/configure.in
+@@ -115,6 +115,12 @@ if test x$have_x = xyes; then
+ fi
+ fi
+
++dnl Check to see if OpenGL support is desired
++AC_ARG_ENABLE(opengl,
++AC_HELP_STRING([--enable-opengl], [include OpenGL support [[default=yes]]]),
++ , enable_opengl=yes)
++
++if test x$enable_opengl = xyes; then
+ dnl Check for OpenGL
+ AC_MSG_CHECKING(for OpenGL support)
+ have_opengl=no
+@@ -125,6 +131,7 @@ AC_TRY_COMPILE([
+ have_opengl=yes
+ ])
+ AC_MSG_RESULT($have_opengl)
++fi
+
+ dnl Check for OpenGL ES
+ AC_MSG_CHECKING(for OpenGL ES support)
diff --git a/patches/SDL2_test-2.0.9/autogen.sh b/patches/SDL2_test-2.0.9/autogen.sh
new file mode 100755
index 000000000..1e5af6e71
--- /dev/null
+++ b/patches/SDL2_test-2.0.9/autogen.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+./autogen.sh
+
diff --git a/patches/SDL2_test-2.0.9/series b/patches/SDL2_test-2.0.9/series
new file mode 100644
index 000000000..7064d2850
--- /dev/null
+++ b/patches/SDL2_test-2.0.9/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-sdl-2.0.8-tests-configure-opengl.patch
+# c71c8697191f98668c86bc2215feebce - git-ptx-patches magic