diff options
author | Michael Grzeschik <m.grzeschik@pengutronix.de> | 2018-11-26 13:45:21 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-12-07 10:53:18 +0100 |
commit | 350661ff6ebcde53e2fc02a678eef9405b952c53 (patch) | |
tree | c90f7595fba9ec040280c516ba56401168152677 /patches/SDL2-2.0.9 | |
parent | 2d6711a0e3343f55f0b8c345c33ace3bc254d24b (diff) | |
download | ptxdist-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-2.0.9')
-rw-r--r-- | patches/SDL2-2.0.9/0001-sdl-2.0.8-add-egl-cflags-to-test.patch | 55 | ||||
-rwxr-xr-x | patches/SDL2-2.0.9/autogen.sh | 3 | ||||
-rw-r--r-- | patches/SDL2-2.0.9/series | 4 |
3 files changed, 62 insertions, 0 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.9/0001-sdl-2.0.8-add-egl-cflags-to-test.patch new file mode 100644 index 000000000..573499644 --- /dev/null +++ b/patches/SDL2-2.0.9/0001-sdl-2.0.8-add-egl-cflags-to-test.patch @@ -0,0 +1,55 @@ +From: Sergey Zhuravlevich <zhurxx@gmail.com> +Date: Mon, 16 Jul 2018 12:03:42 +0200 +Subject: [PATCH] sdl-2.0.8: add egl-cflags to test + +- also call aclocal to expand PKG_CHECK_MODULES + +Signed-off-by: Sergey Zhuravlevich <zhurxx@gmail.com> +Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> +--- + autogen.sh | 2 +- + configure.in | 11 +++++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/autogen.sh b/autogen.sh +index 9edfb8a7d913..2f1e2ef3d419 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -8,7 +8,7 @@ test -z "$srcdir" && srcdir=. + cd "$srcdir" + + # Regenerate configuration files +-cat acinclude/* >aclocal.m4 ++aclocal + 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 + CheckOpenGLESX11() + { + if test x$enable_video = xyes -a x$enable_video_opengles = xyes; then ++ PKG_CHECK_MODULES(EGL, [egl], [have_egl="yes"], [have_egl="no"]) ++ ++ save_CFLAGS="$CFLAGS" ++ if test x$have_egl = xyes; then ++ CFLAGS="$save_CFLAGS $EGL_CFLAGS" ++ EXTRA_CFLAGS="$EXTRA_CFLAGS $EGL_CFLAGS" ++ fi ++ + AC_MSG_CHECKING(for EGL support) + video_opengl_egl=no + AC_TRY_COMPILE([ +@@ -2361,6 +2369,9 @@ CheckOpenGLESX11() + video_opengl_egl=yes + ]) + AC_MSG_RESULT($video_opengl_egl) ++ ++ CFLAGS="$save_CFLAGS" ++ + if test x$video_opengl_egl = xyes; then + AC_DEFINE(SDL_VIDEO_OPENGL_EGL, 1, [ ]) + fi diff --git a/patches/SDL2-2.0.9/autogen.sh b/patches/SDL2-2.0.9/autogen.sh new file mode 100755 index 000000000..a430a4eb7 --- /dev/null +++ b/patches/SDL2-2.0.9/autogen.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +./autogen.sh diff --git a/patches/SDL2-2.0.9/series b/patches/SDL2-2.0.9/series new file mode 100644 index 000000000..3693c2785 --- /dev/null +++ b/patches/SDL2-2.0.9/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-sdl-2.0.8-add-egl-cflags-to-test.patch +# 57d72a951bd7f961008ad5274d82876a - git-ptx-patches magic |