summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-09-05 10:29:12 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-09-05 10:29:13 +0200
commit52d64f251289bcbbf40d36eb62144cc513f36b61 (patch)
tree03c4ce0db7b5778a8d0620440facb367a692781e /patches
parent86f1a56a70b4adb521f5f281d08fe5f7e0d155ec (diff)
downloadptxdist-52d64f251289bcbbf40d36eb62144cc513f36b61.tar.gz
ptxdist-52d64f251289bcbbf40d36eb62144cc513f36b61.tar.xz
sdl2-ttf: version bump 2.0.14 -> 2.0.15
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r--patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch (renamed from patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch)6
-rwxr-xr-xpatches/SDL2_ttf-2.0.15/autogen.sh (renamed from patches/SDL2_ttf-2.0.14/autogen.sh)0
-rw-r--r--patches/SDL2_ttf-2.0.15/series (renamed from patches/SDL2_ttf-2.0.14/series)0
3 files changed, 3 insertions, 3 deletions
diff --git a/patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch
index e57fffcc0..dd3470963 100644
--- a/patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch
+++ b/patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch
@@ -8,10 +8,10 @@ Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
1 file changed, 7 insertions(+)
diff --git a/configure.in b/configure.in
-index 9b36e15cfd4d..972dadf80bd2 100644
+index 32b3a9139efd..d77bab0c0069 100644
--- a/configure.in
+++ b/configure.in
-@@ -130,6 +130,12 @@ AM_PATH_SDL2($SDL_VERSION,
+@@ -105,6 +105,12 @@ AM_PATH_SDL2($SDL_VERSION,
CFLAGS="$CFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SDL_LIBS"
@@ -24,7 +24,7 @@ index 9b36e15cfd4d..972dadf80bd2 100644
dnl Check for OpenGL
case "$host" in
*-*-cygwin* | *-*-mingw32*)
-@@ -179,6 +185,7 @@ else
+@@ -157,6 +163,7 @@ else
GL_LIBS=""
fi
AC_SUBST([GL_LIBS])
diff --git a/patches/SDL2_ttf-2.0.14/autogen.sh b/patches/SDL2_ttf-2.0.15/autogen.sh
index a430a4eb7..a430a4eb7 100755
--- a/patches/SDL2_ttf-2.0.14/autogen.sh
+++ b/patches/SDL2_ttf-2.0.15/autogen.sh
diff --git a/patches/SDL2_ttf-2.0.14/series b/patches/SDL2_ttf-2.0.15/series
index 89c7959a2..89c7959a2 100644
--- a/patches/SDL2_ttf-2.0.14/series
+++ b/patches/SDL2_ttf-2.0.15/series