spirv-tools-32: 2019.4 -> 2019.5

spirv-tools-32/.signature

@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXRIduWmV58qoIb4U2/n6XnFLZdNlgVTLWDRekFwmjgGeiAovY5qvCL/uPlaDglyCsxXzwh0kHHsNhfKsUtLCWAE=
-SHA256 (Pkgfile) = 16c32969565ee53dad073f25f804677ad2ba58063ff9d8ba57494b20fc0d79d7
+RWSwxGo/zH7eXbt/xvFErm52e+oP/Fb6gFc2VyVYrahAYOBLfBbu33K3m8q91Vr3hqY5p46rEMEsIpJCHqVFXYngFTXFHzkTRQQ=
+SHA256 (Pkgfile) = 48d09ce944a28363bbd2a1f01826e3bc4908adcd188fa9602c35d67bf92a1863
 SHA256 (.footprint) = 242e30720070a57dd96fadc34548139b480ea807c262e3b5ae6e88851cad8b09
-SHA256 (spirv-tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7.tar.gz) = c0738c9a8d2f7c91fc264b3bb4095bbab5478972f003b8d2d3f4aa8ac4be3f9a
-SHA256 (fix-cmake-install.patch) = 2ece687f65ae274476b5bda7ad404aadc8cbd34b4528cd636bdbba29d4055733
+SHA256 (spirv-tools-67f4838659f475d618c120e13d1a196d7e00ba4b.tar.gz) = d14511a752b4ac8848eccf1ddeca0c52061e9c6fb111dc6fa88c2a1d8a05bb0c

spirv-tools-32/Pkgfile

@@ -4,35 +4,28 @@
 # Depends on: spirv-tools
 
 name=spirv-tools-32
-version=2019.4
-commit=3e4abc9ac382b6fc7a88316a700652404b6fb9f7
+version=2019.5
+commit=67f4838659f475d618c120e13d1a196d7e00ba4b
 release=3
 source=(
 	#https://github.com/KhronosGroup/SPIRV-Tools/archive//v$version/SPIRV-Tools-v$version.tar.gz
 	https://github.com/KhronosGroup/SPIRV-Tools/archive/$commit.tar.gz#/spirv-tools-$commit.tar.gz
-	fix-cmake-install.patch
 )
 
 build() {
-	cd SPIRV-Tools-$commit
+#	cd SPIRV-Tools-$commit
 #	cd SPIRV-Tools-$version
 
-	patch -p1 -i $SRC/fix-cmake-install.patch
-
-	mkdir build
-	cd build
-
-	cmake .. \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib32 \
+	cmake	-SSPIRV-Tools-$commit -Bbuild -GNinja \
+		-DCMAKE_INSTALL_PREFIX='/usr' \
+		-DCMAKE_INSTALL_LIBDIR='lib32' \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DSPIRV_WERROR=OFF \
-		-DSPIRV-Headers_SOURCE_DIR=/usr \
-		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
-		-G Ninja
+		-DSPIRV-Headers_SOURCE_DIR='/usr' \
+		-DPYTHON_EXECUTABLE='/usr/bin/python3'
 
-	ninja -j ${JOBS:-1}
-	DESTDIR=$PKG ninja install
+	cmake --build build
+	DESTDIR=$PKG cmake --build build --target install
 
 	rm -r $PKG/usr/{bin,include}
 }

spirv-tools-32/fix-cmake-install.patch

@@ -1,12 +0,0 @@
-diff -up SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt.dma SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt
---- SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt.dma	2019-11-12 13:58:34.347573658 +1000
-+++ SPIRV-Tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7/CMakeLists.txt	2019-11-12 13:58:47.166919110 +1000
-@@ -215,7 +215,7 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
-     endmacro()
-   else()
-     macro(spvtools_config_package_dir TARGET PATH)
--      set(${PATH} lib/cmake/${TARGET})
-+      set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET})
-     endmacro()
-   endif()
-