* [ptxdist] [PATCH v2] sdl2-ttf: Version bump + rework. 2.20.1 -> 2.20.2.
@ 2023-02-10 13:03 Christian Melki
2023-02-17 15:35 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2023-02-10 13:03 UTC (permalink / raw)
To: ptxdist
Very minor bugfix release.
https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.20.2
Also do some fixes. As the configuration was very non-complete.
This should help reduce footprint.
Previously we had freetype dependencies,
although sdl2-ttf was using the internal library.
Now opt for external libraries only.
* License file copyright year changed.
* Move patchset forward, applies cleanly.
* Add options to disable internal libraries.
* Add option to enable optional harfbuzz.
* Disable the freetypetest tool.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...onfigure-make-opengl-support-switchable.patch | 0
.../autogen.sh | 0
.../{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/series | 0
rules/sdl2-ttf.in | 16 ++++++++++++++--
rules/sdl2-ttf.make | 10 +++++++---
5 files changed, 21 insertions(+), 5 deletions(-)
rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/0001-configure-make-opengl-support-switchable.patch (100%)
rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/autogen.sh (100%)
rename patches/{SDL2_ttf-2.20.1 => SDL2_ttf-2.20.2}/series (100%)
diff --git a/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
similarity index 100%
rename from patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch
rename to patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
diff --git a/patches/SDL2_ttf-2.20.1/autogen.sh b/patches/SDL2_ttf-2.20.2/autogen.sh
similarity index 100%
rename from patches/SDL2_ttf-2.20.1/autogen.sh
rename to patches/SDL2_ttf-2.20.2/autogen.sh
diff --git a/patches/SDL2_ttf-2.20.1/series b/patches/SDL2_ttf-2.20.2/series
similarity index 100%
rename from patches/SDL2_ttf-2.20.1/series
rename to patches/SDL2_ttf-2.20.2/series
diff --git a/rules/sdl2-ttf.in b/rules/sdl2-ttf.in
index a14676933..4dafa09ae 100644
--- a/rules/sdl2-ttf.in
+++ b/rules/sdl2-ttf.in
@@ -1,12 +1,24 @@
## SECTION=multimedia_sdl
-config SDL2_TTF
+menuconfig SDL2_TTF
tristate
select SDL2
select FREETYPE
- prompt "SDL2 ttf"
+ select HARFBUZZ if SDL2_TTF_HARFBUZZ
+ prompt "SDL2 ttf "
help
This is a sample library which allows you to use TrueType
fonts in your SDL applications. It comes with an example
program "showfont" which displays an example string for a
given TrueType font file.
+
+if SDL2_TTF
+
+config SDL2_TTF_HARFBUZZ
+ bool
+ prompt "enable harfbuzz support"
+ help
+ Enable support for Harfbuzz (meaning open type, in Persian),
+ the open type shaping engine.
+
+endif
diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make
index beaad3992..fd27fc014 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.1
-SDL2_TTF_MD5 := 746be429bdfb5892066dcfaf593e1644
+SDL2_TTF_VERSION := 2.20.2
+SDL2_TTF_MD5 := 4815838c87410346226983f4e0a85fd4
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=771dca8728b18d39b130e19b36514371
+ file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68
# ----------------------------------------------------------------------------
# Prepare
@@ -33,6 +33,10 @@ SDL2_TTF_CONF_TOOL := autoconf
SDL2_TTF_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
$(GLOBAL_LARGE_FILE_OPTION) \
+ --disable-freetype-builtin \
+ --disable-freetypetest \
+ --$(call ptx/endis,PTXCONF_SDL2_TTF_HARFBUZZ)-harfbuzz \
+ --disable-harfbuzz-builtin \
--disable-sdltest
ifdef PTXCONF_SDL2_PULSEAUDIO
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] sdl2-ttf: Version bump + rework. 2.20.1 -> 2.20.2.
2023-02-10 13:03 [ptxdist] [PATCH v2] sdl2-ttf: Version bump + rework. 2.20.1 -> 2.20.2 Christian Melki
@ 2023-02-17 15:35 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2023-02-17 15:35 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 90b47ed2c06e73aa211f1d21d9ba4e8f3a78636d.
Michael
[sent from post-receive hook]
On Fri, 17 Feb 2023 16:35:20 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Very minor bugfix release.
> https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.20.2
> Also do some fixes. As the configuration was very non-complete.
> This should help reduce footprint.
> Previously we had freetype dependencies,
> although sdl2-ttf was using the internal library.
> Now opt for external libraries only.
>
> * License file copyright year changed.
> * Move patchset forward, applies cleanly.
> * Add options to disable internal libraries.
> * Add option to enable optional harfbuzz.
> * Disable the freetypetest tool.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230210130325.2697696-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch b/patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
> similarity index 100%
> rename from patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch
> rename to patches/SDL2_ttf-2.20.2/0001-configure-make-opengl-support-switchable.patch
> diff --git a/patches/SDL2_ttf-2.20.1/autogen.sh b/patches/SDL2_ttf-2.20.2/autogen.sh
> similarity index 100%
> rename from patches/SDL2_ttf-2.20.1/autogen.sh
> rename to patches/SDL2_ttf-2.20.2/autogen.sh
> diff --git a/patches/SDL2_ttf-2.20.1/series b/patches/SDL2_ttf-2.20.2/series
> similarity index 100%
> rename from patches/SDL2_ttf-2.20.1/series
> rename to patches/SDL2_ttf-2.20.2/series
> diff --git a/rules/sdl2-ttf.in b/rules/sdl2-ttf.in
> index a14676933735..4dafa09ae4a2 100644
> --- a/rules/sdl2-ttf.in
> +++ b/rules/sdl2-ttf.in
> @@ -1,12 +1,24 @@
> ## SECTION=multimedia_sdl
>
> -config SDL2_TTF
> +menuconfig SDL2_TTF
> tristate
> select SDL2
> select FREETYPE
> - prompt "SDL2 ttf"
> + select HARFBUZZ if SDL2_TTF_HARFBUZZ
> + prompt "SDL2 ttf "
> help
> This is a sample library which allows you to use TrueType
> fonts in your SDL applications. It comes with an example
> program "showfont" which displays an example string for a
> given TrueType font file.
> +
> +if SDL2_TTF
> +
> +config SDL2_TTF_HARFBUZZ
> + bool
> + prompt "enable harfbuzz support"
> + help
> + Enable support for Harfbuzz (meaning open type, in Persian),
> + the open type shaping engine.
> +
> +endif
> diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make
> index beaad399285a..fd27fc01441d 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.1
> -SDL2_TTF_MD5 := 746be429bdfb5892066dcfaf593e1644
> +SDL2_TTF_VERSION := 2.20.2
> +SDL2_TTF_MD5 := 4815838c87410346226983f4e0a85fd4
> 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=771dca8728b18d39b130e19b36514371
> + file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68
>
> # ----------------------------------------------------------------------------
> # Prepare
> @@ -33,6 +33,10 @@ SDL2_TTF_CONF_TOOL := autoconf
> SDL2_TTF_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> $(GLOBAL_LARGE_FILE_OPTION) \
> + --disable-freetype-builtin \
> + --disable-freetypetest \
> + --$(call ptx/endis,PTXCONF_SDL2_TTF_HARFBUZZ)-harfbuzz \
> + --disable-harfbuzz-builtin \
> --disable-sdltest
>
> ifdef PTXCONF_SDL2_PULSEAUDIO
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-17 15:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-10 13:03 [ptxdist] [PATCH v2] sdl2-ttf: Version bump + rework. 2.20.1 -> 2.20.2 Christian Melki
2023-02-17 15:35 ` [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