2020.0

2 files changed, 26 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27c453d4b97f..6ad3256c79ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = mingw-w64-shaderc
 	pkgdesc = Collection of tools, libraries and tests for shader compilation (mingw-w64)
-	pkgver = 2018.0
+	pkgver = 2020.0
 	pkgrel = 1
 	url = https://github.com/google/shaderc
 	arch = any
 	license = Apache
 	makedepends = mingw-w64-cmake
-	makedepends = mingw-w64-spirv-tools
-	makedepends = mingw-w64-glslang
-	source = mingw-w64-shaderc-2018.0.tar.gz::https://github.com/google/shaderc/archive/v2018.0.tar.gz
-	source = fix-glslang-link-order.patch::https://github.com/google/shaderc/pull/463/commits/21c8be385b3fab5edcb934a6d99f69fd389c4e67.patch
-	sha512sums = 7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0
-	sha512sums = 995297afe2f70086fb5a68e19c8b2e958812dca77e400c7697adaa8b8dbaee62a2f6784794c5a838a1bae96ab71fd3b72d2a50424512f52ee7f324f629e7b390
+	makedepends = python
+	depends = mingw-w64-glslang
+	options = !strip
+	options = !buildflags
+	options = staticlibs
+	source = https://github.com/google/shaderc/archive/v2020.0.tar.gz
+	sha256sums = e02e2a9d4c3960bc629ca8cdcf83d295bec9c80ed08a8c5062e4e294022605ec
 
 pkgname = mingw-w64-shaderc
 
diff --git a/PKGBUILD b/PKGBUILD
index 59afa54b718f..c1133cb84867 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,40 @@
-_pkgname=shaderc
-pkgname="mingw-w64-${_pkgname}"
-pkgver=2018.0
+pkgname=mingw-w64-shaderc
+pkgver=2020.0
 pkgrel=1
 pkgdesc='Collection of tools, libraries and tests for shader compilation (mingw-w64)'
 url='https://github.com/google/shaderc'
 arch=('any')
 license=('Apache')
-depends=()
-makedepends=('mingw-w64-cmake' 'mingw-w64-spirv-tools' 'mingw-w64-glslang')
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/google/shaderc/archive/v${pkgver}.tar.gz
-        'fix-glslang-link-order.patch::https://github.com/google/shaderc/pull/463/commits/21c8be385b3fab5edcb934a6d99f69fd389c4e67.patch')
-sha512sums=('7a420fde73c9f2aae3f13558d538a1f4ae43bba19e2b4d2da8fbbd017e9e4f328ece5f330f1bbcb9fe84c91b7eb84b9158dc2e3d144c82939090a0fa6f5b4ef0'
-            '995297afe2f70086fb5a68e19c8b2e958812dca77e400c7697adaa8b8dbaee62a2f6784794c5a838a1bae96ab71fd3b72d2a50424512f52ee7f324f629e7b390')
+depends=('mingw-w64-glslang')
+makedepends=('mingw-w64-cmake' 'python')
+options=('!strip' '!buildflags' 'staticlibs')
+source=(https://github.com/google/shaderc/archive/v${pkgver}.tar.gz)
+sha256sums=('e02e2a9d4c3960bc629ca8cdcf83d295bec9c80ed08a8c5062e4e294022605ec')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
-# https://github.com/gentoo/gentoo/blob/c31d001aeedaf97917fa29fa859e16090cc50282/media-libs/shaderc/shaderc-2017.2.ebuild#L35-L65
 prepare() {
-  cd $_pkgname-$pkgver
-  patch -Np1 < ../fix-glslang-link-order.patch
+  cd shaderc-$pkgver
+  curl -L https://github.com/google/shaderc/pull/463.patch | patch -p1
 
   # 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"
+"$(pacman -Q mingw-w64-spirv-tools|cut -d \  -f 2|sed 's/-.*//')\\n"
+"$(pacman -Q mingw-w64-glslang|cut -d \  -f 2|sed 's/-.*//')\\n"
 EOF
 }
 
 build() {
-  cd $_pkgname-$pkgver
+  cd shaderc-$pkgver
   for _arch in ${_architectures}; do
-    unset LDFLAGS
-    mkdir -p "build-${_arch}" && pushd "build-${_arch}"
+    mkdir -p build-${_arch} && pushd build-${_arch}
     ${_arch}-cmake \
       -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_INSTALL_LIBDIR=lib \
       -DSHADERC_SKIP_TESTS=ON \
-      -DSHADERC_ENABLE_NV_EXTENSIONS=OFF \
+      -DBUILD_SHARED_LIBS=OFF \
       ..
     make
     popd
@@ -48,12 +43,10 @@ build() {
 
 package() {
   for _arch in ${_architectures}; do
-    cd "${srcdir}/$_pkgname-$pkgver/build-${_arch}"
+    cd "${srcdir}/shaderc-$pkgver/build-${_arch}"
     make DESTDIR="$pkgdir" install
-    find "$pkgdir/usr/${_arch}" -name '*.exe' -exec ${_arch}-strip {} \;
-    find "$pkgdir/usr/${_arch}" -name '*.dll' -exec ${_arch}-strip --strip-unneeded {} \;
-    find "$pkgdir/usr/${_arch}" -name '*.a' -o -name '*.dll' | xargs ${_arch}-strip -g
+    rm "${pkgdir}"/usr/${_arch}/bin/*.exe
+    ${_arch}-strip -g "${pkgdir}"/usr/${_arch}/lib/*.a
+    ${_arch}-strip --strip-unneeded "${pkgdir}"/usr/${_arch}/bin/*.dll
   done
 }
-
-# vim: ts=2 sw=2 et: