[vlc-commits] [Git][videolan/vlc][3.0.x] 6 commits: CI: update mingw64 gcc images
Felix Paul Kühne (@fkuehne)
gitlab at videolan.org
Sun Sep 7 10:30:34 UTC 2025
Felix Paul Kühne pushed to branch 3.0.x at VideoLAN / VLC
Commits:
373a6c17 by Steve Lhomme at 2025-09-05T13:20:03+02:00
CI: update mingw64 gcc images
These images were for 4.0 but are not used anymore there (LLVM or gcc-posix).
They are based on Debian bullseye, rather than Debian stretch in the previous
images.
They correspond to the last commit before upgrading protoc to match VLC4.
gcc is version 11, mingw-w64 is v10.
- - - - -
063c3285 by Steve Lhomme at 2025-09-05T13:20:03+02:00
CI: update snap image
It contains python 3.8 and CMake 3.7 + protoc 3.10.
- - - - -
fe4ab67e by Steve Lhomme at 2025-09-05T14:56:42+02:00
extras: snap: force using local ninja
The vlc-ubuntu-bionic:20250904134924 contains ninja-1.13.0.git.kitware.jobserver-pipe-1.
It supports jobserver as a client like the old kitware fork. But it only
does so when combined with GNU make 4.4.
It seems to mess the job sharing in the CI so use the one that is validated
with old GNU make versions.
- - - - -
5272a87d by Steve Lhomme at 2025-09-05T14:57:31+02:00
extras: snap: build all tools at once in parallel
We don't build CMake anymore so we don't have dependency problems.
- - - - -
b9e3d51b by Felix Paul Kühne at 2025-09-05T14:57:31+02:00
extras/tools: update meson to 0.63.0
(cherry picked from commit bb18231acda9a8983a8a765d2e00701be045b141) (rebased)
rebased:
- the sha512 around are different
- - - - -
6999a3c9 by Steve Lhomme at 2025-09-05T14:57:31+02:00
tools: require meson 0.60
This is needed for newer harfbuzz and possibly other contribs we should backport.
- - - - -
5 changed files:
- extras/ci/gitlab-ci.yml
- extras/package/snap/snapcraft.yaml
- extras/tools/SHA512SUMS
- extras/tools/bootstrap
- extras/tools/packages.mak
Changes:
=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -13,14 +13,14 @@ default:
interruptible: true
variables:
- VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32-3.0:20211008142723
- VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-3.0:20211008140026
+ VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32:20221011221351
+ VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64:20221011230137
VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20211020111246
VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20250826105319
VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20200229201904
VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android-3.0:20250626142950
VLC_ANDROID4_IMAGE: registry.videolan.org/vlc-debian-android:20250626142950
- VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-bionic:20190627090437
+ VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-bionic:20250904134924
.variables-debian: &variables-debian
HOST_ARCH: x86_64
=====================================
extras/package/snap/snapcraft.yaml
=====================================
@@ -67,9 +67,8 @@ parts:
override-build: |
sed -i 's|0\.19\.8|0\.19\.7|' configure.ac
cd extras/tools
- ./bootstrap
- make -j $(getconf _NPROCESSORS_ONLN) .nasm .meson .cmake
- make -j $(getconf _NPROCESSORS_ONLN) .protoc
+ NEEDED="ninja" ./bootstrap
+ make -j $(getconf _NPROCESSORS_ONLN)
cd ../../
export PATH=$PWD/extras/tools/build/bin:$PATH
cd contrib && mkdir linux && cd linux
=====================================
extras/tools/SHA512SUMS
=====================================
@@ -15,7 +15,7 @@ d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e6774
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e flex-2.6.4.tar.gz
8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd nasm-2.14.tar.gz
d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942 help2man-1.47.6.tar.xz
-3b6cc5cae31d756b251ecde3483d3710bceff50cfd03ef6cf6f939d9e599998e61fcb03a2ee09d6a6f9bfa2198f43e7f20447359de3bff1055febcf03e82e514 meson-0.56.2.tar.gz
+8d427261bb42d2bd1da7d4f7b5f53908044aa2cea6d020fb320b0ab9d9848e17cf28deb12ae6dc139807f9e377db0c8a546561e94301216b634bd77703f17cea meson-0.63.0.tar.gz
37b3a421419b16930e53181c431fe3b4afd55ac54733a5df08376641fd2fb88eeb73ee7abe3788f3e491e7c1b215c7f35aefa66f44b09008ad22b76ab2998830 ninja-1.11.1.tar.gz
27acef46d9eb67203d708b57d80b853f76fa4b9c2720ff36ec161e6cdf702249e7982214ddf60bae75511aa79bc7d92aa27e3eab7ef9c0f5c040e8e42e76a385 libtool-2.4.7.tar.gz
e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04 gettext-0.22.tar.gz
=====================================
extras/tools/bootstrap
=====================================
@@ -145,7 +145,7 @@ check bison 3.0.0
check flex
check_nasm 2.14
check help2man
-check meson 0.54.2
+check meson 0.60.0
check ninja
check gettext
=====================================
extras/tools/packages.mak
=====================================
@@ -60,7 +60,7 @@ GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
HELP2MAN_VERSION=1.47.6
HELP2MAN_URL=$(GNU)/help2man/help2man-$(HELP2MAN_VERSION).tar.xz
-MESON_VERSION=0.56.2
+MESON_VERSION=0.63.0
MESON_URL=https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)/meson-$(MESON_VERSION).tar.gz
NINJA_VERSION=1.11.1
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/262a5d95f5f6f23ec7fd9aef02bcd5c36dae5fb2...6999a3c99ee8a335f3d3c72f884f4099a6a9b27d
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/262a5d95f5f6f23ec7fd9aef02bcd5c36dae5fb2...6999a3c99ee8a335f3d3c72f884f4099a6a9b27d
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list