[arch-commits] Commit in glslang/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Sunday, March 14, 2021 @ 12:22:18
  Author: svenstaro
Revision: 409862

upgpkg: glslang 11.2.0-3: Implement more orthodox way for the vendoring

Modified:
  glslang/trunk/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-14 11:47:09 UTC (rev 409861)
+++ PKGBUILD	2021-03-14 12:22:18 UTC (rev 409862)
@@ -3,7 +3,7 @@
 # Careful when upgrading this package! It usually breaks ABI without bumping soname.
 pkgname=glslang
 pkgver=11.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
 url='https://github.com/KhronosGroup/glslang'
@@ -11,16 +11,25 @@
 depends=('gcc-libs' 'python')
 makedepends=('cmake' 'ninja' 'git')
 options=('staticlibs')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz)
-sha256sums=('8ff2fcf9b054e4a4ef56fcd8a637322f827b2b176a592a618d63672ddb896e06')
+# Get the commits from known_good.json for every release
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
+        git+https://github.com/KhronosGroup/SPIRV-Tools#commit=c79edd260c2b503f0eca57310057b4a100999cc5
+        git+https://github.com/KhronosGroup/SPIRV-Headers#commit=75b30a659c8a4979104986652c54cc421fc51129)
+sha256sums=('8ff2fcf9b054e4a4ef56fcd8a637322f827b2b176a592a618d63672ddb896e06'
+            'SKIP'
+            'SKIP')
 
-build() {
-  cd ${pkgname}-${pkgver}
+prepare() {
   # Sadly, glslang requires super specific versions of SPIRV headers and
   # spirv-tools and so I'm afraid that for the time being we'll have to use
   # their vendored version until we figure out a good way to use system
   # libraries.
-  ./update_glslang_sources.py
+  cp -r SPIRV-Tools ${pkgname}-${pkgver}/External/spirv-tools
+  cp -r SPIRV-Headers ${pkgname}-${pkgver}/External/spirv-tools/external/spirv-headers
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
   cmake \
     -Bbuild-shared \
     -GNinja \