From bb658776825fdde181d7cd532bd9a57f3c5f2f7d Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Sun, 24 Jan 2021 23:36:28 +0530
Subject: [PATCH] shaderc: Update to 2020.4.

---
 .../0001-fix-glslang-hlsl-linking-order.patch     | 15 ++-------------
 mingw-w64-shaderc/PKGBUILD                        | 12 ++++++++----
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/mingw-w64-shaderc/0001-fix-glslang-hlsl-linking-order.patch b/mingw-w64-shaderc/0001-fix-glslang-hlsl-linking-order.patch
index f5081e132c..1c16e18823 100644
--- a/mingw-w64-shaderc/0001-fix-glslang-hlsl-linking-order.patch
+++ b/mingw-w64-shaderc/0001-fix-glslang-hlsl-linking-order.patch
@@ -1,23 +1,12 @@
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@
- shaderc_default_compile_options(glslc)
- target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
- target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
--  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
-+  glslang HLSL SPIRV ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
- 
- add_executable(glslc_exe src/main.cc)
 --- a/libshaderc_util/CMakeLists.txt
 +++ b/libshaderc_util/CMakeLists.txt
-@@ -32,8 +32,8 @@
+@@ -46,8 +46,8 @@
  
  find_package(Threads)
  target_link_libraries(shaderc_util PRIVATE
 -  glslang OSDependent OGLCompiler HLSL glslang SPIRV
 -  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
-+  glslang OSDependent OGLCompiler glslang HLSL SPIRV
++  MachineIndependent GenericCodeGen glslang OSDependent OGLCompiler glslang HLSL SPIRV
 +  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
  
  shaderc_add_tests(
diff --git a/mingw-w64-shaderc/PKGBUILD b/mingw-w64-shaderc/PKGBUILD
index 0c66ee035a..7e79d2c0a6 100644
--- a/mingw-w64-shaderc/PKGBUILD
+++ b/mingw-w64-shaderc/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=shaderc
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=2020.0
+pkgver=2020.4
 pkgrel=1
 pkgdesc="Collection of tools, libraries and tests for shader compilation (mingw-w64)"
 url="https://github.com/google/shaderc"
@@ -20,13 +20,13 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-asciidoctor"
              "${MINGW_PACKAGE_PREFIX}-spirv-headers")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/google/shaderc/archive/v${pkgver}.tar.gz"
         "0001-fix-glslang-hlsl-linking-order.patch")
-sha512sums=('1971673d7a5fe77ef827c29db14112d4935c573c7c4f3b00fff3729334284d11640ee40c9e97ebcb2a14c6d5c6db0cf5e2ef6b2dfb59c759d1322c6d38624eb4'
-            'eb350ea32e55ee13eae58df8fc6f038503251672134a1dbb131b04a66475595702b4750ae73ecec30afd2dbff67aca746901ff485c420d4a7e474fcbe56ec830')
+sha512sums=('2deab4a27b9b2a6cd3688e6f3246e5ba5c09a4a799db9294a2e621f31d94a835d8d7f91dd29618ea392eb0a76d0b94263db09ed67fd880edaf179d688cd11e55'
+            '598c8e32196ac015e5d7e486717163425d9b233851f23540fe4d6a79b86ba07dd6804e9d2e4776a3e0f5c33f5057db0a31b03dccc9a49c66971eb34d32e01a7e')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
 
-  # https://github.com/google/shaderc/pull/463
+  # https://www.mail-archive.com/devel@lists.fedoraproject.org/msg156020.html
   patch -Nbp1 -i "${srcdir}/0001-fix-glslang-hlsl-linking-order.patch"
 
   # de-vendor libs and disable git versioning
@@ -51,11 +51,15 @@ build() {
     _extra_config+=(-DCMAKE_BUILD_TYPE=Release)
   fi
 
+  local -a _glslang_inc
+  _glslang_inc=$(cygpath -m "${MINGW_PREFIX}/include/glslang")
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
   ${MINGW_PREFIX}/bin/cmake.exe \
     -G "Ninja" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     ${_extra_config[@]} \
+    -Dglslang_SOURCE_DIR=${_glslang_inc} \
     -DSHADERC_SKIP_TESTS=ON \
     -DSHADERC_ENABLE_WERROR_COMPILE=OFF \
     ../${_realname}-${pkgver}