summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-09-05 09:55:47 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-09-05 10:05:19 +0200
commit86f1a56a70b4adb521f5f281d08fe5f7e0d155ec (patch)
treee47656cb16c86cec1a85f3b62efdbc83eb918504 /patches
parentc20eaea9bc4c85b65389b1edb52f35b6676ea0ec (diff)
downloadptxdist-86f1a56a70b4adb521f5f281d08fe5f7e0d155ec.tar.gz
ptxdist-86f1a56a70b4adb521f5f281d08fe5f7e0d155ec.tar.xz
sdl2: version bump 2.0.9 -> 2.0.10
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/SDL2-2.0.10/0001-sdl-2.0.8-add-egl-cflags-to-test.patch (renamed from patches/SDL2-2.0.9/0001-sdl-2.0.8-add-egl-cflags-to-test.patch)14
-rwxr-xr-xpatches/SDL2-2.0.10/autogen.sh (renamed from patches/SDL2-2.0.9/autogen.sh)0
-rw-r--r--patches/SDL2-2.0.10/series (renamed from patches/SDL2-2.0.9/series)0
-rw-r--r--patches/SDL2_test-2.0.10/0001-sdl-2.0.8-tests-configure-opengl.patch (renamed from patches/SDL2_test-2.0.9/0001-sdl-2.0.8-tests-configure-opengl.patch)10
-rwxr-xr-xpatches/SDL2_test-2.0.10/autogen.sh (renamed from patches/SDL2_test-2.0.9/autogen.sh)0
-rw-r--r--patches/SDL2_test-2.0.10/series (renamed from patches/SDL2_test-2.0.9/series)0
6 files changed, 12 insertions, 12 deletions
diff --git a/patches/SDL2-2.0.9/0001-sdl-2.0.8-add-egl-cflags-to-test.patch b/patches/SDL2-2.0.10/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
index 573499644..dd2ec8400 100644
--- a/patches/SDL2-2.0.9/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
+++ b/patches/SDL2-2.0.10/0001-sdl-2.0.8-add-egl-cflags-to-test.patch
@@ -8,7 +8,7 @@ Signed-off-by: Sergey Zhuravlevich <zhurxx@gmail.com>
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
autogen.sh | 2 +-
- configure.in | 11 +++++++++++
+ configure.ac | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/autogen.sh b/autogen.sh
@@ -24,11 +24,11 @@ index 9edfb8a7d913..2f1e2ef3d419 100755
found=false
for autoconf in autoconf autoconf259 autoconf-2.59
do if which $autoconf >/dev/null 2>&1; then $autoconf && found=true; break; fi
-diff --git a/configure.in b/configure.in
-index ae866ff0c55c..23d4ee2d8fad 100644
---- a/configure.in
-+++ b/configure.in
-@@ -2349,6 +2349,14 @@ dnl Find OpenGL ES
+diff --git a/configure.ac b/configure.ac
+index 9e782c653dfd..1e0477d1d0f2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2268,6 +2268,14 @@ dnl Find OpenGL ES
CheckOpenGLESX11()
{
if test x$enable_video = xyes -a x$enable_video_opengles = xyes; then
@@ -43,7 +43,7 @@ index ae866ff0c55c..23d4ee2d8fad 100644
AC_MSG_CHECKING(for EGL support)
video_opengl_egl=no
AC_TRY_COMPILE([
-@@ -2361,6 +2369,9 @@ CheckOpenGLESX11()
+@@ -2421,6 +2429,9 @@ CheckEmscriptenGLES()
video_opengl_egl=yes
])
AC_MSG_RESULT($video_opengl_egl)
diff --git a/patches/SDL2-2.0.9/autogen.sh b/patches/SDL2-2.0.10/autogen.sh
index a430a4eb7..a430a4eb7 100755
--- a/patches/SDL2-2.0.9/autogen.sh
+++ b/patches/SDL2-2.0.10/autogen.sh
diff --git a/patches/SDL2-2.0.9/series b/patches/SDL2-2.0.10/series
index 3693c2785..3693c2785 100644
--- a/patches/SDL2-2.0.9/series
+++ b/patches/SDL2-2.0.10/series
diff --git a/patches/SDL2_test-2.0.9/0001-sdl-2.0.8-tests-configure-opengl.patch b/patches/SDL2_test-2.0.10/0001-sdl-2.0.8-tests-configure-opengl.patch
index 8be0b1a89..9261c33fd 100644
--- a/patches/SDL2_test-2.0.9/0001-sdl-2.0.8-tests-configure-opengl.patch
+++ b/patches/SDL2_test-2.0.10/0001-sdl-2.0.8-tests-configure-opengl.patch
@@ -14,13 +14,13 @@ Subject: [PATCH] sdl-2.0.8: tests: configure opengl
will fail when no OpenGL is detected (which should be obvious,
but it apparently wasn't for whoever designed this).
---
- test/configure.in | 7 +++++++
+ test/configure.ac | 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
+diff --git a/test/configure.ac b/test/configure.ac
+index 2e237262eaf1..45777b5f8999 100644
+--- a/test/configure.ac
++++ b/test/configure.ac
@@ -115,6 +115,12 @@ if test x$have_x = xyes; then
fi
fi
diff --git a/patches/SDL2_test-2.0.9/autogen.sh b/patches/SDL2_test-2.0.10/autogen.sh
index 1e5af6e71..1e5af6e71 100755
--- a/patches/SDL2_test-2.0.9/autogen.sh
+++ b/patches/SDL2_test-2.0.10/autogen.sh
diff --git a/patches/SDL2_test-2.0.9/series b/patches/SDL2_test-2.0.10/series
index 7064d2850..7064d2850 100644
--- a/patches/SDL2_test-2.0.9/series
+++ b/patches/SDL2_test-2.0.10/series