Thanks, applied as 90b47ed2c06e73aa211f1d21d9ba4e8f3a78636d. Michael
[sent from post-receive hook] On Fri, 17 Feb 2023 16:35:20 +0100, Christian Melki <[email protected]> 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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
