Browse Source

contrib: spirv-tools: remove this contrib

It's only used by qtshadertools/qsb to optimize the Vulkan output.
We do not use that on any platform for now.

Even when using Vulkan it's optional and will work without.
pull/162/head
Steve Lhomme 2 years ago
parent
commit
223fdb125a
  1. 2
      contrib/src/qtdeclarative/rules.mak
  2. 2
      contrib/src/qtshadertools/rules.mak
  3. 2
      contrib/src/spirv-tools/SHA512SUMS
  4. 41
      contrib/src/spirv-tools/rules.mak

2
contrib/src/qtdeclarative/rules.mak

@ -8,7 +8,7 @@ DEPS_qtdeclarative-tools := qt-tools $(DEPS_qt-tools) qtshadertools-tools $(DEPS
DEPS_qtdeclarative = qt $(DEPS_qt) qtshadertools $(DEPS_qtshadertools)
ifdef HAVE_CROSS_COMPILE
DEPS_qtdeclarative += qtdeclarative-tools $(DEPS_qtdeclarative-tools) qtshadertools-tools $(DEPS_qtshadertools-tools) spirv-tools $(DEPS_spirv-tools)
DEPS_qtdeclarative += qtdeclarative-tools $(DEPS_qtdeclarative-tools) qtshadertools-tools $(DEPS_qtshadertools-tools)
endif
ifdef HAVE_WIN32

2
contrib/src/qtshadertools/rules.mak

@ -7,7 +7,7 @@ QTSHADERTOOLS_URL := $(QT)/$(QTSHADERTOOLS_VERSION_MAJOR)/$(QTSHADERTOOLS_VERSIO
DEPS_qtshadertools-tools := qt-tools $(DEPS_qt-tools)
DEPS_qtshadertools += qt $(DEPS_qt) spirv-tools
DEPS_qtshadertools += qt $(DEPS_qt)
ifdef HAVE_CROSS_COMPILE
DEPS_qtshadertools += qtshadertools-tools $(DEPS_qtshadertools-tools)
endif

2
contrib/src/spirv-tools/SHA512SUMS

@ -1,2 +0,0 @@
988f5e31508e3f19c1dd9d9a013c8e9ff89eba86207a769d7d804f9ee0201c794f412a874c860167b2c040b2c5e1fb1c835ae3684c70feaac86e47f90c1a5010 SPIRV-Tools-2023.2.tar.gz
436c6ce11d918091ce4a5ef2821f51af811c9a289e220b4a2b0bb4417b1f9f3b1f56a6366cfdf56848a9b1fb612ee3ba31d35c3d73d3d24de964ee05f96a7bbc SPIRV-Headers-sdk-1.3.246.1.tar.gz

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

@ -1,41 +0,0 @@
# spirv-tools
SPIRVTOOLS_VERSION := 2023.2
SPIRVTOOLS_URL := $(GITHUB)/KhronosGroup/SPIRV-Tools/archive/refs/tags/v$(SPIRVTOOLS_VERSION).tar.gz
SPIRVHEADERS_VERSION := 1.3.246.1
SPIRVHEADERS_URL := $(GITHUB)/KhronosGroup/SPIRV-Headers/archive/refs/tags/sdk-$(SPIRVHEADERS_VERSION).tar.gz
ifneq ($(findstring qt,$(PKGS)),)
# match with Qt targets
PKGS_TOOLS += spirv-tools
endif
ifeq ($(call need_pkg,"SPIRV-Tools >= $(SPIRVTOOLS_VERSION).1"),)
PKGS_FOUND += spirv-tools
endif
$(TARBALLS)/SPIRV-Headers-sdk-$(SPIRVHEADERS_VERSION).tar.gz:
$(call download,$(SPIRVHEADERS_URL))
$(TARBALLS)/SPIRV-Tools-$(SPIRVTOOLS_VERSION).tar.gz:
$(call download,$(SPIRVTOOLS_URL))
.sum-spirv-tools: SPIRV-Tools-$(SPIRVTOOLS_VERSION).tar.gz SPIRV-Headers-sdk-$(SPIRVHEADERS_VERSION).tar.gz
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
$(UNPACK)
$(MOVE)
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
$(CMAKECLEAN)
$(BUILDVARS) $(CMAKE_NATIVE) $(SPIRVTOOLS_CONFIG)
+$(CMAKEBUILD)
$(CMAKEINSTALL)
touch $@
Loading…
Cancel
Save