Merge pull request #18234 from fuzzard/depends2

[tools/depends/target] bump dependencies

9 files changed, 69 insertions, 23 deletions

diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index f402a2b71e..f352c3c70a 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -117,6 +117,7 @@ libevdev: libudev
 samba-gplv3: gnutls
 taglib: $(ZLIB)
 dav1d: meson-cross-file
+fribidi: meson-cross-file
 libspdlog: libfmt
 
 .installed-$(PLATFORM): $(DEPENDS)
diff --git a/tools/depends/target/freetype2/Makefile b/tools/depends/target/freetype2/Makefile
index a2c82b757b..1010f02cfe 100644
--- a/tools/depends/target/freetype2/Makefile
+++ b/tools/depends/target/freetype2/Makefile
@@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile
 
 # lib name, version
 LIBNAME=freetype
-VERSION=2.10.1
+VERSION=2.10.2
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.xz
 
diff --git a/tools/depends/target/fribidi/Makefile b/tools/depends/target/fribidi/Makefile
index 1a7afb4225..600025f1db 100644
--- a/tools/depends/target/fribidi/Makefile
+++ b/tools/depends/target/fribidi/Makefile
@@ -3,15 +3,37 @@ DEPS= ../../Makefile.include Makefile
 
 # lib name, version
 LIBNAME=fribidi
-VERSION=1.0.5
+VERSION=1.0.10
 SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.bz2
+ARCHIVE=$(SOURCE).tar.gz
 
-# configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
-          ./configure --prefix=$(PREFIX) --disable-shared --with-glib=no
+MESON_BUILD_TYPE=release
+
+ifeq ($(DEBUG_BUILD), yes)
+  MESON_BUILD_TYPE=debug
+endif
 
-LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a
+# configuration settings
+CONFIGURE = $(NATIVEPREFIX)/bin/python3 $(NATIVEPREFIX)/bin/meson \
+	--buildtype=$(MESON_BUILD_TYPE) \
+	--prefix=$(PREFIX) \
+	-Ddocs=false \
+	-Dtests=false \
+	-Dbin=false \
+	-Ddefault_library=static
+
+ifeq ($(CROSS_COMPILING), yes)
+CONFIGURE += --cross-file $(PREFIX)/share/cross-file.meson
+export CC=$(CC_FOR_BUILD)
+export CXX=$(CXX_FOR_BUILD)
+export CFLAGS=$(CFLAGS_FOR_BUILD)
+export CXXFLAGS=$(CXXFLAGS_FOR_BUILD)
+else
+export CC CXX CFLAGS CXXFLAGS
+endif
+export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig
+
+LIBDYLIB=$(PLATFORM)/build/lib/lib$(LIBNAME).a
 
 all: .installed-$(PLATFORM)
 
@@ -21,14 +43,13 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); $(CONFIGURE)
+	cd $(PLATFORM); $(CONFIGURE) . build
 
 $(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM)
-	touch $@
+	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/gmp/Makefile b/tools/depends/target/gmp/Makefile
index 1bc119f71e..6023d6987f 100644
--- a/tools/depends/target/gmp/Makefile
+++ b/tools/depends/target/gmp/Makefile
@@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile
 
 # lib name, version
 LIBNAME=gmp
-VERSION=6.1.2
+VERSION=6.2.0
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.bz2
 
diff --git a/tools/depends/target/libass/Makefile b/tools/depends/target/libass/Makefile
index 34c9d26819..6d17e80b10 100644
--- a/tools/depends/target/libass/Makefile
+++ b/tools/depends/target/libass/Makefile
@@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile
 
 # lib name, version
 LIBNAME=libass
-VERSION=0.13.4
+VERSION=0.14.0
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
diff --git a/tools/depends/target/libplist/01-disable-tools-tests.patch b/tools/depends/target/libplist/01-disable-tools-tests.patch
index d329459319..d80f8a6ebe 100644
--- a/tools/depends/target/libplist/01-disable-tools-tests.patch
+++ b/tools/depends/target/libplist/01-disable-tools-tests.patch
@@ -3,8 +3,8 @@
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = libcnary src include tools test
+-SUBDIRS = libcnary src include tools test docs
 +SUBDIRS = libcnary src include
