* [ptxdist] [PATCH v2] sdl2-ttf: Version bump. 2.20.2 -> 2.22.0
@ 2024-01-29 17:28 Christian Melki
2024-02-08 16:03 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2024-01-29 17:28 UTC (permalink / raw)
To: ptxdist
Major release. The summary is a bit thin on details.
https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.22.0
(.21 was a prerelease).
* License file changed. Copyright year changed.
* Rearrange options for cleaner option parsing.
* Regenerate patch for offsets, applies cleanly.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...0001-configure-make-opengl-support-switchable.patch | 6 +++---
.../{SDL2_ttf-2.20.2 => SDL2_ttf-2.22.0}/autogen.sh | 0
patches/{SDL2_ttf-2.20.2 => SDL2_ttf-2.22.0}/series | 0
rules/sdl2-ttf.make | 10 +++++-----
4 files changed, 8 insertions(+), 8 deletions(-)
rename patches/{SDL2_ttf-2.20.2 => SDL2_ttf-2.22.0}/0001-configure-make-opengl-support-switchable.patch (86%)
rename patches/{SDL2_ttf-2.20.2 => SDL2_ttf-2.22.0}/autogen.sh (100%)
rename patches/{SDL2_ttf-2.20.2 => SDL2_ttf-2.22.0}/series (100%)
diff --git a/patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.22.0/0001-configure-make-opengl-support-switchable.patch
similarity index 86%
rename from patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
rename to patches/SDL2_ttf-2.22.0/0001-configure-make-opengl-support-switchable.patch
index 95ab1d2bf..cf03ca9fb 100644
--- a/patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
+++ b/patches/SDL2_ttf-2.22.0/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.ac b/configure.ac
-index 9b1c36358d41..640a4e228706 100644
+index f0612a4be057..b12cab96de56 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -304,6 +304,12 @@ AM_CONDITIONAL(USE_BUILTIN_HARFBUZZ, test x$enable_harfbuzz_builtin = xyes)
+@@ -308,6 +308,12 @@ AM_CONDITIONAL(USE_BUILTIN_HARFBUZZ, test x$enable_harfbuzz_builtin = xyes)
dnl check for LD --no-undefined option
CheckNoUndef
@@ -24,7 +24,7 @@ index 9b1c36358d41..640a4e228706 100644
dnl Check for OpenGL
case "$host" in
*-*-cygwin* | *-*-mingw*)
-@@ -354,6 +360,7 @@ else
+@@ -358,6 +364,7 @@ else
GL_LIBS=""
fi
AC_SUBST([GL_LIBS])
diff --git a/patches/SDL2_ttf-2.20.2/autogen.sh b/patches/SDL2_ttf-2.22.0/autogen.sh
similarity index 100%
rename from patches/SDL2_ttf-2.20.2/autogen.sh
rename to patches/SDL2_ttf-2.22.0/autogen.sh
diff --git a/patches/SDL2_ttf-2.20.2/series b/patches/SDL2_ttf-2.22.0/series
similarity index 100%
rename from patches/SDL2_ttf-2.20.2/series
rename to patches/SDL2_ttf-2.22.0/series
diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make
index fd27fc014..386c734f8 100644
--- a/rules/sdl2-ttf.make
+++ b/rules/sdl2-ttf.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf
#
# Paths and names
#
-SDL2_TTF_VERSION := 2.20.2
-SDL2_TTF_MD5 := 4815838c87410346226983f4e0a85fd4
+SDL2_TTF_VERSION := 2.22.0
+SDL2_TTF_MD5 := 686e685caaa215d8fa1ac7bb02b2cf54
SDL2_TTF := SDL2_ttf-$(SDL2_TTF_VERSION)
SDL2_TTF_SUFFIX := tar.gz
SDL2_TTF_URL := https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
@@ -23,7 +23,7 @@ SDL2_TTF_SOURCE := $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
SDL2_TTF_DIR := $(BUILDDIR)/$(SDL2_TTF)
SDL2_TTF_LICENSE := zlib
SDL2_TTF_LICENSE_FILES := \
- file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68
+ file://LICENSE.txt;md5=2f6d9e01c97958aa851954ed5acf82ee
# ----------------------------------------------------------------------------
# Prepare
@@ -33,11 +33,11 @@ SDL2_TTF_CONF_TOOL := autoconf
SDL2_TTF_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
$(GLOBAL_LARGE_FILE_OPTION) \
+ --disable-sdltest \
--disable-freetype-builtin \
--disable-freetypetest \
--$(call ptx/endis,PTXCONF_SDL2_TTF_HARFBUZZ)-harfbuzz \
- --disable-harfbuzz-builtin \
- --disable-sdltest
+ --disable-harfbuzz-builtin
ifdef PTXCONF_SDL2_PULSEAUDIO
SDL2_TTF_LDFLAGS := \
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] sdl2-ttf: Version bump. 2.20.2 -> 2.22.0
2024-01-29 17:28 [ptxdist] [PATCH v2] sdl2-ttf: Version bump. 2.20.2 -> 2.22.0 Christian Melki
@ 2024-02-08 16:03 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2024-02-08 16:03 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 2d3fb653e6d1fad5181a495d6ff9525f10a05548.
Michael
[sent from post-receive hook]
On Thu, 08 Feb 2024 17:03:16 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Major release. The summary is a bit thin on details.
> https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.22.0
> (.21 was a prerelease).
>
> * License file changed. Copyright year changed.
>
> * Rearrange options for cleaner option parsing.
>
> * Regenerate patch for offsets, applies cleanly.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20240129172844.971348-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.22.0/0001-configure-make-opengl-support-switchable.patch
> similarity index 86%
> rename from patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
> rename to patches/SDL2_ttf-2.22.0/0001-configure-make-opengl-support-switchable.patch
> index 95ab1d2bfcb0..cf03ca9fb649 100644
> --- a/patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
> +++ b/patches/SDL2_ttf-2.22.0/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.ac b/configure.ac
> -index 9b1c36358d41..640a4e228706 100644
> +index f0612a4be057..b12cab96de56 100644
> --- a/configure.ac
> +++ b/configure.ac
> -@@ -304,6 +304,12 @@ AM_CONDITIONAL(USE_BUILTIN_HARFBUZZ, test x$enable_harfbuzz_builtin = xyes)
> +@@ -308,6 +308,12 @@ AM_CONDITIONAL(USE_BUILTIN_HARFBUZZ, test x$enable_harfbuzz_builtin = xyes)
> dnl check for LD --no-undefined option
> CheckNoUndef
>
> @@ -24,7 +24,7 @@ index 9b1c36358d41..640a4e228706 100644
> dnl Check for OpenGL
> case "$host" in
> *-*-cygwin* | *-*-mingw*)
> -@@ -354,6 +360,7 @@ else
> +@@ -358,6 +364,7 @@ else
> GL_LIBS=""
> fi
> AC_SUBST([GL_LIBS])
> diff --git a/patches/SDL2_ttf-2.20.2/autogen.sh b/patches/SDL2_ttf-2.22.0/autogen.sh
> similarity index 100%
> rename from patches/SDL2_ttf-2.20.2/autogen.sh
> rename to patches/SDL2_ttf-2.22.0/autogen.sh
> diff --git a/patches/SDL2_ttf-2.20.2/series b/patches/SDL2_ttf-2.22.0/series
> similarity index 100%
> rename from patches/SDL2_ttf-2.20.2/series
> rename to patches/SDL2_ttf-2.22.0/series
> diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make
> index fd27fc01441d..386c734f8876 100644
> --- a/rules/sdl2-ttf.make
> +++ b/rules/sdl2-ttf.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2_TTF) += sdl2-ttf
> #
> # Paths and names
> #
> -SDL2_TTF_VERSION := 2.20.2
> -SDL2_TTF_MD5 := 4815838c87410346226983f4e0a85fd4
> +SDL2_TTF_VERSION := 2.22.0
> +SDL2_TTF_MD5 := 686e685caaa215d8fa1ac7bb02b2cf54
> SDL2_TTF := SDL2_ttf-$(SDL2_TTF_VERSION)
> SDL2_TTF_SUFFIX := tar.gz
> SDL2_TTF_URL := https://www.libsdl.org/projects/SDL_ttf/release/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
> @@ -23,7 +23,7 @@ SDL2_TTF_SOURCE := $(SRCDIR)/$(SDL2_TTF).$(SDL2_TTF_SUFFIX)
> SDL2_TTF_DIR := $(BUILDDIR)/$(SDL2_TTF)
> SDL2_TTF_LICENSE := zlib
> SDL2_TTF_LICENSE_FILES := \
> - file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68
> + file://LICENSE.txt;md5=2f6d9e01c97958aa851954ed5acf82ee
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -33,11 +33,11 @@ SDL2_TTF_CONF_TOOL := autoconf
> SDL2_TTF_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> $(GLOBAL_LARGE_FILE_OPTION) \
> + --disable-sdltest \
> --disable-freetype-builtin \
> --disable-freetypetest \
> --$(call ptx/endis,PTXCONF_SDL2_TTF_HARFBUZZ)-harfbuzz \
> - --disable-harfbuzz-builtin \
> - --disable-sdltest
> + --disable-harfbuzz-builtin
>
> ifdef PTXCONF_SDL2_PULSEAUDIO
> SDL2_TTF_LDFLAGS := \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-02-08 16:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-29 17:28 [ptxdist] [PATCH v2] sdl2-ttf: Version bump. 2.20.2 -> 2.22.0 Christian Melki
2024-02-08 16:03 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox