shaderc: 2019.0 -> 2019.1

7 files changed, 121 insertions, 78 deletions

diff --git a/shaderc/.signature b/shaderc/.signature
index 7e3a5ebdc..11920acc1 100644
--- a/shaderc/.signature
+++ b/shaderc/.signature
@@ -1,12 +1,13 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF33uPF6q8MoPfL5jMw6KuZ8It9Gg37DfTl0thyKxPM7Z8cpaBCZ0BqHy1sYBHw5XWrCO5wLyvUQf751U5iFK7JAQ=
-SHA256 (Pkgfile) = 0f67ffd28f0e306782b2548dd0c7e70d2dd3958dd9949e8829cf2b902103a9b1
+RWSagIOpLGJF34VFFW8tPfRHrLsUhv0dp0nn/PZfidA0BWiagUi3lkmLQadM1GSx/Ly9AYm5HavmmEOhB0qoZ1bkHgxt2G8WrwQ=
+SHA256 (Pkgfile) = 16b01fe6d7192c44fcc758c12cfe7642aa6714e3254b32686a1d996c0eb41a9a
 SHA256 (.footprint) = a55f4db9a8f36310df010a88256abef6d13753f525ff212c4e7dcb390e6c1e66
-SHA256 (shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4.tar.gz) = d0b9c52c545a07b94fa6dc5caaa6bba3df7e9edd73cb3ea9ab3519fbb267e7ca
+SHA256 (shaderc-f76bb2f09f858c3014b329961d836964e515095d.tar.gz) = 0e97ab6af99f7531366ecb87f8976fa15f216c4a0d3b107f3d862c4fb4e54ad8
 SHA256 (glslc.1) = 74007de30e2a7654e399d8c67c03d817eb847112e5d95e407d81754334d333c6
 SHA256 (spvc.1) = a2f1c0158a73556080f2c7a8ae9027aa6c054da88ee3a5bb588bb9514021012d
 SHA256 (glslc-asciidoc.patch) = 685d97223af4fcd169921ee5f9b2c49a2df3d84b7bf7df7dd1f6def4361321a6
 SHA256 (spvc-asciidoc.patch) = fd0c682186be4231fab5c83bf7625678f3b7905c980e3f7c9ae6cd5e212f9563
-SHA256 (fix-glslang-link-order.patch) = 986a972d8b8fbfa750e92b750673108c4ae77af47acdc4dbb684358e2600a4ea
-SHA256 (0001-Drop-third-party-code-in-CMakeLists.txt.patch) = 0ca9f01b8665d90cc2dc4a7eca23d58e2b4d41a46ed7735f205e2680a5e7d55c
-SHA256 (shaderc-2019.0-fix-build-against-new-glslang.patch) = 7c7fe10c4e88e70a299b014cd52f2106cb07a6760feb5e12119cc576f022052e
+SHA256 (0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch) = 92b52212ef9251271ddbe1004e5635b6cffb06179befd4870de5794386c4b5fd
+SHA256 (0001-Drop-third-party-code-in-CMakeLists.txt.patch) = 9127adf6f94ababfa8d7aaa10ec8a8f0731a4e074f14b3a431174986dc8b4226
+SHA256 (0001-Fix-SPIRV-includes-location.patch) = 199b05634800acbb89e1a188db2b0e6e5bea9941db2cc7f4a42e7611a48ae053
+SHA256 (0001-Handle-new-Glslang-profile-enum-in-switch.patch) = 276ebeb7ab36b006b084f69700090c167476b34ead529baa990247f246d00cb4
diff --git a/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch b/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch
index 32ea680ab..189afe10b 100644
--- a/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch
+++ b/shaderc/0001-Drop-third-party-code-in-CMakeLists.txt.patch
@@ -1,7 +1,7 @@
-diff -up shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt.unbundle shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt
---- shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt.unbundle	2019-06-10 00:30:41.954316517 +0200
-+++ shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt	2019-06-10 01:10:11.672758769 +0200
-@@ -70,7 +70,6 @@ endif(MSVC)
+diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt
+--- shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig        2020-01-22 21:15:53.000000000 +0100
++++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt     2020-02-02 21:06:15.193583552 +0100
+@@ -92,7 +92,6 @@ endif(MSVC)
  
  # Configure subdirectories.
  # We depend on these for later projects, so they should come first.
@@ -9,16 +9,15 @@ diff -up shaderc-34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4/CMakeLists.txt.unbundl
  
  if(SHADERC_ENABLE_SPVC)
  add_subdirectory(libshaderc_spvc)
-@@ -81,12 +80,6 @@ add_subdirectory(libshaderc)
+@@ -103,11 +102,6 @@ add_subdirectory(libshaderc)
  add_subdirectory(glslc)
  add_subdirectory(examples)
  
 -add_custom_target(build-version
 -  ${PYTHON_EXECUTABLE}
 -  ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
--  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR}
+-  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
 -  COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
--
+ 
  function(define_pkg_config_file NAME LIBS)
    add_custom_target(${NAME}-pkg-config ALL
-     COMMAND ${CMAKE_COMMAND}
diff --git a/shaderc/0001-Fix-SPIRV-includes-location.patch b/shaderc/0001-Fix-SPIRV-includes-location.patch
new file mode 100644
index 000000000..1b9307fb8
--- /dev/null
+++ b/shaderc/0001-Fix-SPIRV-includes-location.patch
@@ -0,0 +1,73 @@
+From eb3e5917134ec42590e6a27dea7b75b870b22d38 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
+Date: Sun, 2 Feb 2020 23:03:53 +0100
+Subject: [PATCH] Fix SPIRV includes location
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+SPIRV includes have been moved under glslang/ in the latest version.
+
+Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
+---
+ libshaderc/src/shaderc.cc          | 2 +-
+ libshaderc/src/shaderc_cpp_test.cc | 2 +-
+ libshaderc/src/shaderc_test.cc     | 2 +-
+ libshaderc_util/src/compiler.cc    | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
+index fe57c76..82c47ef 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/src/shaderc_cpp_test.cc b/libshaderc/src/shaderc_cpp_test.cc
+index 407d8f4..addb347 100644
+--- a/libshaderc/src/shaderc_cpp_test.cc
++++ b/libshaderc/src/shaderc_cpp_test.cc
+@@ -18,7 +18,7 @@
+ #include <thread>
+ #include <unordered_map>
+ 
+-#include "SPIRV/spirv.hpp"
++#include "glslang/SPIRV/spirv.hpp"
+ #include "spirv-tools/libspirv.hpp"
+ 
+ #include "common_shaders_for_test.h"
+diff --git a/libshaderc/src/shaderc_test.cc b/libshaderc/src/shaderc_test.cc
+index a54b87c..cab5224 100644
+--- a/libshaderc/src/shaderc_test.cc
++++ b/libshaderc/src/shaderc_test.cc
+@@ -18,7 +18,7 @@
+ #include <thread>
+ #include <unordered_map>
+ 
+-#include "SPIRV/spirv.hpp"
++#include "glslang/SPIRV/spirv.hpp"
+ 
+ #include "common_shaders_for_test.h"
+ #include "shaderc/shaderc.h"
+diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc
+index 1809eab..a485b12 100644
+--- a/libshaderc_util/src/compiler.cc
++++ b/libshaderc_util/src/compiler.cc
+@@ -19,7 +19,7 @@
+ #include <sstream>
+ #include <tuple>
+ 
+-#include "SPIRV/GlslangToSpv.h"
++#include "glslang/SPIRV/GlslangToSpv.h"
+ #include "libshaderc_util/format.h"
+ #include "libshaderc_util/io.h"
+ #include "libshaderc_util/message.h"
+-- 
+2.24.1
+
diff --git a/shaderc/fix-glslang-link-order.patch b/shaderc/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch
index a404c8583..d24314487 100644
--- a/shaderc/fix-glslang-link-order.patch
+++ b/shaderc/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch
@@ -15,7 +15,7 @@ Additionally, libshaderc_util also depends on SPIRV-Tools
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0b..0f5d8886 100644
+index acf6fb0..0f5d888 100644
 --- a/glslc/CMakeLists.txt
 +++ b/glslc/CMakeLists.txt
 @@ -18,7 +18,7 @@ add_library(glslc STATIC
@@ -28,10 +28,10 @@ index acf6fb0b..0f5d8886 100644
  
  add_executable(glslc_exe src/main.cc)
 diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 873540ab..6d0c465c 100644
+index 873540a..6d0c465 100644
 --- a/libshaderc_util/CMakeLists.txt
 +++ b/libshaderc_util/CMakeLists.txt
-@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL)
+@@ -32,8 +32,8 @@ add_definitions(-DENABLE_HLSL)
  
  find_package(Threads)
  target_link_libraries(shaderc_util PRIVATE
diff --git a/shaderc/0001-Handle-new-Glslang-profile-enum-in-switch.patch b/shaderc/0001-Handle-new-Glslang-profile-enum-in-switch.patch
new file mode 100644
index 000000000..4400bac52
--- /dev/null
+++ b/shaderc/0001-Handle-new-Glslang-profile-enum-in-switch.patch
@@ -0,0 +1,22 @@
+From 3d99fad173cc0c00d370eeb6663784fc67efd480 Mon Sep 17 00:00:00 2001
+From: David Neto <dneto@google.com>
+Date: Fri, 24 Jan 2020 15:41:21 -0500
+Subject: [PATCH] Handle new Glslang profile enum in switch (#973)
+
+* Handle new Glslang profile enum in switch
+---
+ libshaderc/src/shaderc.cc | 1 +
+ 1 files changed, 1 insertions(+), 0 deletion(-)
+
+diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
+index abbab548..fe57c76b 100644
+--- a/libshaderc/src/shaderc.cc
++++ b/libshaderc/src/shaderc.cc
+@@ -779,6 +779,7 @@ bool shaderc_parse_version_profile(const char* str, int* version,
+       *profile = shaderc_profile_none;
+       return true;
+     case EBadProfile:
++    case EProfileCount:
+       return false;
+   }
+ 
diff --git a/shaderc/Pkgfile b/shaderc/Pkgfile
index d7178abc5..b844f355c 100644
--- a/shaderc/Pkgfile
+++ b/shaderc/Pkgfile
@@ -5,16 +5,17 @@
 # Optional: asciidoctor
 
 name=shaderc
-version=2019.0
-commit=34c412f21f945f4ef6ed4453f8b5dc4bb9d739e4
-release=3
+version=2019.1
+commit=f76bb2f09f858c3014b329961d836964e515095d
+release=1
 source=(
 	https://github.com/google/shaderc/archive/$commit.tar.gz#/$name-$commit.tar.gz
 	#https://github.com/google/$name/archive/v$version/$name-v$version.tar.gz
 	glslc.1 spvc.1 glslc-asciidoc.patch spvc-asciidoc.patch
-	fix-glslang-link-order.patch
+	0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch
 	0001-Drop-third-party-code-in-CMakeLists.txt.patch
-	shaderc-2019.0-fix-build-against-new-glslang.patch)
+	0001-Fix-SPIRV-includes-location.patch
+	0001-Handle-new-Glslang-profile-enum-in-switch.patch)
 
 build() {
 	cd $name-$commit
@@ -23,9 +24,10 @@ build() {
 	patch -d glslc -p0 -i $SRC/glslc-asciidoc.patch
 	patch -d spvc -p0 -i $SRC/spvc-asciidoc.patch
 
-	patch -p1 -i $SRC/fix-glslang-link-order.patch
+	patch -p1 -i $SRC/0001-Fix-the-link-order-of-libglslang-and-libHLSL.patch
 	patch -p1 -i $SRC/0001-Drop-third-party-code-in-CMakeLists.txt.patch
-	patch -p1 -i $SRC/shaderc-2019.0-fix-build-against-new-glslang.patch
+	patch -p1 -i $SRC/0001-Fix-SPIRV-includes-location.patch
+	patch -p1 -i $SRC/0001-Handle-new-Glslang-profile-enum-in-switch.patch
 
 	# de-vendor libs and disable git versioning
 	sed '/examples/d;/third_party/d' -i CMakeLists.txt
diff --git a/shaderc/shaderc-2019.0-fix-build-against-new-glslang.patch b/shaderc/shaderc-2019.0-fix-build-against-new-glslang.patch
deleted file mode 100644
index 807540cf6..000000000
--- a/shaderc/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