[ptxdist] [PATCH v2] fontconfig: version bump 2.14.2 -> 2.17.1

[ptxdist] [PATCH v2] fontconfig: version bump 2.14.2 -> 2.17.1

[Sven Püschel]

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 <s.pueschel@pengutronix.de>
---
 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

Re: [ptxdist] [APPLIED] fontconfig: version bump 2.14.2 -> 2.17.1

[Michael Olbrich]

Thanks, applied as 4f4900e1e6d9c6fbf1926eeed99797d54875bc0a.

Michael

[sent from post-receive hook]

On Fri, 07 Nov 2025 09:53:20 +0100, Sven Püschel <s.pueschel@pengutronix.de> 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 <s.pueschel@pengutronix.de>
> Message-Id: <20251021081038.1373513-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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