[tools/depends][target] fontconfig bump 2.14.0

6 files changed, 31 insertions, 80 deletions

diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index 9e3f969bf9..a7b29eeaa4 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -137,7 +137,7 @@ curl: openssl nghttp2
 dav1d: meson-cross-file
 dbus: expat
 ffmpeg: $(ICONV) $(ZLIB) bzip2 gnutls dav1d $(LIBVA)
-fontconfig: freetype2 expat $(ICONV) $(LIBUUID)
+fontconfig: freetype2 expat $(ICONV) $(LIBUUID) meson-cross-file
 freetype2: harfbuzz $(ZLIB)
 fribidi: meson-cross-file
 gettext: $(ICONV)
diff --git a/tools/depends/target/fontconfig/01-disable-test.patch b/tools/depends/target/fontconfig/01-disable-test.patch
deleted file mode 100644
index f3c6cfe3c1..0000000000
--- a/tools/depends/target/fontconfig/01-disable-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -24,7 +24,7 @@
- SUBDIRS=fontconfig fc-case fc-lang src \
- 	fc-cache fc-cat fc-conflist fc-list fc-match \
- 	fc-pattern fc-query fc-scan fc-validate conf.d \
--	its po po-conf test
-+	its po po-conf
- if ENABLE_DOCS
- SUBDIRS += doc
- endif
diff --git a/tools/depends/target/fontconfig/FONTCONFIG-VERSION b/tools/depends/target/fontconfig/FONTCONFIG-VERSION
new file mode 100644
index 0000000000..60e2d311df
--- /dev/null
+++ b/tools/depends/target/fontconfig/FONTCONFIG-VERSION
@@ -0,0 +1,7 @@
+LIBNAME=fontconfig
+VERSION=2.14.0
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
+SHA512=a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc
+BYPRODUCT=libfontconfig.a
+
+BASE_URL=https://www.freedesktop.org/software/fontconfig/release
diff --git a/tools/depends/target/fontconfig/Makefile b/tools/depends/target/fontconfig/Makefile
index d5e3990992..4386e54f0a 100644
--- a/tools/depends/target/fontconfig/Makefile
+++ b/tools/depends/target/fontconfig/Makefile
@@ -1,43 +1,41 @@
-include ../../Makefile.include
-DEPS = ../../Makefile.include 01-disable-test.patch lconv.patch fix-aarch64_atomics.patch Makefile ../../download-files.include
-
-# lib name, version
-LIBNAME=fontconfig
-VERSION=2.13.1
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.bz2
-SHA512=f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100
-include ../../download-files.include
+include ../../Makefile.include FONTCONFIG-VERSION ../../download-files.include
+DEPS = ../../Makefile.include FONTCONFIG-VERSION Makefile ../../download-files.include
 
 # configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) \
-  --disable-libxml2 --disable-docs --with-arch=$(PLATFORM) --disable-shared
+MESON_BUILD_TYPE=release
 
-ifeq ($(OS),android)
-  # Freetype with Harfbuzz support requires stdc++ lib linking
-  # Fontconfig uses clang and not clang++, therefore we need the explicit stdc++ link
-  export LDFLAGS+= -lstdc++
+ifeq ($(DEBUG_BUILD), yes)
+  MESON_BUILD_TYPE=debug
 endif
 
-LIBDYLIB=$(PLATFORM)/src/.libs/lib$(LIBNAME).a
+# configuration settings
+CONFIGURE = $(NATIVEPREFIX)/bin/python3 $(NATIVEPREFIX)/bin/meson \
+                --buildtype=$(MESON_BUILD_TYPE) \
+                --prefix=$(PREFIX) \
+                -Ddoc=disabled \
+                -Dtests=disabled \
+                -Dtools=disabled \
+                -Ddefault_library=static
+
+ifeq ($(CROSS_COMPILING), yes)
+  CONFIGURE += -Dcache-build=disabled \
+               --cross-file $(PREFIX)/share/cross-file.meson
+endif
 
-all: .installed-$(PLATFORM)
+LIBDYLIB=$(PLATFORM)/build/src/$(BYPRODUCT)
 
+all: .installed-$(PLATFORM)
 
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -p1 -i ../01-disable-test.patch
-	cd $(PLATFORM); patch -p1 -i ../lconv.patch
-	cd $(PLATFORM); patch -p1 -i ../fix-aarch64_atomics.patch
-	cd $(PLATFORM); $(AUTORECONF) -vif
-	cd $(PLATFORM); $(CONFIGURE)
+	cd $(PLATFORM); $(CONFIGURE) . build
 
 $(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM)
+	cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v
 
 .installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM) install
+	cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v install
 	touch $@
 
 clean:
diff --git a/tools/depends/target/fontconfig/fix-aarch64_atomics.patch b/tools/depends/target/fontconfig/fix-aarch64_atomics.patch
deleted file mode 100644
index 67ec51deeb..0000000000
--- a/tools/depends/target/fontconfig/fix-aarch64_atomics.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/fcatomic.h
-+++ b/src/fcatomic.h
-@@ -70,18 +70,18 @@
- #elif !defined(FC_NO_MT) && defined(__APPLE__)
- 
- #include <libkern/OSAtomic.h>
--#ifdef __MAC_OS_X_MIN_REQUIRED
- #include <AvailabilityMacros.h>
--#elif defined(__IPHONE_OS_MIN_REQUIRED)
--#include <Availability.h>
--#endif
- 
- typedef int fc_atomic_int_t;
- #define fc_atomic_int_add(AI, V)	(OSAtomicAdd32Barrier ((V), &(AI)) - (V))
- 
- #define fc_atomic_ptr_get(P)		(OSMemoryBarrier (), (void *) *(P))
- #if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100)
-+#if __aarch64__
-+#define fc_atomic_ptr_cmpexch(P,O,N)	OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
-+#else
- #define fc_atomic_ptr_cmpexch(P,O,N)	OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
-+#endif
- #else
- #if __ppc64__ || __x86_64__
- #define fc_atomic_ptr_cmpexch(P,O,N)	OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
diff --git a/tools/depends/target/fontconfig/lconv.patch b/tools/depends/target/fontconfig/lconv.patch
deleted file mode 100644
index 2b26619373..0000000000
--- a/tools/depends/target/fontconfig/lconv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/fcxml.c
-+++ b/src/fcxml.c
-@@ -1330,6 +1330,7 @@
- static double
- FcStrtod (char *s, char **end)
- {
-+#if 0
- #ifndef __BIONIC__
-     struct lconv    *locale_data;
- #endif
-@@ -1387,6 +1388,7 @@
-     else
- 	v = strtod (s, end);
-     return v;
-+#endif
- }
- 
- static void