[vlc-commits] [Git][videolan/vlc][master] 5 commits: ci: update snap docker image

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
e6bb6a35 by Pierre Lamot at 2026-03-14T13:47:02+00:00
ci: update snap docker image

fix: #29649

- - - - -
42dfc681 by Pierre Lamot at 2026-03-14T13:47:02+00:00
configure: fix --enable-qt-qml-cache option not respected when explicitly set

- - - - -
3c0755aa by Pierre Lamot at 2026-03-14T13:47:02+00:00
snap: don't use qml-cache

Qml caches is usually tied to particular qt version, this should be more
flexible toward qt version upgrade

- - - - -
b45088c6 by Pierre Lamot at 2026-03-14T13:47:02+00:00
snap: add udisks2 plug

- - - - -
d77c72b0 by Pierre Lamot at 2026-03-14T13:47:02+00:00
ci: fix snapcraft failing to clone VLC project

the CI already do `git config --global --add safe.directory ${CI_PROJECT_DIR}`
before running build scripts, but snap tries to clone from the .git folder

- - - - -


3 changed files:

- configure.ac
- extras/ci/gitlab-ci.yml
- extras/package/snap/snapcraft.yaml


Changes:

=====================================
configure.ac
=====================================
@@ -4313,10 +4313,8 @@ AS_IF([test "${enable_qt}" != "no"], [
 
 AC_ARG_ENABLE([qt-qml-cache],
   AS_HELP_STRING([--disable-qt-qml-cache],
-    [disable qml cache generation and basic error checking]),
-    [],
-    [enable_qml_cache="yes"])
-AM_CONDITIONAL([HAVE_QMLCACHEGEN], [test "${enable_qml_cache}" = "yes" && test "$QMLCACHEGEN" != "no"])
+    [disable qml cache generation and basic error checking]))
+AM_CONDITIONAL([HAVE_QMLCACHEGEN], [test "${enable_qt_qml_cache}" != "no" && test "$QMLCACHEGEN" != "no"])
 
 AC_ARG_ENABLE([qt-qml-debug],
   AS_HELP_STRING([--enable-qt-qml-debug], [enable qml debugger]))


=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -27,7 +27,7 @@ variables:
     VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20260121170706
     VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20260121072258
     VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20260120134731
-    VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-snap:20251117145936
+    VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-snap:20260312133043
     VLC_RASPBIAN_IMAGE: registry.videolan.org/vlc-ubuntu-raspberry:20260120134731
     VLC_WASM_EMSCRIPTEN: registry.videolan.org/vlc-debian-wasm-emscripten:20260120134731
 
@@ -423,6 +423,7 @@ debian-meson:
         name: $VLC_SNAP_IMAGE
         entrypoint: [""]
     script:
+        - git config --global --add safe.directory ${CI_PROJECT_DIR}/.git
         - extras/package/snap/build.sh -p
     allow_failure: true
     variables: *variables-snap


=====================================
extras/package/snap/snapcraft.yaml
=====================================
@@ -45,6 +45,7 @@ apps:
       - removable-media
       - screen-inhibit-control
       - pipewire
+      - udisks2
     slots:
       - mpris
 parts:
@@ -105,6 +106,7 @@ parts:
          --prefix=/usr \
          --enable-merge-ffmpeg \
          --enable-extra-checks \
+         --disable-qt-qml-cache \
          --disable-pipewire
 
       make -j ${CRAFT_PARALLEL_BUILD_COUNT}



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4bc8283e46de625057499127441e082c295ed2e4...d77c72b0013421997fe292e83ffdb70b7502b019

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/4bc8283e46de625057499127441e082c295ed2e4...d77c72b0013421997fe292e83ffdb70b7502b019
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance