[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: CI: update android 3.0 image with gperf

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
994dce1a by Steve Lhomme at 2026-07-02T18:41:14+02:00
CI: update android 3.0 image with gperf

It's needed by fontconfig.
(and it's not in tools yet)

- - - - -
4983f686 by Noor amjad at 2026-07-02T18:41:33+02:00
contrib: ass: enable fontconfig with Android system fonts

(cherry picked from commit 262f61d6ee566438d04fa3bc3a3a937452c28818)
Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

- - - - -


3 changed files:

- contrib/src/ass/rules.mak
- contrib/src/fontconfig/rules.mak
- extras/ci/gitlab-ci.yml


Changes:

=====================================
contrib/src/ass/rules.mak
=====================================
@@ -8,7 +8,7 @@ PKGS_FOUND += ass
 endif
 
 ifdef HAVE_ANDROID
-WITH_FONTCONFIG = 0
+WITH_FONTCONFIG = 1
 else
 ifdef HAVE_TIZEN
 WITH_FONTCONFIG = 0


=====================================
contrib/src/fontconfig/rules.mak
=====================================
@@ -47,6 +47,13 @@ FONTCONFIG_ENV += LIBXML2_CFLAGS=`xml2-config --cflags`
 FONTCONFIG_ENV += LIBXML2_LIBS=`xml2-config --libs`
 endif
 
+ifdef HAVE_ANDROID
+FONTCONFIG_CONF += \
+	--with-cache-dir=~/.cache/fontconfig \
+	--with-default-fonts=/system/fonts \
+	--with-add-fonts=/product/fonts,/data/fonts
+endif
+
 DEPS_fontconfig = freetype2 $(DEPS_freetype2) libxml2 $(DEPS_libxml2)
 
 .fontconfig: fontconfig


=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -21,7 +21,7 @@ variables:
     VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20251223015425
     VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20200229201904
     VLC_DEBIAN_QT6_IMAGE: registry.videolan.org/vlc-debian-unstable:20260121072258
-    VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android-3.0:20260611083443
+    VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android-3.0:20260701183656
     VLC_ANDROID4_IMAGE: registry.videolan.org/vlc-debian-android:20260611225331
     VLC_FLATPAK_IMAGE: registry.videolan.org/vlc-flatpak:20260516184439
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/89a3e0a9bb0752cd82ceff0059883aaf91100f54...4983f686cd7761c1f614fbaf60a5cb044259a1e4

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/89a3e0a9bb0752cd82ceff0059883aaf91100f54...4983f686cd7761c1f614fbaf60a5cb044259a1e4
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