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

[Sven-Hendrik Haase]

    Date: Saturday, March 5, 2022 @ 00:02:07
  Author: svenstaro
Revision: 438937

upgpkg: glslang 11.8.0-2: Use our own packages for spirv-tools and spirv-headers

Modified:
  glslang/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-04 23:51:11 UTC (rev 438936)
+++ PKGBUILD	2022-03-05 00:02:07 UTC (rev 438937)
@@ -3,31 +3,18 @@
 # Careful when upgrading this package! It usually breaks ABI without bumping soname.
 pkgname=glslang
 pkgver=11.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
 url='https://github.com/KhronosGroup/glslang'
 license=('BSD')
 depends=('gcc-libs')
-makedepends=('cmake' 'ninja' 'git' 'python')
+makedepends=('cmake' 'ninja' 'git' 'python' 'spirv-tools' 'spirv-headers')
 options=('staticlibs')
 # 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=73735db943d7165d725883a1da0ad9eac79c1e34
-        git+https://github.com/KhronosGroup/SPIRV-Headers#commit=b42ba6d92faf6b4938e6f22ddd186dbdacc98d78)
-sha256sums=('9e5fbe5b844d203da5e61bcd84eda76326e0ff5dc696cb862147bbe01d2febb0'
-            'SKIP'
-            'SKIP')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz)
+sha256sums=('9e5fbe5b844d203da5e61bcd84eda76326e0ff5dc696cb862147bbe01d2febb0')
 
-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.
-  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}
   export CXXFLAGS+=" -ffat-lto-objects"
@@ -58,11 +45,6 @@
   for lib in *.so; do
     ln -sf "${lib}" "${lib}.0"
   done
-
-  # Delete the stuff that's been vendored in. It's not ideal but that's we'll deal with for now.
-  mv "${pkgdir}"/usr/bin/spirv-remap .
-  rm -r "${pkgdir}"/usr/{bin/spirv*,include/spirv-tools,lib/cmake/SPIRV-Tools*,lib/libSPIRV-*,lib/pkgconfig}
-  mv spirv-remap "${pkgdir}"/usr/bin/spirv-remap
 }
 
 # vim: ts=2 sw=2 et: