Update to 2020.4

Fix dependency on SPIRV tools (lib32).
Modify how glslang is included.
Add a .gitignore file for sanity if somebody ever needs it outside of myself.

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

3 files changed, 16 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc0fe3e606fc..f95b38ec7840 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lib32-shaderc
 	pkgdesc = Collection of tools, libraries and tests for shader compilation (32bit)
-	pkgver = 2020.0
-	pkgrel = 4
+	pkgver = 2020.4
+	pkgrel = 1
 	url = https://github.com/google/shaderc
 	arch = x86_64
 	license = Apache
@@ -14,11 +14,10 @@ pkgbase = lib32-shaderc
 	depends = lib32-gcc-libs
 	depends = lib32-glslang>=8.13.3559
 	depends = lib32-spirv-tools>=2019.5
-	depends = spirv-tools>=2019.5
 	provides = libshaderc_shared.so
 	conflicts = lib32-shaderc-git
-	source = shaderc-2020.0.tar.gz::https://github.com/google/shaderc/archive/v2020.0.tar.gz
-	sha512sums = 1971673d7a5fe77ef827c29db14112d4935c573c7c4f3b00fff3729334284d11640ee40c9e97ebcb2a14c6d5c6db0cf5e2ef6b2dfb59c759d1322c6d38624eb4
+	source = shaderc-2020.4.tar.gz::https://github.com/google/shaderc/archive/v2020.4.tar.gz
+	sha512sums = 2deab4a27b9b2a6cd3688e6f3246e5ba5c09a4a799db9294a2e621f31d94a835d8d7f91dd29618ea392eb0a76d0b94263db09ed67fd880edaf179d688cd11e55
 
 pkgname = lib32-shaderc
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..9c590eec56e8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+src/
+pkg/
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index d6908debd888..4e8adc787237 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@ _setFullLibdir="${_setPrefix}/${_setLibdir}"
 _pkgbasename=shaderc
 
 pkgname=lib32-$_pkgbasename
-pkgver=2020.0
-pkgrel=4
+pkgver=2020.4
+pkgrel=1
 pkgdesc='Collection of tools, libraries and tests for shader compilation (32bit)'
 url='https://github.com/google/shaderc'
 arch=('x86_64')
@@ -17,7 +17,6 @@ depends=("$_pkgbasename"
         'lib32-gcc-libs'
         'lib32-glslang>=8.13.3559'
         'lib32-spirv-tools>=2019.5'
-        'spirv-tools>=2019.5'
         )
 makedepends=(
         'cmake'
@@ -31,7 +30,7 @@ source=(
         "${_pkgbasename}-${pkgver}.tar.gz::https://github.com/google/shaderc/archive/v${pkgver}.tar.gz"
         )
 sha512sums=(
-        '1971673d7a5fe77ef827c29db14112d4935c573c7c4f3b00fff3729334284d11640ee40c9e97ebcb2a14c6d5c6db0cf5e2ef6b2dfb59c759d1322c6d38624eb4'
+        '2deab4a27b9b2a6cd3688e6f3246e5ba5c09a4a799db9294a2e621f31d94a835d8d7f91dd29618ea392eb0a76d0b94263db09ed67fd880edaf179d688cd11e55'
         )
 
 prepare() {
@@ -51,24 +50,26 @@ build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  export CFLAGS+=" ${CPPFLAGS}"
-  export CXXFLAGS+=" ${CPPFLAGS} -I/usr/include/glslang"
+#  export CFLAGS+=" ${CPPFLAGS}"
+#  export CXXFLAGS+=" ${CPPFLAGS} -I/usr/include/glslang"
 
+  cd ${_pkgbasename}-${pkgver}
   cmake \
       -B build \
-      -S ${_pkgbasename}-${pkgver} \
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_INSTALL_PREFIX="/usr" \
       -DCMAKE_INSTALL_LIBDIR="lib32" \
       -DSHADERC_SKIP_TESTS=ON \
+      -Dglslang_SOURCE_DIR=/usr/include/glslang \
       -G Ninja
     ninja -C build
 
-#  cd ${_pkgbasename}-${pkgver}/glslc
+#  cd glslc
 #  asciidoctor -b manpage README.asciidoc -o glslc.1
 }
 
 package() {
+  cd ${_pkgbasename}-${pkgver}
   DESTDIR="${pkgdir}" ninja -C build install
 
   # Use the same naming scheme as the one in the lib32-shaderc-git package for coherence
@@ -77,5 +78,5 @@ package() {
   done
 
   rm -r "${pkgdir}"/usr/include
-#  install -Dm 644 ${_pkgbasename}-${pkgver}/glslc/glslc.1 -t "${pkgdir}/usr/share/man/man1"
+#  install -Dm 644 glslc/glslc.1 -t "${pkgdir}/usr/share/man/man1"
 }