+ 
  if HAVE_CYTHON
  SUBDIRS += cython
- endif
diff --git a/tools/depends/target/libplist/Makefile b/tools/depends/target/libplist/Makefile
index 6c2d64f5ba..c7b949f9c4 100644
--- a/tools/depends/target/libplist/Makefile
+++ b/tools/depends/target/libplist/Makefile
@@ -3,16 +3,16 @@ DEPS= ../../Makefile.include Makefile 01-disable-tools-tests.patch
 
 # lib name, version
 LIBNAME=libplist
-VERSION=2.0.0
+VERSION=2.2.0
 SOURCE=$(LIBNAME)-$(VERSION)
 FILENAME=v$(VERSION)
 ARCHIVE=$(SOURCE).tar.bz2
-LIBDYLIB=$(PLATFORM)/src/.libs/libplist++.a
+LIBDYLIB=$(PLATFORM)/src/.libs/libplist++-2.0.a
 CFLAGS+=-fvisibility=default
 all: .installed-$(PLATFORM)
 
 # configuration settings
-CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; CFLAGS="-Dlist_add=plist_list_add" ./configure --prefix=$(PREFIX) --disable-shared --without-cython
+CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; ./configure --prefix=$(PREFIX) --disable-shared --without-cython
 
 $(TARBALLS_LOCATION)/$(ARCHIVE):
 	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
diff --git a/tools/depends/target/libxslt/01-all-disable-tests-docs.patch b/tools/depends/target/libxslt/01-all-disable-tests-docs.patch
new file mode 100644
index 0000000000..e2e839fbd9
--- /dev/null
+++ b/tools/depends/target/libxslt/01-all-disable-tests-docs.patch
@@ -0,0 +1,26 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -416,12 +416,9 @@
+ SUBDIRS = \
+ 	libxslt \
+ 	libexslt \
+-	xsltproc \
+-	doc \
+-	$(PYTHON_SUBDIR) \
+-	tests
++	$(PYTHON_SUBDIR)
+ 
+-DIST_SUBDIRS = libxslt libexslt xsltproc python doc tests
++DIST_SUBDIRS = libxslt libexslt python
+ confexecdir = $(libdir)
+ confexec_DATA = xsltConf.sh
+ bin_SCRIPTS = xslt-config
+@@ -1056,7 +1053,7 @@
+ 	       < $(srcdir)/xsltConf.sh.in > xsltConf.tmp \
+ 	&& mv xsltConf.tmp xsltConf.sh
+ 
+-check-local: tests
++check-local:
+ 
+ dummy:
+ 
diff --git a/tools/depends/target/libxslt/Makefile b/tools/depends/target/libxslt/Makefile
index 0d0465e0db..af14c43802 100644
--- a/tools/depends/target/libxslt/Makefile
+++ b/tools/depends/target/libxslt/Makefile
@@ -1,9 +1,9 @@
 include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile
+DEPS= ../../Makefile.include Makefile 01-all-disable-tests-docs.patch
 
 # lib name, version
 LIBNAME=libxslt
-VERSION=1.1.29
+VERSION=1.1.34
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
@@ -21,9 +21,7 @@ $(TARBALLS_LOCATION)/$(ARCHIVE):
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	sed -ie "s|runtest$$(EXEEXT)||" "$(PLATFORM)/Makefile.in"
-	sed -ie "s|testrecurse$$(EXEEXT)||" "$(PLATFORM)/Makefile.in"
-	sed -ie "s|xsltproc||" "$(PLATFORM)/Makefile.in"
+	cd $(PLATFORM); patch -p1 -i ../01-all-disable-tests-docs.patch
 	cd $(PLATFORM); $(CONFIGURE)
 
 $(LIBDYLIB): $(PLATFORM)