Re: [ptxdist] [APPLIED] sdl2-ttf: Version bump. 2.0.15 -> 2.0.18.

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as ecdb401adb0e17cb779758a6f18cddac9e02e0c0.

Michael

[sent from post-receive hook]

On Mon, 14 Feb 2022 13:43:44 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.0.18
> 
> * License seems to be zlib, not unknown.
> * Correct some minor whitespace issues.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220209211524.3384121-2-christian.melki@t2data.com>
> [mol: don't forget the patches]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch
> similarity index 66%
> rename from patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch
> rename to patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch
> index dd347096320e..95d04c40c595 100644
> --- a/patches/SDL2_ttf-2.0.15/0001-configure-make-opengl-support-switchable.patch
> +++ b/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch
> @@ -4,16 +4,16 @@ Subject: [PATCH] configure: make opengl support switchable
>  
>  Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
>  ---
> - configure.in | 7 +++++++
> + configure.ac | 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"
> +diff --git a/configure.ac b/configure.ac
> +index cb2a65ee83b7..7123a7c564b4 100644
> +--- a/configure.ac
> ++++ b/configure.ac
> +@@ -232,6 +232,12 @@ CheckVisibilityHidden()
> + }
> + CheckVisibilityHidden
>   
>  +dnl Check to see if OpenGL support is desired
>  +AC_ARG_ENABLE(opengl,
> @@ -23,12 +23,12 @@ index 32b3a9139efd..d77bab0c0069 100644
>  +if test x$enable_opengl = xyes; then
>   dnl Check for OpenGL
>   case "$host" in
> -     *-*-cygwin* | *-*-mingw32*)
> -@@ -157,6 +163,7 @@ else
> +     *-*-cygwin* | *-*-mingw*)
> +@@ -282,6 +288,7 @@ else
>       GL_LIBS=""
>   fi
>   AC_SUBST([GL_LIBS])
>  +fi
>   AC_SUBST([MATHLIB])
>   AC_SUBST([WINDRES])
> - 
> + AC_SUBST([TTF_CFLAGS])
> diff --git a/patches/SDL2_ttf-2.0.15/autogen.sh b/patches/SDL2_ttf-2.0.18/autogen.sh
> similarity index 100%
> rename from patches/SDL2_ttf-2.0.15/autogen.sh
> rename to patches/SDL2_ttf-2.0.18/autogen.sh
> diff --git a/patches/SDL2_ttf-2.0.15/series b/patches/SDL2_ttf-2.0.18/series
> similarity index 100%
> rename from patches/SDL2_ttf-2.0.15/series
> rename to patches/SDL2_ttf-2.0.18/series
> diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make
> index 161dbf838431..1f649e166b3d 100644
> --- a/rules/sdl2-ttf.make
> +++ b/rules/sdl2-ttf.make
> @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf
>  #
>  # Paths and names
>  #
> -SDL2_TTF_VERSION	:= 2.0.15
> -SDL2_TTF_MD5		:= 04fe06ff7623d7bdcb704e82f5f88391
> +SDL2_TTF_VERSION	:= 2.0.18
> +SDL2_TTF_MD5		:= 86d3023ad3fab597203022f856cff103
>  SDL2_TTF		:= SDL2_ttf-$(SDL2_TTF_VERSION)
> -SDL2_TTF_SUFFIX	:= tar.gz
> +SDL2_TTF_SUFFIX		:= tar.gz
>  SDL2_TTF_URL		:= https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
> -SDL2_TTF_SOURCE	:= $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
> +SDL2_TTF_SOURCE		:= $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
>  SDL2_TTF_DIR		:= $(BUILDDIR)/$(SDL2_TTF)
> -SDL2_TTF_LICENSE	:= unknown
> +SDL2_TTF_LICENSE	:= zlib
> +SDL2_TTF_LICENSE_FILES	:= \
> +	file://COPYING.txt;md5=e98cfd01ca78f683e9d035795810ce87
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> @@ -29,8 +31,7 @@ SDL2_TTF_LICENSE	:= unknown
>  
>  SDL2_TTF_CONF_TOOL	:= autoconf
>  SDL2_TTF_CONF_OPT	:= \
> -	$(CROSS_AUTOCONF_USR) \
> -	--$(call ptx/endis,PTXCONF_SDL2_OPENGL)-opengl
> +	$(CROSS_AUTOCONF_USR)
>  
>  ifdef PTXCONF_SDL2_PULSEAUDIO
>  SDL2_TTF_LDFLAGS	:= \

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de