From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 21 Oct 2025 10:10:52 +0200 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 1vB7SG-00ABXd-1h for lore@lore.pengutronix.de; Tue, 21 Oct 2025 10:10:52 +0200 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 1vB7SG-0001LT-7j; Tue, 21 Oct 2025 10:10:52 +0200 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1vB7S4-0001LF-Iv; Tue, 21 Oct 2025 10:10:40 +0200 From: =?UTF-8?q?Sven=20P=C3=BCschel?= To: ptxdist@pengutronix.de Date: Tue, 21 Oct 2025 10:10:02 +0200 Message-ID: <20251021081038.1373513-1-s.pueschel@pengutronix.de> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH v2] 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 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 --- rules/fontconfig.in | 1 + rules/fontconfig.make | 45 +++++++++++++++++--------------------- rules/host-fontconfig.in | 1 + rules/host-fontconfig.make | 37 ++++++++++++++----------------- 4 files changed, 39 insertions(+), 45 deletions(-) diff --git a/rules/fontconfig.in b/rules/fontconfig.in index 61f4b8842..937b81bf9 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 95510bf75..d3357b6e0 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 919292896..19e84ca37 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 3845a23ce..ee8c887c3 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 -- 2.47.3