Thanks, applied as ce36bb22ad61ca1795e4c43c9419d62d605dfd99. Michael
[sent from post-receive hook] On Wed, 19 Oct 2022 07:41:35 +0200, Christian Melki <christian.me...@t2data.com> wrote: > https://github.com/libsdl-org/SDL_ttf/releases > SDL2 community have changed their version numbering scheme. > So this isn't as big of a bump as the version number would indicate. > > * Plugs CVE-2018-25032, CVE-2022-27470 > * License file changed name and contents is reformatted. > The reformatting is to make github recognize the file > as the correct license. > * Forward patch series with some changes to make them apply cleanly. > * Add global largefile option. > * Disable sdltest. > > Signed-off-by: Christian Melki <christian.me...@t2data.com> > Message-Id: <20221013111452.3298415-3-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich <m.olbr...@pengutronix.de> > > diff --git > a/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch > b/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch > similarity index 75% > rename from > patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch > rename to > patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch > index 95d04c40c595..95ab1d2bfcb0 100644 > --- > a/patches/SDL2_ttf-2.0.18/0001-configure-make-opengl-support-switchable.patch > +++ > b/patches/SDL2_ttf-2.20.1/0001-configure-make-opengl-support-switchable.patch > @@ -8,12 +8,12 @@ Signed-off-by: Michael Grzeschik > <m.grzesc...@pengutronix.de> > 1 file changed, 7 insertions(+) > > diff --git a/configure.ac b/configure.ac > -index cb2a65ee83b7..7123a7c564b4 100644 > +index 9b1c36358d41..640a4e228706 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -232,6 +232,12 @@ CheckVisibilityHidden() > - } > - CheckVisibilityHidden > +@@ -304,6 +304,12 @@ AM_CONDITIONAL(USE_BUILTIN_HARFBUZZ, test > x$enable_harfbuzz_builtin = xyes) > + dnl check for LD --no-undefined option > + CheckNoUndef > > +dnl Check to see if OpenGL support is desired > +AC_ARG_ENABLE(opengl, > @@ -24,11 +24,11 @@ index cb2a65ee83b7..7123a7c564b4 100644 > dnl Check for OpenGL > case "$host" in > *-*-cygwin* | *-*-mingw*) > -@@ -282,6 +288,7 @@ else > +@@ -354,6 +360,7 @@ else > GL_LIBS="" > fi > AC_SUBST([GL_LIBS]) > +fi > AC_SUBST([MATHLIB]) > - AC_SUBST([WINDRES]) > AC_SUBST([TTF_CFLAGS]) > + AC_SUBST([TTF_LIBS]) > diff --git a/patches/SDL2_ttf-2.0.18/autogen.sh > b/patches/SDL2_ttf-2.20.1/autogen.sh > similarity index 100% > rename from patches/SDL2_ttf-2.0.18/autogen.sh > rename to patches/SDL2_ttf-2.20.1/autogen.sh > diff --git a/patches/SDL2_ttf-2.0.18/series b/patches/SDL2_ttf-2.20.1/series > similarity index 100% > rename from patches/SDL2_ttf-2.0.18/series > rename to patches/SDL2_ttf-2.20.1/series > diff --git a/rules/sdl2-ttf.make b/rules/sdl2-ttf.make > index 1f649e166b3d..beaad399285a 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.0.18 > -SDL2_TTF_MD5 := 86d3023ad3fab597203022f856cff103 > +SDL2_TTF_VERSION := 2.20.1 > +SDL2_TTF_MD5 := 746be429bdfb5892066dcfaf593e1644 > 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://COPYING.txt;md5=e98cfd01ca78f683e9d035795810ce87 > + file://LICENSE.txt;md5=771dca8728b18d39b130e19b36514371 > > # > ---------------------------------------------------------------------------- > # Prepare > @@ -31,7 +31,9 @@ SDL2_TTF_LICENSE_FILES := \ > > SDL2_TTF_CONF_TOOL := autoconf > SDL2_TTF_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) > + $(CROSS_AUTOCONF_USR) \ > + $(GLOBAL_LARGE_FILE_OPTION) \ > + --disable-sdltest > > ifdef PTXCONF_SDL2_PULSEAUDIO > SDL2_TTF_LDFLAGS := \
