[arch-commits] Commit in glslang/repos/testing-x86_64 (PKGBUILD PKGBUILD)

[Sven-Hendrik Haase]

    Date: Sunday, March 14, 2021 @ 12:22:23
  Author: svenstaro
Revision: 409863

archrelease: copy trunk to testing-x86_64

Added:
  glslang/repos/testing-x86_64/PKGBUILD
    (from rev 409862, glslang/trunk/PKGBUILD)
Deleted:
  glslang/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |  125 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 67 insertions(+), 58 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-14 12:22:18 UTC (rev 409862)
+++ PKGBUILD	2021-03-14 12:22:23 UTC (rev 409863)
@@ -1,58 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-
-# Careful when upgrading this package! It usually breaks ABI without bumping soname.
-pkgname=glslang
-pkgver=11.2.0
-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' 'python')
-makedepends=('cmake' 'ninja' 'git')
-options=('staticlibs')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz)
-sha256sums=('8ff2fcf9b054e4a4ef56fcd8a637322f827b2b176a592a618d63672ddb896e06')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  # 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
-  cmake \
-    -Bbuild-shared \
-    -GNinja \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_SHARED_LIBS=ON
-  ninja -Cbuild-shared
-  cmake \
-    -Bbuild-static \
-    -GNinja \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_SHARED_LIBS=OFF
-  ninja -Cbuild-static
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  DESTDIR="${pkgdir}" ninja -C build-shared install
-  DESTDIR="${pkgdir}" ninja -C build-static install
-
-  install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
-  cd "${pkgdir}"/usr/lib
-  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:

Copied: glslang/repos/testing-x86_64/PKGBUILD (from rev 409862, glslang/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-03-14 12:22:23 UTC (rev 409863)
@@ -0,0 +1,67 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+
+# Careful when upgrading this package! It usually breaks ABI without bumping soname.
+pkgname=glslang
+pkgver=11.2.0
+pkgrel=3
+pkgdesc='OpenGL and OpenGL ES shader front end and validator'
+arch=('x86_64')
+url='https://github.com/KhronosGroup/glslang'
+license=('BSD')
+depends=('gcc-libs' 'python')
+makedepends=('cmake' 'ninja' 'git')
+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=c79edd260c2b503f0eca57310057b4a100999cc5
+        git+https://github.com/KhronosGroup/SPIRV-Headers#commit=75b30a659c8a4979104986652c54cc421fc51129)
+sha256sums=('8ff2fcf9b054e4a4ef56fcd8a637322f827b2b176a592a618d63672ddb896e06'
+            'SKIP'
+            'SKIP')
+
+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}
+  cmake \
+    -Bbuild-shared \
+    -GNinja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=ON
+  ninja -Cbuild-shared
+  cmake \
+    -Bbuild-static \
+    -GNinja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_SHARED_LIBS=OFF
+  ninja -Cbuild-static
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  DESTDIR="${pkgdir}" ninja -C build-shared install
+  DESTDIR="${pkgdir}" ninja -C build-static install
+
+  install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+
+  cd "${pkgdir}"/usr/lib
+  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: