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

2022-08-12 Thread Frederik Schwan via arch-commits 
Date: Friday, August 12, 2022 @ 20:08:51
  Author: freswa
Revision: 452636

upgpkg: glslang 11.11.0-1

Modified:
  glslang/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2022-08-12 19:33:25 UTC (rev 452635)
+++ PKGBUILD2022-08-12 20:08:51 UTC (rev 452636)
@@ -2,7 +2,7 @@
 
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
-pkgver=11.10.0
+pkgver=11.11.0
 pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
@@ -13,7 +13,7 @@
 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)
-sha256sums=('8ffc19c435232d09299dd2c91e247292b3508c1b826a3497c60682e4bbf2d602')
+sha256sums=('26c216c3062512c018cbdd752224b8dad703b7e5bb90bf338ba2dbb5d4f11438')
 
 build() {
   cd ${pkgname}-${pkgver}

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

2022-06-13 Thread Sven-Hendrik Haase via arch-commits 
Date: Monday, June 13, 2022 @ 15:39:11
  Author: svenstaro
Revision: 448421

upgpkg: glslang 11.10.0-1

Modified:
  glslang/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2022-06-13 15:18:22 UTC (rev 448420)
+++ PKGBUILD2022-06-13 15:39:11 UTC (rev 448421)
@@ -2,7 +2,7 @@
 
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
-pkgver=11.9.0
+pkgver=11.10.0
 pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
@@ -13,7 +13,7 @@
 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)
-sha256sums=('d5744adba19eef9ad3d73f524226b39fec559d94cb582cd442e3c5de930004b2')
+sha256sums=('8ffc19c435232d09299dd2c91e247292b3508c1b826a3497c60682e4bbf2d602')
 
 build() {
   cd ${pkgname}-${pkgver}

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

2022-04-11 Thread Sven-Hendrik Haase via arch-commits 
Date: Monday, April 11, 2022 @ 18:37:18
  Author: svenstaro
Revision: 442300

upgpkg: glslang 11.9.0-1

Modified:
  glslang/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2022-04-11 18:25:50 UTC (rev 442299)
+++ PKGBUILD2022-04-11 18:37:18 UTC (rev 442300)
@@ -2,8 +2,8 @@
 
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
-pkgver=11.8.0
-pkgrel=2
+pkgver=11.9.0
+pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
 url='https://github.com/KhronosGroup/glslang'
@@ -13,7 +13,7 @@
 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)
-sha256sums=('9e5fbe5b844d203da5e61bcd84eda76326e0ff5dc696cb862147bbe01d2febb0')
+sha256sums=('d5744adba19eef9ad3d73f524226b39fec559d94cb582cd442e3c5de930004b2')
 
 build() {
   cd ${pkgname}-${pkgver}

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

2022-03-04 Thread Sven-Hendrik Haase via arch-commits 
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
===
--- PKGBUILD2022-03-04 23:51:11 UTC (rev 438936)
+++ PKGBUILD2022-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:

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

2022-02-19 Thread Sven-Hendrik Haase via arch-commits 
Date: Sunday, February 20, 2022 @ 04:09:29
  Author: svenstaro
Revision: 437788

upgpkg: glslang 11.8.0-1

Modified:
  glslang/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-02-20 03:43:27 UTC (rev 437787)
+++ PKGBUILD2022-02-20 04:09:29 UTC (rev 437788)
@@ -2,8 +2,8 @@
 
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
-pkgver=11.7.1
-pkgrel=3
+pkgver=11.8.0
+pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
 url='https://github.com/KhronosGroup/glslang'
@@ -13,9 +13,9 @@
 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=1fbed83c8aab8517d821fcb4164c08567951938f
-
git+https://github.com/KhronosGroup/SPIRV-Headers#commit=449bc986ba6f4c5e10e32828783f9daef2a77644)
-sha256sums=('ab2e2ddc507bb418b9227cbe6f443eb06e89e2387944f42026d82c0b4ef79b0a'
+
git+https://github.com/KhronosGroup/SPIRV-Tools#commit=73735db943d7165d725883a1da0ad9eac79c1e34
+
git+https://github.com/KhronosGroup/SPIRV-Headers#commit=b42ba6d92faf6b4938e6f22ddd186dbdacc98d78)
+sha256sums=('9e5fbe5b844d203da5e61bcd84eda76326e0ff5dc696cb862147bbe01d2febb0'
 'SKIP'
 'SKIP')

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

2022-01-01 Thread Sven-Hendrik Haase via arch-commits 
Date: Saturday, January 1, 2022 @ 18:48:43
  Author: svenstaro
Revision: 433301

upgpkg: glslang 11.7.1-3: Fix fat LTO

Modified:
  glslang/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2022-01-01 18:40:02 UTC (rev 433300)
+++ PKGBUILD2022-01-01 18:48:43 UTC (rev 433301)
@@ -3,7 +3,7 @@
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
 pkgver=11.7.1
-pkgrel=2
+pkgrel=3
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
 url='https://github.com/KhronosGroup/glslang'
@@ -30,6 +30,7 @@
 
 build() {
   cd ${pkgname}-${pkgver}
+  export CXXFLAGS+=" -ffat-lto-objects"
   cmake \
 -Bbuild-shared \
 -GNinja \

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

2021-12-02 Thread Sven-Hendrik Haase via arch-commits 
Date: Thursday, December 2, 2021 @ 11:53:56
  Author: svenstaro
Revision: 430253

upgpkg: glslang 11.7.1-2: Move python dep to makedeps (FS#72874)

Modified:
  glslang/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-12-02 10:28:08 UTC (rev 430252)
+++ PKGBUILD2021-12-02 11:53:56 UTC (rev 430253)
@@ -3,13 +3,13 @@
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
 pkgver=11.7.1
-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' 'python')
-makedepends=('cmake' 'ninja' 'git')
+depends=('gcc-libs')
+makedepends=('cmake' 'ninja' 'git' 'python')
 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

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

2021-11-29 Thread Sven-Hendrik Haase via arch-commits 
Date: Monday, November 29, 2021 @ 12:11:27
  Author: svenstaro
Revision: 429441

upgpkg: glslang 11.7.1-1

Modified:
  glslang/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-11-29 12:03:26 UTC (rev 429440)
+++ PKGBUILD2021-11-29 12:11:27 UTC (rev 429441)
@@ -1,8 +1,8 @@
-# Maintainer: Sven-Hendrik Haase 
+# Maintainer: Sven-Hendrik Haase 
 
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
-pkgver=11.7.0
+pkgver=11.7.1
 pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
@@ -15,7 +15,7 @@
 
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
 
git+https://github.com/KhronosGroup/SPIRV-Tools#commit=1fbed83c8aab8517d821fcb4164c08567951938f
 
git+https://github.com/KhronosGroup/SPIRV-Headers#commit=449bc986ba6f4c5e10e32828783f9daef2a77644)
-sha256sums=('b6c83864c3606678d11675114fa5f358c519fe1dad9a781802bcc87fb8fa32d5'
+sha256sums=('ab2e2ddc507bb418b9227cbe6f443eb06e89e2387944f42026d82c0b4ef79b0a'
 'SKIP'
 'SKIP')

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

2021-11-15 Thread Sven-Hendrik Haase via arch-commits 
Date: Monday, November 15, 2021 @ 09:53:48
  Author: svenstaro
Revision: 428523

upgpkg: glslang 11.7.0-1

Modified:
  glslang/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-11-15 07:26:53 UTC (rev 428522)
+++ PKGBUILD2021-11-15 09:53:48 UTC (rev 428523)
@@ -2,7 +2,7 @@
 
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
-pkgver=11.6.0
+pkgver=11.7.0
 pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
@@ -15,7 +15,7 @@
 
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
 
git+https://github.com/KhronosGroup/SPIRV-Tools#commit=1fbed83c8aab8517d821fcb4164c08567951938f
 
git+https://github.com/KhronosGroup/SPIRV-Headers#commit=449bc986ba6f4c5e10e32828783f9daef2a77644)
-sha256sums=('99ecd3a0c2c2219293d76723846f762a9f3e7dd0dc2a4f346d0fc3a05a0ce000'
+sha256sums=('b6c83864c3606678d11675114fa5f358c519fe1dad9a781802bcc87fb8fa32d5'
 'SKIP'
 'SKIP')

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

2021-08-27 Thread Sven-Hendrik Haase via arch-commits 
Date: Saturday, August 28, 2021 @ 03:02:40
  Author: svenstaro
Revision: 422619

upgpkg: glslang 11.6.0-1

Modified:
  glslang/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-08-27 22:08:46 UTC (rev 422618)
+++ PKGBUILD2021-08-28 03:02:40 UTC (rev 422619)
@@ -2,7 +2,7 @@
 
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
-pkgver=11.5.0
+pkgver=11.6.0
 pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
@@ -13,9 +13,9 @@
 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=dc72924cb31cd9f3dbc3eb47e9d926cf641e3a07
-
git+https://github.com/KhronosGroup/SPIRV-Headers#commit=dafead1765f6c1a5f9f8a76387dcb2abe4e54acd)
-sha256sums=('fd0b5e3bda591bb08bd3049655a99a0a55f0de4059b9c8f7b397e4b19cf5d51f'
+
git+https://github.com/KhronosGroup/SPIRV-Tools#commit=1fbed83c8aab8517d821fcb4164c08567951938f
+
git+https://github.com/KhronosGroup/SPIRV-Headers#commit=449bc986ba6f4c5e10e32828783f9daef2a77644)
+sha256sums=('99ecd3a0c2c2219293d76723846f762a9f3e7dd0dc2a4f346d0fc3a05a0ce000'
 'SKIP'
 'SKIP')

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

2021-07-04 Thread Sven-Hendrik Haase via arch-commits 
Date: Sunday, July 4, 2021 @ 20:23:09
  Author: svenstaro
Revision: 418928

upgpkg: glslang 11.5.0-1

Modified:
  glslang/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-07-04 19:07:02 UTC (rev 418927)
+++ PKGBUILD2021-07-04 20:23:09 UTC (rev 418928)
@@ -2,7 +2,7 @@
 
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
-pkgver=11.4.0
+pkgver=11.5.0
 pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
@@ -15,7 +15,7 @@
 
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz
 
git+https://github.com/KhronosGroup/SPIRV-Tools#commit=dc72924cb31cd9f3dbc3eb47e9d926cf641e3a07
 
git+https://github.com/KhronosGroup/SPIRV-Headers#commit=dafead1765f6c1a5f9f8a76387dcb2abe4e54acd)
-sha256sums=('9bae79c2b640b60474f8944a5ab4aff3af990074636ea2a0a3c97cb86be61dfa'
+sha256sums=('fd0b5e3bda591bb08bd3049655a99a0a55f0de4059b9c8f7b397e4b19cf5d51f'
 'SKIP'
 'SKIP')

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

2021-04-26 Thread Sven-Hendrik Haase via arch-commits 
Date: Monday, April 26, 2021 @ 15:39:10
  Author: svenstaro
Revision: 413902

upgpkg: glslang 11.4.0-1

Modified:
  glslang/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-04-26 14:45:15 UTC (rev 413901)
+++ PKGBUILD2021-04-26 15:39:10 UTC (rev 413902)
@@ -2,8 +2,8 @@
 
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
-pkgver=11.2.0
-pkgrel=3
+pkgver=11.4.0
+pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
 url='https://github.com/KhronosGroup/glslang'
@@ -13,9 +13,9 @@
 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'
+
git+https://github.com/KhronosGroup/SPIRV-Tools#commit=dc72924cb31cd9f3dbc3eb47e9d926cf641e3a07
+
git+https://github.com/KhronosGroup/SPIRV-Headers#commit=dafead1765f6c1a5f9f8a76387dcb2abe4e54acd)
+sha256sums=('9bae79c2b640b60474f8944a5ab4aff3af990074636ea2a0a3c97cb86be61dfa'
 'SKIP'
 'SKIP')

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

2021-03-14 Thread Sven-Hendrik Haase via arch-commits 
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
===
--- PKGBUILD2021-03-14 11:47:09 UTC (rev 409861)
+++ PKGBUILD2021-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 \

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

2021-03-13 Thread Sven-Hendrik Haase via arch-commits 
Date: Sunday, March 14, 2021 @ 05:14:50
  Author: svenstaro
Revision: 409855

upgpkg: glslang 11.2.0-2: Add vendored spirv-tools to enable HLSL and optimizer 
support

Apparently upstream really wants us to vendor the specific version of 
spirv-tools for whatever reason so for now
this is what we'll do until we can come up with something better (FS#69974).
Also cleaned up the build script a little.

Modified:
  glslang/trunk/PKGBUILD

--+
 PKGBUILD |   47 +++
 1 file changed, 27 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-03-14 04:12:08 UTC (rev 409854)
+++ PKGBUILD2021-03-14 05:14:50 UTC (rev 409855)
@@ -3,13 +3,13 @@
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
 pkgver=11.2.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' 'spirv-tools' 'python')
-makedepends=('cmake' 'ninja')
+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')
@@ -16,23 +16,25 @@
 
 build() {
   cd ${pkgname}-${pkgver}
-  mkdir -p build-{shared,static}
-  (cd build-shared
-cmake .. \
-  -GNinja \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DBUILD_SHARED_LIBS=ON
-ninja
-  )
-  (cd build-static
-cmake .. \
-  -GNinja \
-  -DCMAKE_INSTALL_PREFIX=/usr \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DBUILD_SHARED_LIBS=OFF
-ninja
-  )
+  # 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() {
@@ -46,6 +48,11 @@
   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:

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

2021-02-24 Thread Sven-Hendrik Haase via arch-commits 
Date: Wednesday, February 24, 2021 @ 15:12:13
  Author: svenstaro
Revision: 408737

upgpkg: glslang 11.2.0-1

Modified:
  glslang/trunk/PKGBUILD

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

Modified: PKGBUILD
===
--- PKGBUILD2021-02-24 14:16:28 UTC (rev 408736)
+++ PKGBUILD2021-02-24 15:12:13 UTC (rev 408737)
@@ -2,7 +2,7 @@
 
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
-pkgver=11.1.0
+pkgver=11.2.0
 pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
@@ -12,7 +12,7 @@
 makedepends=('cmake' 'ninja')
 options=('staticlibs')
 
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz)
-sha256sums=('a47f1f9ed17a1f53a074fef20787110ef49522c6de68b218db68d04a81d649c5')
+sha256sums=('8ff2fcf9b054e4a4ef56fcd8a637322f827b2b176a592a618d63672ddb896e06')
 
 build() {
   cd ${pkgname}-${pkgver}

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

2021-01-02 Thread Sven-Hendrik Haase via arch-commits 
Date: Saturday, January 2, 2021 @ 16:08:28
  Author: svenstaro
Revision: 405177

upgpkg: glslang 11.1.0-1

Modified:
  glslang/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2021-01-02 00:48:08 UTC (rev 405176)
+++ PKGBUILD2021-01-02 16:08:28 UTC (rev 405177)
@@ -2,8 +2,7 @@
 
 # Careful when upgrading this package! It usually breaks ABI without bumping 
soname.
 pkgname=glslang
-pkgver=11.0.0
-_pkgver=10-11.0.0
+pkgver=11.1.0
 pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator'
 arch=('x86_64')
@@ -12,11 +11,11 @@
 depends=('gcc-libs' 'spirv-tools' 'python')
 makedepends=('cmake' 'ninja')
 options=('staticlibs')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${_pkgver}.tar.gz)
-sha256sums=('30c12243574d38407d137ea4581743732b893c8246b687e589bf5a6b02e83172')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz)
+sha256sums=('a47f1f9ed17a1f53a074fef20787110ef49522c6de68b218db68d04a81d649c5')
 
 build() {
-  cd ${pkgname}-${_pkgver}
+  cd ${pkgname}-${pkgver}
   mkdir -p build-{shared,static}
   (cd build-shared
 cmake .. \
@@ -37,7 +36,7 @@
 }
 
 package() {
-  cd ${pkgname}-${_pkgver}
+  cd ${pkgname}-${pkgver}
   DESTDIR="${pkgdir}" ninja -C build-shared install
   DESTDIR="${pkgdir}" ninja -C build-static install