[crux-commits] ports/opt (3.5): spirv-tools: 2019.4 -> 2019.5

crux at crux.nu crux at crux.nu
Sun Jun 7 08:02:08 UTC 2020


commit d1253d1ff0119abae463b37da9173a9da5e0f375
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Sun Jun 7 17:53:19 2020 +1000

    spirv-tools: 2019.4 -> 2019.5

diff --git a/spirv-tools/.signature b/spirv-tools/.signature
index 5592767f9..2eb6d9097 100644
--- a/spirv-tools/.signature
+++ b/spirv-tools/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/W7iAWbJRY7s0gXw72Yql9ud7Mo516RxX3hGpzk2+cwKJYHkhOcOSs/E6kJktaI4bfhyQpSn2trQIhGQ3j81yQo=
-SHA256 (Pkgfile) = 291ce6699df3bb33da7687fe0e734d5fdde64659dd471c9eb1cf0141c5263245
+RWSE3ohX2g5d/VPsT8EO7NXKcbPf7t9nmP6O3QCJxlM7QIim3M2x5ciP6kIT0Bmz68U6d/ou2uLxFnIeoXJQtUsotveqLAME5wY=
+SHA256 (Pkgfile) = 0d7d20f483e06fef702bfdeb4e7ba482111fa2a328e4b5754e7ca544b7dd37bd
 SHA256 (.footprint) = 8476f7a6f9f52a2c6ba3951bddd566aa9862560df47eae928c6d4cf16ecdf05b
-SHA256 (spirv-tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7.tar.gz) = c0738c9a8d2f7c91fc264b3bb4095bbab5478972f003b8d2d3f4aa8ac4be3f9a
-SHA256 (fix-cmake-install.patch) = 2ece687f65ae274476b5bda7ad404aadc8cbd34b4528cd636bdbba29d4055733
+SHA256 (spirv-tools-67f4838659f475d618c120e13d1a196d7e00ba4b.tar.gz) = d14511a752b4ac8848eccf1ddeca0c52061e9c6fb111dc6fa88c2a1d8a05bb0c
diff --git a/spirv-tools/Pkgfile b/spirv-tools/Pkgfile
index a0af1bcc1..2d04f5f03 100644
--- a/spirv-tools/Pkgfile
+++ b/spirv-tools/Pkgfile
@@ -1,27 +1,23 @@
 # Description: API and commands for processing SPIR-V modules
 # URL: https://www.khronos.org/vulkan/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: python3 spirv-headers
+# Depends on: spirv-headers
 
 name=spirv-tools
-version=2019.4
-commit=3e4abc9ac382b6fc7a88316a700652404b6fb9f7
-release=3
+version=2019.5
+commit=67f4838659f475d618c120e13d1a196d7e00ba4b
+release=1
 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#/$name-$commit.tar.gz
-	fix-cmake-install.patch
 )
 
 build() {
 #	cd SPIRV-Tools-$version
-	cd SPIRV-Tools-$commit
-
-	patch -p1 -i $SRC/fix-cmake-install.patch
-
-	mkdir build-{shared,static}
+#	cd SPIRV-Tools-$commit
 
 	local config="
+-SSPIRV-Tools-$commit \
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=lib \
 -DCMAKE_BUILD_TYPE=Release \
@@ -30,16 +26,12 @@ build() {
 -DPYTHON_EXECUTABLE=/usr/bin/python3 \
 -GNinja"
 
-	(cd build-static
-	cmake .. $config -DBUILD_SHARED_LIBS=OFF
-	ninja -j ${JOBS:-1}
-	)
+	cmake -Bbuild-static $config -DBUILD_SHARED_LIBS=OFF
+	cmake --build build-static
 
-	(cd build-shared
-	cmake .. $config -DBUILD_SHARED_LIBS=ON
-	ninja -j ${JOBS:-1}
-	)
+	cmake -Bbuild-shared $config -DBUILD_SHARED_LIBS=ON
+	cmake --build build-static
 
-	DESTDIR=$PKG ninja -C build-static install
-	DESTDIR=$PKG ninja -C build-shared install
+	DESTDIR=$PKG cmake --build build-static --target install
+	DESTDIR=$PKG cmake --build build-shared --target install
 }
diff --git a/spirv-tools/fix-cmake-install.patch b/spirv-tools/fix-cmake-install.patch
deleted file mode 100644
index abc912e0e..000000000
--- a/spirv-tools/fix-cmake-install.patch
+++ /dev/null
@@ -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()
- 


More information about the crux-commits mailing list