From 52d64f251289bcbbf40d36eb62144cc513f36b61 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 5 Sep 2019 10:29:12 +0200 Subject: sdl2-ttf: version bump 2.0.14 -> 2.0.15 Signed-off-by: Michael Olbrich --- ...-configure-make-opengl-support-switchable.patch | 34 ---------------------- patches/SDL2_ttf-2.0.14/autogen.sh | 3 -- patches/SDL2_ttf-2.0.14/series | 4 --- ...-configure-make-opengl-support-switchable.patch | 34 ++++++++++++++++++++++ patches/SDL2_ttf-2.0.15/autogen.sh | 3 ++ patches/SDL2_ttf-2.0.15/series | 4 +++ 6 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch delete mode 100755 patches/SDL2_ttf-2.0.14/autogen.sh delete mode 100644 patches/SDL2_ttf-2.0.14/series create mode 100644 patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch create mode 100755 patches/SDL2_ttf-2.0.15/autogen.sh create mode 100644 patches/SDL2_ttf-2.0.15/series (limited to 'patches') diff --git a/patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch deleted file mode 100644 index e57fffcc0..000000000 --- a/patches/SDL2_ttf-2.0.14/0001-configure-make-opengl-support-switchable.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Michael Grzeschik -Date: Fri, 13 Jul 2018 12:24:59 +0200 -Subject: [PATCH] configure: make opengl support switchable - -Signed-off-by: Michael Grzeschik ---- - configure.in | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configure.in b/configure.in -index 9b36e15cfd4d..972dadf80bd2 100644 ---- a/configure.in -+++ b/configure.in -@@ -130,6 +130,12 @@ AM_PATH_SDL2($SDL_VERSION, - CFLAGS="$CFLAGS $SDL_CFLAGS" - LIBS="$LIBS $SDL_LIBS" - -+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 - case "$host" in - *-*-cygwin* | *-*-mingw32*) -@@ -179,6 +185,7 @@ else - GL_LIBS="" - fi - AC_SUBST([GL_LIBS]) -+fi - AC_SUBST([MATHLIB]) - AC_SUBST([WINDRES]) - diff --git a/patches/SDL2_ttf-2.0.14/autogen.sh b/patches/SDL2_ttf-2.0.14/autogen.sh deleted file mode 100755 index a430a4eb7..000000000 --- a/patches/SDL2_ttf-2.0.14/autogen.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -./autogen.sh diff --git a/patches/SDL2_ttf-2.0.14/series b/patches/SDL2_ttf-2.0.14/series deleted file mode 100644 index 89c7959a2..000000000 --- a/patches/SDL2_ttf-2.0.14/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-configure-make-opengl-support-switchable.patch -# 61c28fd8bd7358c69acd4d51c712869b - git-ptx-patches magic diff --git a/patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch new file mode 100644 index 000000000..dd3470963 --- /dev/null +++ b/patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch @@ -0,0 +1,34 @@ +From: Michael Grzeschik +Date: Fri, 13 Jul 2018 12:24:59 +0200 +Subject: [PATCH] configure: make opengl support switchable + +Signed-off-by: Michael Grzeschik +--- + configure.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure.in b/configure.in +index 32b3a9139efd..d77bab0c0069 100644 +--- a/configure.in ++++ b/configure.in +@@ -105,6 +105,12 @@ AM_PATH_SDL2($SDL_VERSION, + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + ++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 + case "$host" in + *-*-cygwin* | *-*-mingw32*) +@@ -157,6 +163,7 @@ else + GL_LIBS="" + fi + AC_SUBST([GL_LIBS]) ++fi + AC_SUBST([MATHLIB]) + AC_SUBST([WINDRES]) + diff --git a/patches/SDL2_ttf-2.0.15/autogen.sh b/patches/SDL2_ttf-2.0.15/autogen.sh new file mode 100755 index 000000000..a430a4eb7 --- /dev/null +++ b/patches/SDL2_ttf-2.0.15/autogen.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +./autogen.sh diff --git a/patches/SDL2_ttf-2.0.15/series b/patches/SDL2_ttf-2.0.15/series new file mode 100644 index 000000000..89c7959a2 --- /dev/null +++ b/patches/SDL2_ttf-2.0.15/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-configure-make-opengl-support-switchable.patch +# 61c28fd8bd7358c69acd4d51c712869b - git-ptx-patches magic -- cgit v1.2.3