[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: vulkan*: do not require CMake 3.22

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
4f515fa9 by Steve Lhomme at 2026-08-16T15:54:46+00:00
contrib: vulkan*: do not require CMake 3.22

We currently require CMake 3.21. And it builds fine with CMake 3.21.
It was just bumped to match SPIRV [^1] [^2].

[^1]: https://github.com/KhronosGroup/Vulkan-Headers/commit/234c4b7370a8ea3239a214c9e871e4b17c89f4ab
[^2]: https://github.com/KhronosGroup/Vulkan-Loader/commit/b05d038c3348a8c8d4024abe84c7411b3068ebe7

- - - - -
09d04c78 by Steve Lhomme at 2026-08-16T15:54:46+00:00
contrib: vulkan-headers: remove old headers before building

Older headers can lead to build issues.

- - - - -


2 changed files:

- contrib/src/vulkan-headers/rules.mak
- contrib/src/vulkan-loader/rules.mak


Changes:

=====================================
contrib/src/vulkan-headers/rules.mak
=====================================
@@ -35,9 +35,12 @@ $(TARBALLS)/Vulkan-Headers-$(VULKAN_HEADERS_VERSION).tar.gz:
 
 vulkan-headers: Vulkan-Headers-$(VULKAN_HEADERS_VERSION).tar.gz .sum-vulkan-headers
 	$(UNPACK)
+	# avoid unnecessary dependency on CMake 3.22
+	sed -i.orig 's,VERSION 3.22.1, VERSION 3.21,' $(UNPACK_DIR)/CMakeLists.txt
 	$(MOVE)
 
 .vulkan-headers: vulkan-headers toolchain.cmake
+	rm -rf $(PREFIX)/include/vulkan
 	$(CMAKECLEAN)
 	$(HOSTVARS_CMAKE) $(CMAKE)
 	+$(CMAKEBUILD)


=====================================
contrib/src/vulkan-loader/rules.mak
=====================================
@@ -47,6 +47,8 @@ vulkan-loader: Vulkan-Loader-$(VULKAN_LOADER_VERSION).tar.gz .sum-vulkan-loader
 ifeq ($(HOST),i686-w64-mingw32)
 	cp -v $(SRC)/vulkan-loader/libvulkan-32.def $(UNPACK_DIR)/loader/vulkan-1.def
 endif
+	# avoid unnecessary dependency on CMake 3.22
+	sed -i.orig 's,VERSION 3.22.1, VERSION 3.21,' $(UNPACK_DIR)/CMakeLists.txt
 	$(call pkg_static,"loader/vulkan.pc.in")
 	$(MOVE)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/97afcce5049b25dcd1e8448b539c8e3c356b9bd9...09d04c78ac62e92b95c23aeb2af25bbbcd7da051

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/97afcce5049b25dcd1e8448b539c8e3c356b9bd9...09d04c78ac62e92b95c23aeb2af25bbbcd7da051
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