Update to 11.6.0

Update .gitignore list for a cleaner git usage.
Import some tweaks made to the native arch package.

Signed-off-by: Alexandre Demers <alexandre.f.demers@gmail.com>

3 files changed, 65 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ee02b00f4115..d81ad6ae129d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
 pkgbase = lib32-glslang
 	pkgdesc = OpenGL and OpenGL ES shader front end and validator (32bit)
-	pkgver = 11.1.0
+	pkgver = 11.6.0
 	pkgrel = 1
 	url = https://github.com/KhronosGroup/glslang
 	arch = x86_64
 	license = BSD
 	makedepends = cmake
 	makedepends = ninja
-	depends = glslang
+	makedepends = git
+	depends = glslang>=11.6.0
 	depends = lib32-gcc-libs
-	depends = lib32-spirv-tools
 	depends = python
 	options = staticlibs
-	source = glslang-11.1.0.tar.gz::https://github.com/KhronosGroup/glslang/archive/11.1.0.tar.gz
-	sha256sums = a47f1f9ed17a1f53a074fef20787110ef49522c6de68b218db68d04a81d649c5
+	source = glslang-11.6.0.tar.gz::https://github.com/KhronosGroup/glslang/archive/11.6.0.tar.gz
+	source = git+https://github.com/KhronosGroup/SPIRV-Tools#commit=1fbed83c8aab8517d821fcb4164c08567951938f
+	source = git+https://github.com/KhronosGroup/SPIRV-Headers#commit=449bc986ba6f4c5e10e32828783f9daef2a77644
+	sha256sums = 99ecd3a0c2c2219293d76723846f762a9f3e7dd0dc2a4f346d0fc3a05a0ce000
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = lib32-glslang
-
diff --git a/.gitignore b/.gitignore
index 9c590eec56e8..d008f73e3722 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,10 @@
+*.tar.gz
+*.tar.xz
+*.tgz
+*.rpm
+*.zip
+*.bz2
+*.asc
 src/
-pkg/
\ No newline at end of file
+pkg/
+SPIRV-*/
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 172e7e22c452..c1e38e282eee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,33 +7,45 @@ _setFullLibdir="${_setPrefix}/${_setLibdir}"
 _pkgbasename=glslang
 
 pkgname=lib32-$_pkgbasename
-pkgver=11.1.0
+pkgver=11.6.0
 pkgrel=1
 pkgdesc='OpenGL and OpenGL ES shader front end and validator (32bit)'
 arch=('x86_64')
 url='https://github.com/KhronosGroup/glslang'
 license=('BSD')
 depends=(
-        "$_pkgbasename"
+        "$_pkgbasename>=$pkgver"
         'lib32-gcc-libs'
-        'lib32-spirv-tools'
         'python'
         )
 makedepends=(
         'cmake'
         'ninja'
+        'git'
         )
 options=('staticlibs')
+# Get the commits from known_good.json for every release
 source=(
-        "${_pkgbasename}-${pkgver}.tar.gz::https://github.com/KhronosGroup/glslang/archive/${pkgver}.tar.gz"
-)
+        ${_pkgbasename}-${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=(
-        'a47f1f9ed17a1f53a074fef20787110ef49522c6de68b218db68d04a81d649c5'
-)
+        '99ecd3a0c2c2219293d76723846f762a9f3e7dd0dc2a4f346d0fc3a05a0ce000'
+        'SKIP'
+        'SKIP'
+        )
 
 prepare() {
-    echo "Patching if needed"
-    cd ${_pkgbasename}-${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.
+  cp -r SPIRV-Tools ${_pkgbasename}-${pkgver}/External/spirv-tools
+  cp -r SPIRV-Headers ${_pkgbasename}-${pkgver}/External/spirv-tools/external/spirv-headers
+
+  echo "Patching if needed"
+  cd ${_pkgbasename}-${pkgver}
 }
 
 build() {
@@ -42,29 +54,27 @@ build() {
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd ${_pkgbasename}-${pkgver}
-  mkdir -p build-{shared,static}
-  (cd build-shared
-    cmake .. \
-      -G Ninja \
-      -DCMAKE_INSTALL_PREFIX="/usr" \
-      -DCMAKE_INSTALL_LIBDIR="lib32" \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_C_FLAGS:STRING=-m32 \
-      -DCMAKE_CXX_FLAGS:STRING=-m32 \
-      -DBUILD_SHARED_LIBS=ON
-    ninja
-  )
-  (cd build-static
-    cmake .. \
-      -G Ninja \
-      -DCMAKE_INSTALL_PREFIX="/usr" \
-      -DCMAKE_INSTALL_LIBDIR="lib32" \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_C_FLAGS:STRING=-m32 \
-      -DCMAKE_CXX_FLAGS:STRING=-m32 \
-      -DBUILD_SHARED_LIBS=OFF
-    ninja
-  )
+  cmake \
+    -Bbuild-shared \
+    -G Ninja \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_INSTALL_LIBDIR="lib32" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_FLAGS:STRING=-m32 \
+    -DCMAKE_CXX_FLAGS:STRING=-m32 \
+    -DBUILD_SHARED_LIBS=ON
+  ninja -Cbuild-shared
+
+  cmake \
+    -Bbuild-static \
+    -G Ninja \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_INSTALL_LIBDIR="lib32" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_FLAGS:STRING=-m32 \
+    -DCMAKE_CXX_FLAGS:STRING=-m32 \
+    -DBUILD_SHARED_LIBS=OFF
+  ninja -Cbuild-static
 }
 
 package() {
@@ -76,7 +86,11 @@ package() {
   for lib in *.so; do
     ln -sf "${lib}" "${lib}.0"
   done
-  cd ..
+
+  # 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,lib32/cmake/SPIRV-Tools*,lib32/libSPIRV-*,lib32/pkgconfig}
+  mv spirv-remap "${pkgdir}"/usr/bin/spirv-remap
 
   for i in "${pkgdir}/usr/bin/"*; do
     mv "$i" "$i"32