[vlc-commits] [Git][videolan/vlc][master] 5 commits: contrib: fontconfig: update to 2.18.2

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
0b7d9b83 by Steve Lhomme at 2026-08-13T08:32:41+00:00
contrib: fontconfig: update to 2.18.2

This is a bugfix release [^1].

[^1]: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/releases/2.18.2

- - - - -
8b65c667 by Steve Lhomme at 2026-08-13T08:32:41+00:00
contrib: only list the platforms where fontconfig is disabled

By default it's enabled.

- - - - -
3292346a by Steve Lhomme at 2026-08-13T08:32:41+00:00
contrib: fontconfig: disable user downloaded font on Android

The system fonts should be enough or VLC should use a temporary font if needed.
We don't know what the users downloaded and how it could affect us.

- - - - -
a4c978a9 by Steve Lhomme at 2026-08-13T08:32:41+00:00
contrib: fontconfig: do not build executables

We don't use them, nor the packages that depend on fontconfig.

- - - - -
5bc7d037 by Steve Lhomme at 2026-08-13T08:32:41+00:00
contrib: nettle: don't build tools, example, testsuite

- - - - -


4 changed files:

- contrib/src/fontconfig/SHA512SUMS
- contrib/src/fontconfig/rules.mak
- contrib/src/main.mak
- contrib/src/nettle/rules.mak


Changes:

=====================================
contrib/src/fontconfig/SHA512SUMS
=====================================
@@ -1 +1 @@
-5d637a030625fa5b55399a2711b4dd48949429caae4b80503655bc7bd12b9a58cc278b520660845c9e93dcac4631ad5c36bf97793ac1af1b8f3131e7bd22077c  fontconfig-2.18.1.tar.xz
+88c44d15930ed3c17613e5cebcd2d2abcd090c80d831d6fa968b484993dc16f0ccadc587c44a6385dc3987b256d10132084b3b7d608246d18e1d7db4a5acff87  fontconfig-2.18.2.tar.bz2


=====================================
contrib/src/fontconfig/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # fontconfig
 
-FONTCONFIG_VERSION := 2.18.1
-FONTCONFIG_URL := https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/$(FONTCONFIG_VERSION)/fontconfig-$(FONTCONFIG_VERSION).tar.xz
+FONTCONFIG_VERSION := 2.18.2
+FONTCONFIG_URL := https://gitlab.freedesktop.org/fontconfig/fontconfig/-/archive/$(FONTCONFIG_VERSION)/fontconfig-$(FONTCONFIG_VERSION).tar.bz2
 
 ifneq ($(BUILD_WITH_FONTCONFIG), 0)
 PKGS += fontconfig
@@ -10,12 +10,12 @@ ifeq ($(call need_pkg,"fontconfig >= 2.11"),)
 PKGS_FOUND += fontconfig
 endif
 
-$(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.xz:
+$(TARBALLS)/fontconfig-$(FONTCONFIG_VERSION).tar.bz2:
 	$(call download_pkg,$(FONTCONFIG_URL),fontconfig)
 
-.sum-fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.xz
+.sum-fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.bz2
 
-fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.xz .sum-fontconfig
+fontconfig: fontconfig-$(FONTCONFIG_VERSION).tar.bz2 .sum-fontconfig
 	$(UNPACK)
 	$(call update_autoconfig,.)
 	$(call pkg_static, "fontconfig.pc.in")
@@ -36,7 +36,7 @@ ifdef HAVE_ANDROID
 FONTCONFIG_CONF += \
 	--with-cache-dir=~/.cache/fontconfig \
 	--with-default-fonts=/system/fonts \
-	--with-add-fonts=/product/fonts,/data/fonts
+	--with-add-fonts=/product/fonts
 endif
 
 DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)
@@ -45,8 +45,9 @@ DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)
 FONTCONFIG_CONF += ac_cv_va_copy=.C99
 
 .fontconfig: fontconfig
+	$(RECONF)
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE) $(FONTCONFIG_CONF)
-	+$(MAKEBUILD)
-	+$(MAKEBUILD) install
+	+$(MAKEBUILD) noinst_PROGRAMS= bin_PROGRAMS= check_PROGRAMS=
+	+$(MAKEBUILD) noinst_PROGRAMS= bin_PROGRAMS= check_PROGRAMS= install
 	touch $@


=====================================
contrib/src/main.mak
=====================================
@@ -650,9 +650,6 @@ QT_CMAKE_CONFIG += -DQT_NO_PACKAGE_VERSION_CHECK=TRUE
 endif
 
 ##### fontconfig
-ifdef HAVE_ANDROID
-BUILD_WITH_FONTCONFIG := 1
-else
 ifdef HAVE_DARWIN_OS
 BUILD_WITH_FONTCONFIG := 0
 else
@@ -666,7 +663,6 @@ BUILD_WITH_FONTCONFIG := 1
 endif
 endif
 endif
-endif
 
 
 ifdef GPL


=====================================
contrib/src/nettle/rules.mak
=====================================
@@ -34,5 +34,6 @@ ifndef GPL
 endif
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE) $(NETTLE_CONF)
-	+$(MAKEBUILD) install
+	+$(MAKEBUILD) SUBDIRS=
+	+$(MAKEBUILD) SUBDIRS= install
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f262259f97d8676973862675cbb4858b4feea8bf...5bc7d037ccc8b4c8b6544bae9048af4e004b4a49

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f262259f97d8676973862675cbb4858b4feea8bf...5bc7d037ccc8b4c8b6544bae9048af4e004b4a49
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help