From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 07 Nov 2025 09:53:40 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vHIE0-00GF3a-2f for lore@lore.pengutronix.de; Fri, 07 Nov 2025 09:53:40 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vHIE0-0004Cx-KS; Fri, 07 Nov 2025 09:53:40 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vHIDh-0003yG-0C; Fri, 07 Nov 2025 09:53:21 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vHIDg-007V5r-2f; Fri, 07 Nov 2025 09:53:20 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1vHIDg-00000009GUv-3F8E; Fri, 07 Nov 2025 09:53:20 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 7 Nov 2025 09:53:20 +0100 Message-ID: <20251107085320.2208362-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251021081038.1373513-1-s.pueschel@pengutronix.de> References: <20251021081038.1373513-1-s.pueschel@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] fontconfig: version bump 2.14.2 -> 2.17.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: =?UTF-8?q?Sven=20P=C3=BCschel?= 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 4f4900e1e6d9c6fbf1926eeed99797d54875bc0a. Michael [sent from post-receive hook] On Fri, 07 Nov 2025 09:53:20 +0100, Sven Püschel wrote: > As noted on the fontconfig.org website, releases beyond 2.16.0 are > available on GitLab. Therefore change the URL accordingly. > > While the GitLab releases contain an xz compressed tarball with a > generated configure script, they don't have a predictable path. > Therefore use the GitLab generated archives and switch to meson as a > build system to avoid adding an autogen.sh patch. > > The CaseFolding license just bumped the year due to fontconfig including > a newer version of the file (14.0.0 -> 15.1.0). > > https://gitlab.freedesktop.org/fontconfig/fontconfig/-/releases/2.16.1 > https://gitlab.freedesktop.org/fontconfig/fontconfig/-/releases/2.16.2 > https://gitlab.freedesktop.org/fontconfig/fontconfig/-/releases/2.17.0 > https://gitlab.freedesktop.org/fontconfig/fontconfig/-/releases/2.17.1 > > Signed-off-by: Sven Püschel > Message-Id: <20251021081038.1373513-1-s.pueschel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/fontconfig.in b/rules/fontconfig.in > index 61f4b884250a..937b81bf99db 100644 > --- a/rules/fontconfig.in > +++ b/rules/fontconfig.in > @@ -4,6 +4,7 @@ menuconfig FONTCONFIG > tristate > prompt "fontconfig " > select HOST_GPERF > + select HOST_MESON > select FREETYPE > select EXPAT > select LIBUUID > diff --git a/rules/fontconfig.make b/rules/fontconfig.make > index 95510bf7581e..d3357b6e0c25 100644 > --- a/rules/fontconfig.make > +++ b/rules/fontconfig.make > @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_FONTCONFIG) += fontconfig > # > # Paths and names > # > -FONTCONFIG_VERSION := 2.14.2 > -FONTCONFIG_MD5 := c5536d897c5d52422a00ecee742ccf47 > +FONTCONFIG_VERSION := 2.17.1 > +FONTCONFIG_MD5 := 1a1f5336105e5b80f36dce7dabe04d1a > FONTCONFIG := fontconfig-$(FONTCONFIG_VERSION) > FONTCONFIG_SUFFIX := tar.gz > -FONTCONFIG_URL := http://fontconfig.org/release/$(FONTCONFIG).$(FONTCONFIG_SUFFIX) > +FONTCONFIG_URL := https://gitlab.freedesktop.org/fontconfig/fontconfig/-/archive/$(FONTCONFIG_VERSION)/$(FONTCONFIG).$(FONTCONFIG_SUFFIX) > FONTCONFIG_SOURCE := $(SRCDIR)/$(FONTCONFIG).$(FONTCONFIG_SUFFIX) > FONTCONFIG_DIR := $(BUILDDIR)/$(FONTCONFIG) > FONTCONFIG_LICENSE := HPND-sell-variant AND MIT AND custom AND MIT-Modern-Variant AND Unicode-TOU and public_domain > @@ -26,34 +26,29 @@ FONTCONFIG_LICENSE_FILES := \ > file://COPYING;md5=00252fd272bf2e722925613ad74cb6c7 \ > file://src/ftglue.c;startline=1;endline=8;md5=789386c3d7c853bbce055520a11aaeb9 \ > file://src/fcatomic.h;startline=4;endline=24;md5=89c79dedb0fb324bfa2fae6b7bf7f673 \ > - file://fc-case/CaseFolding.txt;startline=3;endline=6;md5=22a71642d1bac5fcefffd1f9f35cdf27 > + file://fc-case/CaseFolding.txt;startline=3;endline=6;md5=335eb5842569668c6fe6ea50d00157ef > > # ---------------------------------------------------------------------------- > # Prepare > # ---------------------------------------------------------------------------- > > -FONTCONFIG_CONF_ENV := \ > - $(CROSS_ENV) \ > - ac_cv_prog_HASDOCBOOK=no > - > -# > -# autoconf > -# > -FONTCONFIG_CONF_TOOL := autoconf > +FONTCONFIG_CONF_TOOL := meson > FONTCONFIG_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - $(GLOBAL_LARGE_FILE_OPTION) \ > - --disable-nls \ > - --disable-rpath \ > - --$(call ptx/endis, PTXCONF_ICONV)-iconv \ > - --disable-libxml2 \ > - --disable-docbook \ > - --disable-docs \ > - --disable-cache-build \ > - --with-arch=$(PTXCONF_ARCH_STRING) \ > - --with-default-hinting=slight \ > - --with-default-fonts=$(XORG_FONTDIR) \ > - --with-cache-dir=/var/cache/fontconfig > + $(CROSS_MESON_USR) \ > + -Dbaseconfig-dir=default \ > + -Dbitmap-conf=no-except-emoji \ > + -Dcache-build=disabled \ > + -Dcache-dir=/var/cache/fontconfig \ > + -Ddefault-hinting=slight \ > + -Ddefault-fonts-dirs=[\'$(XORG_FONTDIR)\'] \ > + -Ddefault-sub-pixel-rendering=none \ > + -Ddoc=disabled \ > + -Dfontations=disabled \ > + -Diconv=$(call ptx/endis, PTXCONF_ICONV)d \ > + -Dnls=disabled \ > + -Dtests=disabled \ > + -Dtools=enabled \ > + -Dxml-backend=expat > > # ---------------------------------------------------------------------------- > # Target-Install > diff --git a/rules/host-fontconfig.in b/rules/host-fontconfig.in > index 9192928960e6..19e84ca3771b 100644 > --- a/rules/host-fontconfig.in > +++ b/rules/host-fontconfig.in > @@ -6,6 +6,7 @@ config HOST_FONTCONFIG > select HOST_FREETYPE > select HOST_GPERF > select HOST_LIBUUID > + select HOST_MESON > default y if ALLYES > help > Fontconfig is a font configuration and > diff --git a/rules/host-fontconfig.make b/rules/host-fontconfig.make > index 3845a23ce573..ee8c887c3f2d 100644 > --- a/rules/host-fontconfig.make > +++ b/rules/host-fontconfig.make > @@ -21,25 +21,22 @@ HOST_FONTCONFIG_DIR = $(HOST_BUILDDIR)/$(FONTCONFIG) > # Prepare > # ---------------------------------------------------------------------------- > > -HOST_FONTCONFIG_CONF_ENV := \ > - $(HOST_ENV) \ > - ac_cv_prog_HASDOCBOOK=no > - > -# > -# autoconf > -# > -HOST_FONTCONFIG_CONF_TOOL := autoconf > -HOST_FONTCONFIG_CONF_OPT := \ > - $(HOST_AUTOCONF) \ > - --disable-nls \ > - --disable-rpath \ > - --disable-iconv \ > - --disable-libxml2 \ > - --disable-docs \ > - --with-arch=$(PTXCONF_ARCH_STRING) \ > - --with-default-fonts=$(XORG_FONTDIR) \ > - --with-cache-dir=$(PTXDIST_SYSROOT_HOST)/var/cache/fontconfig > - > -HOST_FONTCONFIG_MAKE_PAR := NO > +HOST_FONTCONFIG_CONF_TOOL := meson > +HOST_FONTCONFIG_CONF_OPT := \ > + $(HOST_MESON_OPT) \ > + -Dbaseconfig-dir=default \ > + -Dbitmap-conf=no-except-emoji \ > + -Dcache-build=disabled \ > + -Dcache-dir=$(PTXDIST_SYSROOT_HOST)/var/cache/fontconfig \ > + -Ddefault-hinting=slight \ > + -Ddefault-fonts-dirs=[\'$(XORG_FONTDIR)\'] \ > + -Ddefault-sub-pixel-rendering=none \ > + -Ddoc=disabled \ > + -Dfontations=disabled \ > + -Diconv=disabled \ > + -Dnls=disabled \ > + -Dtests=disabled \ > + -Dtools=enabled \ > + -Dxml-backend=expat > > # vim: syntax=make