From a693cfc07de9914bc83ab6e0c33d5ff903d218a3 Mon Sep 17 00:00:00 2001
From: orbea
Date: Thu, 15 Oct 2020 08:46:42 -0700
Subject: graphics/shaderc: Updated for version 2020.3.

Signed-off-by: orbea <orbea@riseup.net>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 graphics/shaderc/fix-glslang-link-order.patch | 44 ---------------------------
 graphics/shaderc/shaderc.SlackBuild           |  9 ++----
 graphics/shaderc/shaderc.info                 |  8 ++---
 3 files changed, 7 insertions(+), 54 deletions(-)
 delete mode 100644 graphics/shaderc/fix-glslang-link-order.patch

(limited to 'graphics')

diff --git a/graphics/shaderc/fix-glslang-link-order.patch b/graphics/shaderc/fix-glslang-link-order.patch
deleted file mode 100644
index ad7de1f33b..0000000000
--- a/graphics/shaderc/fix-glslang-link-order.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 21c8be385b3fab5edcb934a6d99f69fd389c4e67 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git@haasn.xyz>
-Date: Tue, 29 May 2018 07:34:00 +0200
-Subject: [PATCH] Fix the link order of libglslang and libHLSL
-
-libglslang depends on libHLSL, so the latter needs to be specified last.
-This fixes an issue when trying to build shaderc against system-wide
-versions of libglslang/libHLSL, rather than the in-tree versions from
-third_party.
-
-Additionally, libshaderc_util also depends on SPIRV-Tools
----
- glslc/CMakeLists.txt           | 2 +-
- libshaderc_util/CMakeLists.txt | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
-index acf6fb0..0f5d888 100644
---- a/glslc/CMakeLists.txt
-+++ b/glslc/CMakeLists.txt
-@@ -18,7 +18,7 @@ add_library(glslc STATIC
- 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 SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
- target_link_libraries(glslc PRIVATE shaderc_util shaderc)
- 
- add_executable(glslc_exe src/main.cc)
-diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
-index 873540a..6d0c465 100644
---- a/libshaderc_util/CMakeLists.txt
-+++ b/libshaderc_util/CMakeLists.txt
-@@ -34,8 +34,8 @@ endif(SHADERC_ENABLE_INSTALL)
- 
- 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
-+  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
- 
- shaderc_add_tests(
-   TEST_PREFIX shaderc_util
diff --git a/graphics/shaderc/shaderc.SlackBuild b/graphics/shaderc/shaderc.SlackBuild
index 62c0573145..3ea0590f2b 100644
--- a/graphics/shaderc/shaderc.SlackBuild
+++ b/graphics/shaderc/shaderc.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=shaderc
-VERSION=${VERSION:-2020.1}
+VERSION=${VERSION:-2020.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -86,16 +86,13 @@ cat > glslc/src/build-version.inc <<EOF
   "glslang-${glslang_version##* }\\n"
 EOF
 
-# Fix the link order of libglslang and libHLS
-# https://github.com/google/shaderc/pull/463
-patch -p1 < $CWD/fix-glslang-link-order.patch
-
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -I/usr/include/glslang" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_SHARED_LIBS=ON \
     -DSHADERC_SKIP_TESTS=ON \
     -DCMAKE_SKIP_RPATH=TRUE \
     -DCMAKE_BUILD_TYPE=Release ..
diff --git a/graphics/shaderc/shaderc.info b/graphics/shaderc/shaderc.info
index e78ebef97a..f37c316340 100644
--- a/graphics/shaderc/shaderc.info
+++ b/graphics/shaderc/shaderc.info
@@ -1,10 +1,10 @@
 PRGNAM="shaderc"
-VERSION="2020.1"
+VERSION="2020.3"
 HOMEPAGE="https://github.com/google/shaderc"
-DOWNLOAD="https://github.com/google/shaderc/archive/v2020.1/shaderc-2020.1.tar.gz"
-MD5SUM="d12155e2e15a3717a9e71468b844a9ce"
+DOWNLOAD="https://github.com/google/shaderc/archive/v2020.3/shaderc-2020.3.tar.gz"
+MD5SUM="7415b7c5376dd36c610b9cc53c7dbe1b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="vulkan-sdk"
+REQUIRES="glslang"
 MAINTAINER="Hunter Sezen"
 EMAIL="orbea@riseup.net"
-- 
cgit v1.2.3