From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 25 May 2022 11:46:44 +0200 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 1ntnbI-008VHN-FH for lore@lore.pengutronix.de; Wed, 25 May 2022 11:46:44 +0200 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 1ntnbH-0001WL-8U; Wed, 25 May 2022 11:46:43 +0200 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 1ntnZr-0007FV-M6; Wed, 25 May 2022 11:45:15 +0200 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 1ntnZs-004RBF-83; Wed, 25 May 2022 11:45:14 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ntnZq-00BwGF-6B; Wed, 25 May 2022 11:45:14 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 25 May 2022 11:45:14 +0200 Message-Id: <20220525094514.2845519-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220513075442.48049-1-linnea.gunnarsson@t2data.com> References: <20220513075442.48049-1-linnea.gunnarsson@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] Freetype: version bump 2.11.1 -> 2.12.1 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: Linnea Gunnarsson 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 0c27c5f3fbfd85c610405c40a10026551b4cf99f. Michael [sent from post-receive hook] On Wed, 25 May 2022 11:45:13 +0200, Linnea Gunnarsson wrote: > - It now handles OT-SVG fonts, can be controlled with the > FT_CONFIG_OPTION_SVG macro. > - Some improvements on font handling and other things. > - Some bug fixes. > - The internal zlib is in sync with zlib v. 1.2.12. > - In version 2.12.1 there are some fixes for bugs introduced > in version 2.12.0. > - New config option for demo. > - New md5sum for license, its a new url and some text changes, > nothing important. > > Signed-off-by: Linnea Gunnarsson > Message-Id: <20220513075442.48049-1-linnea.gunnarsson@t2data.com> > [mol: cleanup patch] > Signed-off-by: Michael Olbrich > > diff --git a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch b/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch > similarity index 81% > rename from patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch > rename to patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch > index 9f6d6b5fcc91..961b984fe391 100644 > --- a/patches/freetype-2.11.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch > +++ b/patches/freetype-2.12.1/0001-generate-freetype-config-and-freetype2.pc-correctly.patch > @@ -6,15 +6,15 @@ Signed-off-by: Michael Olbrich > --- > builds/unix/configure.ac | 4 +++- > builds/unix/freetype-config.in | 19 ++++++------------- > - builds/unix/freetype2.in | 14 +++++++------- > + builds/unix/freetype2.in | 18 +++++++++--------- > builds/unix/unix-def.in | 3 --- > - 4 files changed, 16 insertions(+), 24 deletions(-) > + 4 files changed, 18 insertions(+), 26 deletions(-) > > diff --git a/builds/unix/configure.ac b/builds/unix/configure.ac > -index d1b7f1a78c59..11490364fd51 100644 > +index 393ec3bb69a7..c58607c69fbd 100644 > --- a/builds/unix/configure.ac > +++ b/builds/unix/configure.ac > -@@ -1094,7 +1094,9 @@ AC_CONFIG_HEADERS([ftconfig.h]) > +@@ -1147,7 +1147,9 @@ AC_CONFIG_HEADERS([ftconfig.h]) > # and `builds/unix/unix-cc.mk' that will be used by the build system > # > AC_CONFIG_FILES([unix-cc.mk:unix-cc.in > @@ -26,7 +26,7 @@ index d1b7f1a78c59..11490364fd51 100644 > AC_OUTPUT > > diff --git a/builds/unix/freetype-config.in b/builds/unix/freetype-config.in > -index 4edb092d09c4..f0864cbec48b 100644 > +index c076bc1f8222..166afc685009 100644 > --- a/builds/unix/freetype-config.in > +++ b/builds/unix/freetype-config.in > @@ -16,13 +16,6 @@ export LC_ALL > @@ -68,7 +68,7 @@ index 4edb092d09c4..f0864cbec48b 100644 > test "${SYSROOT}$libdir" != "/usr/lib64" ; then > libs_L="-L${SYSROOT}$libdir" > diff --git a/builds/unix/freetype2.in b/builds/unix/freetype2.in > -index 2d759ecf8bfd..f44f14cabf9a 100644 > +index fe389f4b6fef..885444efebf7 100644 > --- a/builds/unix/freetype2.in > +++ b/builds/unix/freetype2.in > @@ -1,14 +1,14 @@ > @@ -85,19 +85,21 @@ index 2d759ecf8bfd..f44f14cabf9a 100644 > URL: https://freetype.org > Description: A free, high-quality, and portable font engine. > -Version: %ft_version% > +-Requires: %PKGCONFIG_REQUIRES% > +-Requires.private: %PKGCONFIG_REQUIRES_PRIVATE% > +-Libs: %PKGCONFIG_LIBS% > +-Libs.private: %PKGCONFIG_LIBS_PRIVATE% > +Version: @ft_version@ > - Requires: > --Requires.private: %REQUIRES_PRIVATE% > -+Requires.private: @REQUIRES_PRIVATE@ > - Libs: -L${libdir} -lfreetype > --Libs.private: %LIBS_PRIVATE% > -+Libs.private: @LIBS_PRIVATE@ > ++Requires: @PKGCONFIG_REQUIRES@ > ++Requires.private: @PKGCONFIG_REQUIRES_PRIVATE@ > ++Libs: @PKGCONFIG_LIBS@ > ++Libs.private: @PKGCONFIG_LIBS_PRIVATE@ > Cflags: -I${includedir}/freetype2 > diff --git a/builds/unix/unix-def.in b/builds/unix/unix-def.in > -index d0c758d03fb2..dbfc40bf303e 100644 > +index 8e298ac59107..519d5958dce5 100644 > --- a/builds/unix/unix-def.in > +++ b/builds/unix/unix-def.in > -@@ -153,7 +153,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in > +@@ -157,7 +157,4 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in > # defines whether we should install `freetype-config' or not > INSTALL_FT2_CONFIG = @INSTALL_FT2_CONFIG@ > > diff --git a/patches/freetype-2.11.1/autogen.sh b/patches/freetype-2.12.1/autogen.sh > similarity index 100% > rename from patches/freetype-2.11.1/autogen.sh > rename to patches/freetype-2.12.1/autogen.sh > diff --git a/patches/freetype-2.11.1/series b/patches/freetype-2.12.1/series > similarity index 100% > rename from patches/freetype-2.11.1/series > rename to patches/freetype-2.12.1/series > diff --git a/rules/freetype.make b/rules/freetype.make > index c65a2dbcf11a..7008ebb78cfd 100644 > --- a/rules/freetype.make > +++ b/rules/freetype.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_FREETYPE) += freetype > # > # Paths and names > # > -FREETYPE_VERSION := 2.11.1 > -FREETYPE_MD5 := 24e79233d607ded439ef36ff1f3ab68f > +FREETYPE_VERSION := 2.12.1 > +FREETYPE_MD5 := 7f7cd7c706d8e402354305c1c59e3ff2 > FREETYPE := freetype-$(FREETYPE_VERSION) > FREETYPE_SUFFIX := tar.xz > FREETYPE_SOURCE := $(SRCDIR)/$(FREETYPE).$(FREETYPE_SUFFIX) > @@ -26,7 +26,7 @@ FREETYPE_LICENSE_FILES := \ > file://LICENSE.TXT;md5=a5927784d823d443c6cae55701d01553 \ > file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec \ > file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \ > - file://src/bdf/README;startline=98;endline=140;md5=d0c2c2e2e102c393a12869bc34515be2 \ > + file://src/bdf/README;startline=98;endline=140;md5=fef9416f085f0834b3ba93a5dc5a622c \ > file://src/pcf/README;startline=69;endline=88;md5=e0f11f550450e58753f2d54ddaf17d34 > > FREETYPE_URL := \