Update to 2020.0

And remove shaderc-2019.0-fix-build-against-new-glslang.patch. This has
been fixed on glslang's side.

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

3 files changed, 31 insertions, 92 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abfb8379896d..96ce0eea0205 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,23 @@
 pkgbase = lib32-shaderc
 	pkgdesc = Collection of tools, libraries and tests for shader compilation (32bit)
-	pkgver = 2019.0
-	pkgrel = 2
+	pkgver = 2020.0
+	pkgrel = 1
 	url = https://github.com/google/shaderc
 	arch = x86_64
 	license = Apache
 	makedepends = cmake
 	makedepends = ninja
 	makedepends = python
+	makedepends = spirv-headers
 	depends = shaderc
 	depends = lib32-glibc
 	depends = lib32-gcc-libs
-	depends = lib32-glslang>=7.13.3496
-	depends = lib32-spirv-tools>=2019.3
+	depends = lib32-glslang>=8.13.3559
+	depends = lib32-spirv-tools>=2019.5
+	depends = spirv-tools>=2019.5
 	provides = libshaderc_shared.so
-	source = shaderc-2019.0.tar.gz::https://github.com/google/shaderc/archive/v2019.0.tar.gz
-	source = fix-glslang-link-order.patch::https://github.com/google/shaderc/pull/463/commits/21c8be385b3fab5edcb934a6d99f69fd389c4e67.patch
-	source = shaderc-2019.0-fix-build-against-new-glslang.patch
-	sha512sums = c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a
-	sha512sums = 995297afe2f70086fb5a68e19c8b2e958812dca77e400c7697adaa8b8dbaee62a2f6784794c5a838a1bae96ab71fd3b72d2a50424512f52ee7f324f629e7b390
-	sha512sums = 96d2e6a67a8c38e374b56b16936574e374592eec6b38b2a4fd35ae80419298196a849bfbacc5bf7f1b6175c417ead469b18d2c196147119e490556d49eebc89f
+	source = shaderc-2020.0.tar.gz::https://github.com/google/shaderc/archive/v2020.0.tar.gz
+	sha512sums = 1971673d7a5fe77ef827c29db14112d4935c573c7c4f3b00fff3729334284d11640ee40c9e97ebcb2a14c6d5c6db0cf5e2ef6b2dfb59c759d1322c6d38624eb4
 
 pkgname = lib32-shaderc
 
diff --git a/PKGBUILD b/PKGBUILD
index a4bdcc709af4..7a8e9cedeadd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@ _setFullLibdir="${_setPrefix}/${_setLibdir}"
 _pkgbasename=shaderc
 
 pkgname=lib32-$_pkgbasename
-pkgver=2019.0
-pkgrel=2
+pkgver=2020.0
+pkgrel=1
 pkgdesc='Collection of tools, libraries and tests for shader compilation (32bit)'
 url='https://github.com/google/shaderc'
 arch=('x86_64')
@@ -15,29 +15,26 @@ license=('Apache')
 depends=("$_pkgbasename"
         'lib32-glibc'
         'lib32-gcc-libs'
-        'lib32-glslang>=7.13.3496'
-        'lib32-spirv-tools>=2019.3'
+        'lib32-glslang>=8.13.3559'
+        'lib32-spirv-tools>=2019.5'
+        'spirv-tools>=2019.5'
         )
 makedepends=(
         'cmake'
         'ninja'
         'python'
+        'spirv-headers'
         )
 provides=('libshaderc_shared.so')
-source=("${_pkgbasename}-${pkgver}.tar.gz::https://github.com/google/shaderc/archive/v${pkgver}.tar.gz"
-        'fix-glslang-link-order.patch::https://github.com/google/shaderc/pull/463/commits/21c8be385b3fab5edcb934a6d99f69fd389c4e67.patch'
-        'shaderc-2019.0-fix-build-against-new-glslang.patch')
-sha512sums=('c76887ad0a96145211b6550b0dfe63091df9e1463f9a3140aba2d1982c33e98ad14fb4bcf9ce2281433fc77626fc892c268d0636b9f348a159dd06e3f41b461a'
-            '995297afe2f70086fb5a68e19c8b2e958812dca77e400c7697adaa8b8dbaee62a2f6784794c5a838a1bae96ab71fd3b72d2a50424512f52ee7f324f629e7b390'
-            '96d2e6a67a8c38e374b56b16936574e374592eec6b38b2a4fd35ae80419298196a849bfbacc5bf7f1b6175c417ead469b18d2c196147119e490556d49eebc89f')
+source=(
+        "${_pkgbasename}-${pkgver}.tar.gz::https://github.com/google/shaderc/archive/v${pkgver}.tar.gz"
+        )
+sha512sums=(
+        '1971673d7a5fe77ef827c29db14112d4935c573c7c4f3b00fff3729334284d11640ee40c9e97ebcb2a14c6d5c6db0cf5e2ef6b2dfb59c759d1322c6d38624eb4'
+        )
 
-# https://github.com/gentoo/gentoo/blob/c31d001aeedaf97917fa29fa859e16090cc50282/media-libs/shaderc/shaderc-2017.2.ebuild#L35-L65
 prepare() {
-  mkdir -p ${_pkgbasename}-${pkgver}/build
-
   cd ${_pkgbasename}-${pkgver}
-  patch -Np1 < ../fix-glslang-link-order.patch
-  patch -Np1 < ../shaderc-2019.0-fix-build-against-new-glslang.patch
 
   # de-vendor libs and disable git versioning
   sed '/examples/d;/third_party/d' -i CMakeLists.txt
@@ -53,27 +50,25 @@ build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  export CXXFLAGS+=" -I/usr/include/glslang"
+  export CFLAGS+=" ${CPPFLAGS}"
+  export CXXFLAGS+=" ${CPPFLAGS} -I/usr/include/glslang"
 
-  cd ${_pkgbasename}-${pkgver}/build
-  cmake .. \
-      -G Ninja \
-      -DCMAKE_LIBRARY_PATH="/usr/lib32" \
-      -DCMAKE_INSTALL_PREFIX="/usr" \
-      -DBUILD_DOC=OFF \
+  cmake \
+      -B build \
+      -S ${_pkgbasename}-${pkgver} \
       -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX="/usr" \
       -DCMAKE_INSTALL_LIBDIR="lib32" \
       -DSHADERC_SKIP_TESTS=ON \
-      -DSHADERC_ENABLE_NV_EXTENSIONS=OFF # Currently requires glslang-git
-    ninja
+      -G Ninja
+    ninja -C build
 
-#  cd ../glslc
+#  cd ${_pkgbasename}-${pkgver}/glslc
 #  asciidoctor -b manpage README.asciidoc -o glslc.1
 }
 
 package() {
-  cd ${_pkgbasename}-${pkgver}
   DESTDIR="${pkgdir}" ninja -C build install
-  rm -rf "$pkgdir"/usr/{include,share,bin}
-#  install -Dm 644 glslc/glslc.1 -t "${pkgdir}/usr/share/man/man1"
+  rm -rf ${_pkgbasename}-${pkgver}/${pkgdir}/usr/{include,share,bin}
+#  install -Dm 644 ${_pkgbasename}-${pkgver}/glslc/glslc.1 -t "${pkgdir}/usr/share/man/man1"
 }
diff --git a/shaderc-2019.0-fix-build-against-new-glslang.patch b/shaderc-2019.0-fix-build-against-new-glslang.patch
deleted file mode 100644
index 807540cf62a2..000000000000
--- a/shaderc-2019.0-fix-build-against-new-glslang.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
-index 3c3c3de..b5fc6cb 100644
---- a/libshaderc/src/shaderc.cc
-+++ b/libshaderc/src/shaderc.cc
-@@ -20,7 +20,7 @@
- #include <sstream>
- #include <vector>
- 
--#include "SPIRV/spirv.hpp"
-+#include "glslang/SPIRV/spirv.hpp"
- 
- #include "libshaderc_util/compiler.h"
- #include "libshaderc_util/counting_includer.h"
-diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
-index ef7867f..acc172b 100644
---- a/libshaderc_util/src/compiler.cc
-+++ b/libshaderc_util/src/compiler.cc
-@@ -26,7 +26,7 @@
- #include "libshaderc_util/string_piece.h"
- #include "libshaderc_util/version_profile.h"
- 
--#include "SPIRV/GlslangToSpv.h"
-+#include "glslang/SPIRV/GlslangToSpv.h"
- 
- namespace {
- using shaderc_util::string_piece;
-@@ -291,17 +291,12 @@ std::tuple<bool, std::vector<uint32_t>, size_t> Compiler::Compile(
-       bases[static_cast<int>(UniformKind::StorageBuffer)]);
-   shader.setShiftUavBinding(
-       bases[static_cast<int>(UniformKind::UnorderedAccessView)]);
--  shader.setHlslIoMapping(hlsl_iomap_);
-   shader.setResourceSetBinding(
-       hlsl_explicit_bindings_[static_cast<int>(used_shader_stage)]);
-   shader.setEnvClient(target_client_info.client,
-                       target_client_info.client_version);
-   shader.setEnvTarget(target_client_info.target_language,
-                       target_client_info.target_language_version);
--  if (hlsl_functionality1_enabled_) {
--    shader.setEnvTargetHlslFunctionality1();
--  }
--
-   const EShMessages rules = GetMessageRules(target_env_, source_language_,
-                                             hlsl_offsets_,
-                                             generate_debug_info_);
-@@ -478,9 +473,6 @@ std::tuple<bool, std::string, std::string> Compiler::PreprocessShader(
-   }
-   shader.setEnvClient(target_client_info.client,
-                       target_client_info.client_version);
--  if (hlsl_functionality1_enabled_) {
--    shader.setEnvTargetHlslFunctionality1();
--  }
- 
-   // The preprocessor might be sensitive to the target environment.
-   // So combine the existing rules with the just-give-me-preprocessor-output