From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 14 Feb 2022 13:46:30 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nJakQ-00G9gG-5E for lore@lore.pengutronix.de; Mon, 14 Feb 2022 13:46:30 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1nJakP-0005KW-Bc; Mon, 14 Feb 2022 13:46:29 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nJahm-0002RW-IP; Mon, 14 Feb 2022 13:43:46 +0100 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1nJahm-00GY7E-ID; Mon, 14 Feb 2022 13:43:45 +0100 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nJahk-003Wa8-Tt; Mon, 14 Feb 2022 13:43:45 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Mon, 14 Feb 2022 13:43:44 +0100 Message-Id: <20220214124344.840185-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220209211524.3384121-2-christian.melki@t2data.com> References: <20220209211524.3384121-2-christian.melki@t2data.com> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] sdl2-ttf: Version bump. 2.0.15 -> 2.0.18. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as ecdb401adb0e17cb779758a6f18cddac9e02e0c0. Michael [sent from post-receive hook] On Mon, 14 Feb 2022 13:43:44 +0100, Christian Melki 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 > Message-Id: <20220209211524.3384121-2-christian.melki@t2data.com> > [mol: don't forget the patches] > Signed-off-by: Michael Olbrich > > 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 > --- > - 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