On Wed, Feb 23, 2022 at 11:17:07AM +0100, Philipp Zabel wrote: > Instead of bumping to v2022.1 and applying the bugfix patches locally, > switch to the Vulkan SDK release version. > > While spirv-tools (and shaderc) use spirv-headers by integrating the > sources into their build tree, vulkan-validationlayers looks for it > using cmake find_package. Split spirv-headers into a proper package > that can be installed into target-sysroot. > > Signed-off-by: Philipp Zabel <[email protected]> > --- > rules/spirv-headers.in | 8 ++++++++ > rules/spirv-headers.make | 35 +++++++++++++++++++++++++++++++++++ > rules/spirv-tools.make | 39 ++++++++++++--------------------------- > 3 files changed, 55 insertions(+), 27 deletions(-) > create mode 100644 rules/spirv-headers.in > create mode 100644 rules/spirv-headers.make > […] > --- a/rules/spirv-tools.make > +++ b/rules/spirv-tools.make > @@ -14,26 +14,25 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools > # > # Paths and names > # > -SPIRV_TOOLS_VERSION := 2021.4 > -SPIRV_TOOLS_MD5 := bb36f699fcaca7362b983d75fa5a547b > +SPIRV_TOOLS_VERSION := 1.3.204.0
Hmm, I wonder if this make problems with ipkg complaining about versions going backwards, or whether we need to care about this at all. - Roland > +SPIRV_TOOLS_MD5 := 0078b5a2635e6cefe8e47eda98ec86b4 > SPIRV_TOOLS := spirv-tools-$(SPIRV_TOOLS_VERSION) > SPIRV_TOOLS_SUFFIX := tar.gz > -SPIRV_TOOLS_URL := > https://github.com/KhronosGroup/SPIRV-Tools/archive/v$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX) > +SPIRV_TOOLS_URL := > https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX) > SPIRV_TOOLS_SOURCE := $(SRCDIR)/$(SPIRV_TOOLS).$(SPIRV_TOOLS_SUFFIX) > SPIRV_TOOLS_DIR := $(BUILDDIR)/$(SPIRV_TOOLS) > +SPIRV_TOOLS_BUILD_DIR := $(SPIRV_TOOLS_DIR)-build > SPIRV_TOOLS_LICENSE := Apache-2.0 > SPIRV_TOOLS_LICENSE_FILES := > file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 > > +SPIRV_TOOLS_SPIRV_HEADERS_MD5 = $(SPIRV_HEADERS_MD5) > +SPIRV_TOOLS_SPIRV_HEADERS_URL = $(SPIRV_HEADERS_URL) > +SPIRV_TOOLS_SPIRV_HEADERS_SOURCE = $(SPIRV_HEADERS_SOURCE) > +SPIRV_TOOLS_SPIRV_HEADERS_DIR = > $(SPIRV_TOOLS_DIR)/external/spirv-headers > > -SPIRV_HEADERS_VERSION := 2021-11-11-g814e728b30dd > -SPIRV_HEADERS_MD5 := 42b6d6fef675c42eddbc7742f033c964 > -SPIRV_HEADERS_SUFFIX := tar.gz > -SPIRV_HEADERS_URL := > https://github.com/KhronosGroup/SPIRV-Headers/archive/$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX) > -SPIRV_HEADERS_SOURCE := > $(SRCDIR)/spirv-headers-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX) > -$(SPIRV_HEADERS_SOURCE) := SPIRV_HEADERS > -SPIRV_HEADERS_DIR := $(SPIRV_TOOLS_DIR)/external/spirv-headers > - > -SPIRV_TOOLS_SOURCES := $(SPIRV_TOOLS_SOURCE) $(SPIRV_HEADERS_SOURCE) > +SPIRV_TOOLS_SOURCES := \ > + $(SPIRV_TOOLS_SOURCE) \ > + $(SPIRV_TOOLS_SPIRV_HEADERS_SOURCE) > > # > ---------------------------------------------------------------------------- > # Extract > @@ -43,7 +42,7 @@ $(STATEDIR)/spirv-tools.extract: > @$(call targetinfo) > @$(call clean, $(SPIRV_TOOLS_DIR)) > @$(call extract, SPIRV_TOOLS) > - @$(call extract, SPIRV_HEADERS) > + @$(call extract, SPIRV_TOOLS_SPIRV_HEADERS) > @$(call patchin, SPIRV_TOOLS) > @$(call touch) > > @@ -73,20 +72,6 @@ SPIRV_TOOLS_CONF_OPT := \ > -DSPIRV_WARN_EVERYTHING=OFF \ > -DSPIRV_WERROR=OFF > > -# > ---------------------------------------------------------------------------- > -# Install > -# > ---------------------------------------------------------------------------- > - > -$(STATEDIR)/spirv-tools.install: > - @$(call targetinfo) > - @install -vD -m 644 $(SPIRV_TOOLS_DIR)-build/source/libSPIRV-Tools.a > $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools.a > - @install -vD -m 644 > $(SPIRV_TOOLS_DIR)-build/source/opt/libSPIRV-Tools-opt.a > $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools-opt.a > - @install -vD -m 644 > $(SPIRV_TOOLS_DIR)-build/source/libSPIRV-Tools-shared.so > $(SPIRV_TOOLS_PKGDIR)/usr/lib/libSPIRV-Tools-shared.so > - @mkdir -p $(SPIRV_TOOLS_PKGDIR)/usr/include > - @cp -r $(SPIRV_HEADERS_DIR)/include/spirv > $(SPIRV_TOOLS_PKGDIR)/usr/include > - @cp -r $(SPIRV_TOOLS_DIR)/include/spirv-tools > $(SPIRV_TOOLS_PKGDIR)/usr/include > - $(call touch) > - > # > ---------------------------------------------------------------------------- > # Target-Install > # > ---------------------------------------------------------------------------- > -- > 2.30.2 -- Roland Hieber, Pengutronix e.K. | [email protected] | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
