* [ptxdist] [PATCH] fontconfig: version bump 2.14.2 -> 2.17.1
@ 2025-10-14 15:19 Sven Püschel
2025-10-17 15:14 ` Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Sven Püschel @ 2025-10-14 15:19 UTC (permalink / raw)
To: ptxdist; +Cc: 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 +++++++++++++++++++------------------------
2 files changed, 21 insertions(+), 25 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
--
2.47.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [PATCH] fontconfig: version bump 2.14.2 -> 2.17.1
2025-10-14 15:19 [ptxdist] [PATCH] fontconfig: version bump 2.14.2 -> 2.17.1 Sven Püschel
@ 2025-10-17 15:14 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2025-10-17 15:14 UTC (permalink / raw)
To: Sven Püschel; +Cc: ptxdist
On Tue, Oct 14, 2025 at 05:19:49PM +0200, 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 <s.pueschel@pengutronix.de>
> ---
> rules/fontconfig.in | 1 +
> rules/fontconfig.make | 45 +++++++++++++++++++------------------------
> 2 files changed, 21 insertions(+), 25 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
host-fontconfig needs the same thing.
Michael
> 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
> --
> 2.47.3
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-10-17 15:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-10-14 15:19 [ptxdist] [PATCH] fontconfig: version bump 2.14.2 -> 2.17.1 Sven Püschel
2025-10-17 15:14 ` Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox