Skip to contentSkip to conversation

package/fontconfig: bump to 2.16.0

PATCH In review Thomas Devoogdt 2 participants 6 messages Jan 25, 2025 – Jan 27, 2025 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/fontconfig: bump to 2.16.0

Announcements:
2.16.0: https://lists.freedesktop.org/archives/fontconfig/2025-January/007143.html
2.15.0: https://lists.freedesktop.org/archives/fontconfig/2023-December/007064.html

Some notes:

- The hash is no longer part of the announcement but can instead be found in the release archive.

- Switched to meson while at it.

- Dropped the patch, since it's part of the autotools.

- Dropped some configs args, --with-arch, --disable-static, since meson now handles the arch, and disable static as it has most probably not been needed anymore for years. Was part of commit dd4faf6f6f3fb32657b5d0c4fb72d15a7f571b2e. "cairo: add host version"

---
 ...read-as-a-dependency-of-a-static-lib.patch | 43 -------------------
 package/fontconfig/fontconfig.hash            |  4 +-
 package/fontconfig/fontconfig.mk              | 16 +++----
 3 files changed, 7 insertions(+), 56 deletions(-)
 delete mode 100644 package/fontconfig/0001-add-pthread-as-a-dependency-of-a-static-lib.patch
package/fontconfig/0001-add-pthread-as-a-dependency-of-a-static-lib.patch deleted +0 -43
deleted file mode 100644
index c6aa514534..0000000000
@@ -1,43 +0,0 @@
-From 40ec04a8bf36dd8d0aa3da98b167792ce2dcd114 Mon Sep 17 00:00:00 2001
-From: Silvan Scherrer <[email protected]>
-Date: Sun, 20 Sep 2020 12:52:08 +0200
-Subject: [PATCH] add pthread as a dependency of a static lib
-
-Downloaded from https://trac.netlabs.org/ports/changeset/2220
-
-Upstream: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/merge_requests/121
-
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- configure.ac     | 2 ++
- fontconfig.pc.in | 4 ++--
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f3189a7..594d6fd 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -690,6 +690,8 @@ fi
- have_pthread=false
- if test "$os_win32" = no; then
- 	AX_PTHREAD([have_pthread=true])
-+	AC_SUBST(PTHREAD_CFLAGS)
-+	AC_SUBST(PTHREAD_LIBS)
- fi
- if $have_pthread; then
- 	LIBS="$PTHREAD_LIBS $LIBS"
-diff --git a/fontconfig.pc.in b/fontconfig.pc.in
-index 61b35fb..f823bac 100644
---- a/fontconfig.pc.in
-+++ b/fontconfig.pc.in
-@@ -14,5 +14,5 @@ Version: @VERSION@
- Requires: @PKGCONFIG_REQUIRES@
- Requires.private: @PKGCONFIG_REQUIRES_PRIVATELY@
- Libs: -L${libdir} -lfontconfig
--Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@
--Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@
-+Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@ @PTHREAD_LIBS@
-+Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@ @PTHREAD_CFLAGS@
--- 
-2.27.0
-
package/fontconfig/fontconfig.hash +2 -2
index a4f87caf1e..b9c95d40b2 100644
@@ -1,5 +1,5 @@
-# From https://lists.freedesktop.org/archives/fontconfig/2023-January/006950.html
-sha256  dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b  fontconfig-2.14.2.tar.xz
+# From https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.16.0.tar.xz.sha256sum
+sha256  6a33dc555cc9ba8b10caf7695878ef134eeb36d0af366041f639b1da9b6ed220  fontconfig-2.16.0.tar.xz
 
 # Locally calculated
 sha256  51a51aa9823704fd90bccc616cdd17ebabb5b2b3e9cbde886ca02c7002288067  COPYING
package/fontconfig/fontconfig.mk +5 -11
index 11758a4c80..b60086c9c8 100644
@@ -4,11 +4,9 @@
 #
 ################################################################################
 
-FONTCONFIG_VERSION = 2.14.2
+FONTCONFIG_VERSION = 2.16.0
 FONTCONFIG_SITE = https://www.freedesktop.org/software/fontconfig/release
 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.xz
-# 0001-add-pthread-as-a-dependency-of-a-static-lib.patch
-FONTCONFIG_AUTORECONF = YES
 FONTCONFIG_INSTALL_STAGING = YES
 FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf \
 	$(if $(BR2_PACKAGE_UTIL_LINUX_LIBS),util-linux-libs,util-linux) \
@@ -21,12 +19,8 @@ FONTCONFIG_LICENSE_FILES = COPYING
 FONTCONFIG_CPE_ID_VALID = YES
 
 FONTCONFIG_CONF_OPTS = \
-	--with-arch=$(GNU_TARGET_NAME) \
-	--with-cache-dir=/var/cache/fontconfig \
-	--disable-docs
+	-Dcache-dir=/var/cache/fontconfig \
+	-Ddoc=disabled
 
-HOST_FONTCONFIG_CONF_OPTS = \
-	--disable-static
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
+$(eval $(meson-package))
+$(eval $(host-meson-package))
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 15 lines · Thomas Devoogdt

Announcements:
2.16.0:
https://lists.freedesktop.org/archives/fontconfig/2025-January/007143.html
2.15.0:
https://lists.freedesktop.org/archives/fontconfig/2023-December/007064.html

Some notes:

- The hash is no longer part of the announcement but can instead be found in the release archive.

- Switched to meson while at it.

- Dropped the patch, since it's part of the autotools.

Quoted 7 lines

- Dropped some configs args, --with-arch, --disable-static, since meson now handles the arch, and disable static as it has most probably not been needed anymore for years. Was part of commit dd4faf6f6f3fb32657b5d0c4fb72d15a7f571b2e. "cairo: add host version"

Applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw
In reply to Thomas Devoogdt

Hi Thomas,

package/fontconfig/fontconfig.mk line 7

Quoted 2 lines · Thomas Devoogdt
package/fontconfig/fontconfig.mk +1 -1
-FONTCONFIG_VERSION = 2.14.2
+FONTCONFIG_VERSION = 2.16.0

This bump seems to introduce new build failures. See:
https://autobuild.buildroot.org/?reason=fontconfig-2.16.0

Those failures seems related to:
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/436

Can have a look please?

Best regards,

Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw

PATCH 1/2 package/fontconfig: fix compile issue if BR2_DEBUG_3 has been selected

src/fcobjshash.gperf:568:7: error: stray '#' in program
src/fcobjshash.gperf:1:18: error: expected '=', ',', ';', 'asm' or '__attribute__' before numeric constant

    1 | #define __STDC__ 1
      |                  ^

This issue has been raised upstream [1], and reported in buildroot [2]. Upstream has not yet defined a solution, so force it to -g2 for the time being.

Fixes:
- https://autobuild.buildroot.org/results/6ae/6aef28611ad05d8db65105ab150ae980bc6bff4e/build-end.log
- https://autobuild.buildroot.org/results/cc3/cc38846fdf63954422ec08d3ae57f2f09ebbf8c8/build-end.log
- https://autobuild.buildroot.org/results/b7a/b7ad9a7ecb1d06b8a3d9e86d386195f3c212b9d8/build-end.log
- ...

[1] https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/436
[2] https://patchwork.ozlabs.org/comment/3450162/

---
 package/fontconfig/fontconfig.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/fontconfig/fontconfig.mk +6 -0
index cc6ca88585..c6375979e8 100644
@@ -20,5 +20,11 @@ FONTCONFIG_CONF_OPTS = \
 	-Dcache-dir=/var/cache/fontconfig \
 	-Ddoc=disabled
 
+FONTCONFIG_CFLAGS = $(TARGET_CFLAGS)
+
+ifeq ($(BR2_DEBUG_3),y)
+FONTCONFIG_CFLAGS += -g2
+endif
+
 $(eval $(meson-package))
 $(eval $(host-meson-package))
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

PATCH 2/2 package/fontconfig: fix compilation on targets without pthread support

From: Thomas Devoogdt <[email protected]>

The br-arm-full-nothread fails because meson (wrongly) assumes thread support when cross-compiling. So add an explicit check on pthread support.

Fixes:
- https://autobuild.buildroot.org/results/5b0/5b0ae4c858e9debddf9bd9bd86cfacb6951b4c3f/build-end.log

---
 ...explicitly-check-for-pthread-support.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/fontconfig/0001-meson.build-explicitly-check-for-pthread-support.patch
package/fontconfig/0001-meson.build-explicitly-check-for-pthread-support.patch new file +37 -0
new file mode 100644
index 0000000000..ca394ab7d5
@@ -0,0 +1,37 @@
+From 3c9de31dda1a1d44fade7a61e66c989178d6c2a4 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <[email protected]>
+Date: Sun, 26 Jan 2025 10:15:39 +0100
+Subject: [PATCH] meson.build: explicitly check for pthread support
+
+Tested using buildroot. The br-arm-full-nothread fails
+because meson assumes thread support when cross-compiling.
+
+Dependency threads found: YES unknown (cached)
+Has header "pthread.h" : NO
+
+Upstream: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/commit/aad470dad519b6fe3459023b82941b4414b71313
+Signed-off-by: Thomas Devoogdt <[email protected]>
+---
+ meson.build | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 4439758..07e242b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -383,8 +383,10 @@ endif
+ 
+ if host_machine.system() != 'windows'
+   thread_dep = dependency('threads')
+-  conf.set('HAVE_PTHREAD', 1)
+-  deps += [thread_dep]
++  if thread_dep.found() and cc.has_header('pthread.h')
++    conf.set('HAVE_PTHREAD', 1)
++    deps += [thread_dep]
++  endif
+ endif
+ 
+ fc_templatedir = get_option('template-dir')
+-- 
+2.43.0
+
Signature · 6 lines
2.43.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#5 lore raw

Re: [Buildroot] [PATCH 1/2] package/fontconfig: fix compile issue if BR2_DEBUG_3 has been selected

In reply to Thomas Devoogdt
Quoted 17 lines · Thomas Devoogdt

src/fcobjshash.gperf:568:7: error: stray '#' in program
src/fcobjshash.gperf:1:18: error: expected '=', ',', ';', 'asm' or '__attribute__' before numeric constant

    1 | #define __STDC__ 1
      |                  ^

This issue has been raised upstream [1], and reported in buildroot [2]. Upstream has not yet defined a solution, so force it to -g2 for the time being.

Fixes:
-
https://autobuild.buildroot.org/results/6ae/6aef28611ad05d8db65105ab150ae980bc6bff4e/build-end.log
-
https://autobuild.buildroot.org/results/cc3/cc38846fdf63954422ec08d3ae57f2f09ebbf8c8/build-end.log
-
https://autobuild.buildroot.org/results/b7a/b7ad9a7ecb1d06b8a3d9e86d386195f3c212b9d8/build-end.log
- ...

Quoted 4 lines

[1] https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/436
[2] https://patchwork.ozlabs.org/comment/3450162/

Series applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot