[vlc-commits] [Git][videolan/vlc][master] 3 commits: CI: update windows images with Qt 6.7.1 tools

Steve Lhomme (@robUx4) gitlab at videolan.org
Fri Jun 14 14:24:11 UTC 2024 


Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
e1c5d3a3 by Steve Lhomme at 2024-06-14T13:37:52+00:00
CI: update windows images with Qt 6.7.1 tools

- - - - -
185d3fba by Steve Lhomme at 2024-06-14T13:37:52+00:00
Revert "contrib: qt: allow using Qt tools with different patch version"

This reverts commit 9e089f4edad0ed726dd18e37ea209e360d0e44c9.

- - - - -
37f01a65 by Steve Lhomme at 2024-06-14T13:37:52+00:00
contrib: qt: only allow using the exact same version of native tools

That's what Qt expects, especially with qmlcachegen.

We will need to update the CI as often as Qt.

- - - - -


8 changed files:

- contrib/src/main.mak
- contrib/src/qt/rules.mak
- contrib/src/qt5compat/rules.mak
- contrib/src/qtdeclarative/rules.mak
- contrib/src/qtshadertools/rules.mak
- contrib/src/qtsvg/rules.mak
- contrib/src/qtwayland/rules.mak
- extras/ci/gitlab-ci.yml


Changes:

=====================================
contrib/src/main.mak
=====================================
@@ -18,6 +18,7 @@ VPATH := $(TARBALLS)
 
 # Default Qt version
 QTBASE_VERSION_MAJOR := 6.7
+QTBASE_VERSION := $(QTBASE_VERSION_MAJOR).1
 
 # Common download locations
 GNU ?= http://ftp.gnu.org/gnu
@@ -542,7 +543,7 @@ MESONCLEAN = rm -rf $(BUILD_DIR)/meson-private
 MESONBUILD = meson compile -C $(BUILD_DIR) $(MESON_BUILD) && meson install -C $(BUILD_DIR)
 
 # shared Qt config
-ifeq ($(call system_tool_majmin, qmake6 -query QT_VERSION 2>/dev/null),$(QTBASE_VERSION_MAJOR))
+ifeq ($(call system_tool_version, qmake6 -query QT_VERSION 2>/dev/null, cat),$(QTBASE_VERSION))
 
 ifdef HAVE_CROSS_COMPILE
 QT_LIBEXECS := $(shell qmake6 -query QT_HOST_LIBEXECS)
@@ -552,9 +553,9 @@ QT_LIBEXECS := $(shell qmake6 -query QT_INSTALL_LIBEXECS):$(shell qmake6 -query
 QT_BINS := $(shell qmake6 -query QT_INSTALL_BINS):$(shell qmake6 -query QT_HOST_BINS)
 endif
 
-ifeq ($(call system_tool_majmin, PATH="${QT_LIBEXECS}" moc --version),$(QTBASE_VERSION_MAJOR))
-ifeq ($(call system_tool_majmin, PATH="${QT_BINS}" qsb --version),$(QTBASE_VERSION_MAJOR))
-ifeq ($(call system_tool_majmin, PATH="${QT_LIBEXECS}" qmlcachegen --version),$(QTBASE_VERSION_MAJOR))
+ifeq ($(call system_tool_version, PATH="${QT_LIBEXECS}" moc --version, cat),$(QTBASE_VERSION))
+ifeq ($(call system_tool_version, PATH="${QT_BINS}" qsb --version, cat),$(QTBASE_VERSION))
+ifeq ($(call system_tool_version, PATH="${QT_LIBEXECS}" qmlcachegen --version, cat),$(QTBASE_VERSION))
 QT_USES_SYSTEM_TOOLS = 1
 endif
 endif
@@ -574,10 +575,6 @@ endif
 QT_HOST_PATH := -DQT_HOST_PATH=$(QT_HOST_PREFIX) -DQT_HOST_PATH_CMAKE_DIR=$(QT_HOST_LIBS)/cmake
 endif
 QT_CMAKE_CONFIG := -DCMAKE_TOOLCHAIN_FILE=$(PREFIX)/lib/cmake/Qt6/qt.toolchain.cmake $(QT_HOST_PATH)
-ifdef QT_USES_SYSTEM_TOOLS
-# We checked the versions match, assume we know what we're going
-QT_CMAKE_CONFIG += -DQT_NO_PACKAGE_VERSION_CHECK=TRUE
-endif
 
 ifdef GPL
 REQUIRE_GPL =


=====================================
contrib/src/qt/rules.mak
=====================================
@@ -1,6 +1,5 @@
 # qtbase
 
-QTBASE_VERSION := $(QTBASE_VERSION_MAJOR).1
 # Insert potential -betaX suffix here:
 QTBASE_VERSION_FULL := $(QTBASE_VERSION)
 QTBASE_URL := $(QT)/$(QTBASE_VERSION_FULL)/submodules/qtbase-everywhere-src-$(QTBASE_VERSION_FULL).tar.xz
@@ -98,11 +97,6 @@ QTBASE_NATIVE_CONFIG := $(QTBASE_COMMON_CONFIG) -DQT_BUILD_TESTS=FALSE \
 	-DFEATURE_texthtmlparser=OFF -DFEATURE_cssparser=OFF -DFEATURE_textodfwriter=OFF -DFEATURE_textmarkdownreader=OFF \
 	-DFEATURE_textmarkdownwriter=OFF -DINPUT_libb2=no -DFEATURE_harfbuzz=OFF -DFEATURE_freetype=OFF -DINPUT_opengl=no
 
-ifdef QT_USES_SYSTEM_TOOLS
-# We checked the versions match, assume we know what we're going
-QTBASE_CONFIG += -DQT_NO_PACKAGE_VERSION_CHECK=TRUE
-endif
-
 .qt-tools: BUILD_DIR=$</vlc_native
 .qt-tools: qt
 	$(CMAKECLEAN)


=====================================
contrib/src/qt5compat/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # Qt5Compat
 
-QT5COMPAT_VERSION := $(QTBASE_VERSION_MAJOR).1
+QT5COMPAT_VERSION := $(QTBASE_VERSION)
 QT5COMPAT_URL := $(QT)/$(QT5COMPAT_VERSION)/submodules/qt5compat-everywhere-src-$(QT5COMPAT_VERSION).tar.xz
 
 DEPS_qt5compat += qtdeclarative $(DEPS_qtdeclarative)


=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # QtDeclarative
 
-QTDECLARATIVE_VERSION := $(QTBASE_VERSION_MAJOR).1
+QTDECLARATIVE_VERSION := $(QTBASE_VERSION)
 QTDECLARATIVE_URL := $(QT)/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
 
 DEPS_qtdeclarative-tools = qt-tools $(DEPS_qt-tools) qtshadertools-tools $(DEPS_qtshadertools-tools)


=====================================
contrib/src/qtshadertools/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # qtshadertools
 # required for Qt5Compat, and for qtdeclarative.
 
-QTSHADERTOOLS_VERSION := $(QTBASE_VERSION_MAJOR).1
+QTSHADERTOOLS_VERSION := $(QTBASE_VERSION)
 QTSHADERTOOLS_URL := $(QT)/$(QTSHADERTOOLS_VERSION)/submodules/qtshadertools-everywhere-src-$(QTSHADERTOOLS_VERSION).tar.xz
 
 DEPS_qtshadertools-tools = qt-tools $(DEPS_qt-tools)


=====================================
contrib/src/qtsvg/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # qtsvg
 
-QTSVG_VERSION := $(QTBASE_VERSION_MAJOR).1
+QTSVG_VERSION := $(QTBASE_VERSION)
 QTSVG_URL := $(QT)/$(QTSVG_VERSION)/submodules/qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz
 
 DEPS_qtsvg += qt $(DEPS_qt)


=====================================
contrib/src/qtwayland/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # qtwayland
 
-QTWAYLAND_VERSION := $(QTBASE_VERSION_MAJOR).1
+QTWAYLAND_VERSION := $(QTBASE_VERSION)
 QTWAYLAND_URL := $(QT)/$(QTWAYLAND_VERSION)/submodules/qtwayland-everywhere-src-$(QTWAYLAND_VERSION).tar.xz
 
 ifdef HAVE_LINUX


=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -20,9 +20,9 @@ default:
 
 variables:
     VLC_TEST_TIMEOUT: 60
-    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-posix:20240522152555
-    VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20240531102610
-    VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20240531102610
+    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-posix:20240612181044
+    VLC_WIN_LLVM_MSVCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-msvcrt:20240612181044
+    VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20240612181044
     VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20240402131352
     VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android:20240522152555
     VLC_SNAP_IMAGE: registry.videolan.org/vlc-ubuntu-focal:20231013031754



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/60d10c8dad4a1c5e48af494208588b171fe49876...37f01a65683cf13c14c2eeb6027e1bc339571b78

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/60d10c8dad4a1c5e48af494208588b171fe49876...37f01a65683cf13c14c2eeb6027e1bc339571b78
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