fix shaderc

2 files changed, 21 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b1e1c534b30..86d0aa2a93ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = duckstation
 	pkgdesc = Playstation emulator
 	pkgver = 0.1.6759
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/stenzek/duckstation
 	arch = x86_64
 	license = GPL-3.0-only
@@ -23,10 +23,16 @@ pkgbase = duckstation
 	depends = sdl2
 	depends = spirv-tools
 	source = google.shaderc::git+https://github.com/google/shaderc.git
+	source = khronosgroup.glslang::git+https://github.com/KhronosGroup/glslang.git
+	source = khronosgroup.spirv-headers::git+https://github.com/KhronosGroup/SPIRV-Headers.git
+	source = khronosgroup.spirv-tools::git+https://github.com/KhronosGroup/SPIRV-Tools.git
 	source = ianlancetaylor.libbacktrace::git+https://github.com/ianlancetaylor/libbacktrace.git
 	source = duckstation::git+https://github.com/stenzek/duckstation.git#commit=0a63bec65ca0346c89f82469a8a9c9cba401faa1
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = duckstation
diff --git a/PKGBUILD b/PKGBUILD
index 5e65e4546a26..e89f20cad956 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ unset _pkgtype
 _pkgname="duckstation"
 pkgname="$_pkgname${_pkgtype:-}"
 pkgver=0.1.6759
-pkgrel=1
+pkgrel=2
 pkgdesc="Playstation emulator"
 url="https://github.com/stenzek/duckstation"
 arch=('x86_64')
@@ -56,15 +56,24 @@ makedepends=(
 )
 
 _src_shaderc="google.shaderc"
+_src_shaderc_glslang="khronosgroup.glslang"
+_src_shaderc_spirv_headers="khronosgroup.spirv-headers"
+_src_shaderc_spirv_tools="khronosgroup.spirv-tools"
 _src_backtrace="ianlancetaylor.libbacktrace"
 
 source=(
   "$_src_shaderc"::"git+https://github.com/google/shaderc.git"
+  "$_src_shaderc_glslang"::"git+https://github.com/KhronosGroup/glslang.git"
+  "$_src_shaderc_spirv_headers"::"git+https://github.com/KhronosGroup/SPIRV-Headers.git"
+  "$_src_shaderc_spirv_tools"::"git+https://github.com/KhronosGroup/SPIRV-Tools.git"
   "$_src_backtrace"::"git+https://github.com/ianlancetaylor/libbacktrace.git"
 )
 sha256sums=(
   'SKIP'
   'SKIP'
+  'SKIP'
+  'SKIP'
+  'SKIP'
 )
 
 if [ "${_build_git::1}" != "t" ]; then
@@ -98,18 +107,12 @@ else
 fi
 
 prepare() {
+  ln -s "$srcdir/$_src_shaderc_glslang" "$srcdir/$_src_shaderc"/third_party/glslang
+  ln -s "$srcdir/$_src_shaderc_spirv_headers" "$srcdir/$_src_shaderc"/third_party/spirv-headers
+  ln -s "$srcdir/$_src_shaderc_spirv_tools" "$srcdir/$_src_shaderc"/third_party/spirv-tools
+
   cd "$_src_shaderc"
-  # apply duckstation patch
   git apply "$srcdir/$_pkgname/scripts/shaderc-changes.patch"
-
-  # de-vendor libs and disable git versioning
-  sed '/examples/d;/third_party/d' -i CMakeLists.txt
-  sed '/build-version/d' -i glslc/CMakeLists.txt
-  cat <<- EOF > glslc/src/build-version.inc
-"${pkgver}\\n"
-"$(pacman -Q spirv-tools | cut -d \  -f 2 | sed 's/-.*//')\\n"
-"$(pacman -Q glslang | cut -d \  -f 2 | sed 's/-.*//')\\n"
-EOF
 }
 
 build() {
@@ -148,7 +151,6 @@ build() {
     -DSHADERC_SKIP_TESTS=ON
     -DSHADERC_SKIP_EXAMPLES=ON
     -DSHADERC_SKIP_COPYRIGHT_CHECK=ON
-    -Dglslang_SOURCE_DIR=/usr/include/glslang
     -Wno-dev
   )