[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: extract SPIRV-Headers-SDK once spirv-tools is extracted in its right place

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
55e410ce by Steve Lhomme at 2024-03-09T11:51:31+00:00
contrib: extract SPIRV-Headers-SDK once spirv-tools is extracted in its right place

- - - - -
10f0c09e by Steve Lhomme at 2024-03-09T11:51:31+00:00
contrib: disable some code and errors in spirv-tools

- - - - -
d203fab0 by Steve Lhomme at 2024-03-09T11:51:31+00:00
contrib: only build the spirv-tools on targets building Qt

Just like qtdeclarative and some other contribs.

Other targets don't need it for now.

- - - - -


1 changed file:

- contrib/src/spirv-tools/rules.mak


Changes:

=====================================
contrib/src/spirv-tools/rules.mak
=====================================
@@ -6,7 +6,10 @@ SPIRVTOOLS_URL := $(GITHUB)/KhronosGroup/SPIRV-Tools/archive/refs/tags/v$(SPIRVT
 SPIRVHEADERS_VERSION := 1.3.246.1
 SPIRVHEADERS_URL := $(GITHUB)/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-$(SPIRVHEADERS_VERSION).tar.gz
 
+ifdef HAVE_WIN32
+# match with Qt targets
 PKGS_TOOLS += spirv-tools
+endif
 ifeq ($(call need_pkg,"SPIRV-Tools >= $(SPIRVTOOLS_VERSION).1"),)
 PKGS_FOUND += spirv-tools
 endif
@@ -23,11 +26,11 @@ spirv-tools: SPIRV-Tools-$(SPIRVTOOLS_VERSION).tar.gz .sum-spirv-tools
 	$(UNPACK)
 	$(MOVE)
 
-spirv-tools/external/spirv-headers: SPIRV-Headers-sdk-$(SPIRVHEADERS_VERSION).tar.gz .sum-spirv-tools
+spirv-tools/external/spirv-headers: SPIRV-Headers-sdk-$(SPIRVHEADERS_VERSION).tar.gz .sum-spirv-tools spirv-tools
 	$(UNPACK)
 	$(MOVE)
 
-SPIRVTOOLS_CONFIG := -DSPIRV_SKIP_TESTS=ON
+SPIRVTOOLS_CONFIG := -DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF -DSPIRV_CHECK_CONTEXT=OFF
 
 .spirv-tools: BUILD_DIR=$</vlc_native
 .spirv-tools: spirv-tools spirv-tools/external/spirv-headers
@@ -35,5 +38,4 @@ SPIRVTOOLS_CONFIG := -DSPIRV_SKIP_TESTS=ON
 	$(BUILDVARS) $(CMAKE_NATIVE) $(SPIRVTOOLS_CONFIG)
 	+$(CMAKEBUILD)
 	$(CMAKEINSTALL)
-
 	touch $@



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/69f935aa8e71ec48869a3063832b2f29eebba3b3...d203fab00835a2d0d76c8927b0973784b251610c

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


VideoLAN code repository instance