| Message ID | 20230725173102.543874-5-sebastian.weyer@smile.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Add support for Rusticl in mesa3d | expand |
Hello, On Tue, 25 Jul 2023 19:30:56 +0200 Sebastian Weyer <sebastian.weyer@smile.fr> wrote: > package/Config.in | 1 + > package/spirv-headers/Config.in | 6 ++++++ > package/spirv-headers/spirv-headers.hash | 2 ++ > package/spirv-headers/spirv-headers.mk | 15 +++++++++++++++ > 4 files changed, 24 insertions(+) Missing entry in DEVELOPERS file, so I've added that. > diff --git a/package/spirv-headers/spirv-headers.hash b/package/spirv-headers/spirv-headers.hash > new file mode 100644 > index 0000000000..b83959f7a4 > --- /dev/null > +++ b/package/spirv-headers/spirv-headers.hash > @@ -0,0 +1,2 @@ Missing "Locally calculated" comment. > +sha256 71668e18ef7b318b06f8c466f46abad965b2646eaa322594cd015c2ac87133e6 spirv-headers-1.3.246.1.tar.gz > +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a LICENSE > diff --git a/package/spirv-headers/spirv-headers.mk b/package/spirv-headers/spirv-headers.mk > new file mode 100644 > index 0000000000..11119ac6b2 > --- /dev/null > +++ b/package/spirv-headers/spirv-headers.mk > @@ -0,0 +1,15 @@ > +################################################################################ > +# > +# spirv-headers > +# > +################################################################################ > + > +SPIRV_HEADERS_VERSION = 1.3.246.1 I've bumped to the latest version, which fixes a build issue: this older version was trying to build C++ code for an example/test. With the newer version, it still tries to build C++ stuff, but mistakenly with the host C++ compiler, which works because it has no dependencies. Romain and I didn't bother fixing that as we really don't care about this silly example being built. Note: as a follow-up patch, I added a host variant of this package, and a change to spirv-llvm-translator that makes use of it. Indeed host-spirv-llvm-translator was downloading its own copy of the spirv-headers during the build which is very bad (but not your fault, since you did not introduce host-spirv-llvm-translator). Anyway: this patch is applied. Thanks! Thomas
diff --git a/package/Config.in b/package/Config.in index 1e551d17c4..931b0cc21e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -326,6 +326,7 @@ comment "Graphic applications" source "package/pngquant/Config.in" source "package/qt5cinex/Config.in" source "package/rrdtool/Config.in" + source "package/spirv-headers/Config.in" source "package/stellarium/Config.in" source "package/sway/Config.in" source "package/tesseract-ocr/Config.in" diff --git a/package/spirv-headers/Config.in b/package/spirv-headers/Config.in new file mode 100644 index 0000000000..fd20f301d4 --- /dev/null +++ b/package/spirv-headers/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_SPIRV_HEADERS + bool "spirv-headers" + help + Machine-readable files for the SPIR-V Registry + + https://www.khronos.org/registry/spir-v diff --git a/package/spirv-headers/spirv-headers.hash b/package/spirv-headers/spirv-headers.hash new file mode 100644 index 0000000000..b83959f7a4 --- /dev/null +++ b/package/spirv-headers/spirv-headers.hash @@ -0,0 +1,2 @@ +sha256 71668e18ef7b318b06f8c466f46abad965b2646eaa322594cd015c2ac87133e6 spirv-headers-1.3.246.1.tar.gz +sha256 9b243f6f0bf44e295ff411a0f7b7642d1d0dff7cdc42507e9f7206f439e51b5a LICENSE diff --git a/package/spirv-headers/spirv-headers.mk b/package/spirv-headers/spirv-headers.mk new file mode 100644 index 0000000000..11119ac6b2 --- /dev/null +++ b/package/spirv-headers/spirv-headers.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# spirv-headers +# +################################################################################ + +SPIRV_HEADERS_VERSION = 1.3.246.1 +SPIRV_HEADERS_SITE = $(call github,KhronosGroup,SPIRV-Headers,sdk-$(SPIRV_HEADERS_VERSION)) +SPIRV_HEADERS_LICENSE = MIT +SPIRV_HEADERS_LICENSE_FILES = LICENSE + +SPIRV_HEADERS_INSTALL_STAGING = YES +SPIRV_HEADERS_INSTALL_TARGET = NO + +$(eval $(cmake-package))