commit cfb0b6182a462f10ceb448f72fd0180489696f57 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Nov 23 18:17:52 2019 +1100 spirv-tools: new commit diff --git a/spirv-tools/.footprint b/spirv-tools/.footprint index c49250fe0..ad9657d31 100644 --- a/spirv-tools/.footprint +++ b/spirv-tools/.footprint @@ -16,6 +16,23 @@ drwxr-xr-x root/root usr/include/spirv-tools/ -rw-r--r-- root/root usr/include/spirv-tools/linker.hpp -rw-r--r-- root/root usr/include/spirv-tools/optimizer.hpp drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/cmake/ +drwxr-xr-x root/root usr/lib/cmake/SPIRV-Tools-link/ +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkConfig.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets.cmake +drwxr-xr-x root/root usr/lib/cmake/SPIRV-Tools-opt/ +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optConfig.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake +drwxr-xr-x root/root usr/lib/cmake/SPIRV-Tools-reduce/ +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceConfig.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake +drwxr-xr-x root/root usr/lib/cmake/SPIRV-Tools/ +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget-release.cmake +-rw-r--r-- root/root usr/lib/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake -rw-r--r-- root/root usr/lib/libSPIRV-Tools-link.a -rwxr-xr-x root/root usr/lib/libSPIRV-Tools-link.so -rw-r--r-- root/root usr/lib/libSPIRV-Tools-opt.a diff --git a/spirv-tools/.signature b/spirv-tools/.signature index 558c19264..5592767f9 100644 --- a/spirv-tools/.signature +++ b/spirv-tools/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dx+2+JzyZ1WmqP0Lymnx1cgpJHpHyG6bi+lI4+42Fw05nH6G2VExm8K3X4AxuyySA5twVrCedZQZr9A0UMJMwA= -SHA256 (Pkgfile) = 4e9fa5372376f622d40e7322917e73d6bb4b41c81a31f0268b8f57e36760a766 -SHA256 (.footprint) = 5c67a8d63c2309bc78e38f5a64431991456f37074c60f62a1d1652b67c18514e -SHA256 (06407250a169c6a03b3765e86619075af1a8c187) = d1d2f9cbd91784c8cc9747fb843c638a698c3cc71effe7c37f3edbdbdcc7fb46 +RWSE3ohX2g5d/W7iAWbJRY7s0gXw72Yql9ud7Mo516RxX3hGpzk2+cwKJYHkhOcOSs/E6kJktaI4bfhyQpSn2trQIhGQ3j81yQo= +SHA256 (Pkgfile) = 291ce6699df3bb33da7687fe0e734d5fdde64659dd471c9eb1cf0141c5263245 +SHA256 (.footprint) = 8476f7a6f9f52a2c6ba3951bddd566aa9862560df47eae928c6d4cf16ecdf05b +SHA256 (spirv-tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7.tar.gz) = c0738c9a8d2f7c91fc264b3bb4095bbab5478972f003b8d2d3f4aa8ac4be3f9a +SHA256 (fix-cmake-install.patch) = 2ece687f65ae274476b5bda7ad404aadc8cbd34b4528cd636bdbba29d4055733 diff --git a/spirv-tools/Pkgfile b/spirv-tools/Pkgfile index 9998e2617..a0af1bcc1 100644 --- a/spirv-tools/Pkgfile +++ b/spirv-tools/Pkgfile @@ -5,20 +5,20 @@ name=spirv-tools version=2019.4 -commit=06407250a169c6a03b3765e86619075af1a8c187 -release=2 +commit=3e4abc9ac382b6fc7a88316a700652404b6fb9f7 +release=3 source=( #https://github.com/KhronosGroup/SPIRV-Tools/archive/v$version/SPIRV-Tools-v$... - https://codeload.github.com/KhronosGroup/SPIRV-Tools/zip/$commit + https://github.com/KhronosGroup/SPIRV-Tools/archive/$commit.tar.gz#/$name-$c... + fix-cmake-install.patch ) build() { - mv $commit SPIRV-Tools-$commit.zip - bsdtar -xf SPIRV-Tools-$commit.zip - # cd SPIRV-Tools-$version cd SPIRV-Tools-$commit + patch -p1 -i $SRC/fix-cmake-install.patch + mkdir build-{shared,static} local config=" diff --git a/spirv-tools/fix-cmake-install.patch b/spirv-tools/fix-cmake-install.patch new file mode 100644 index 000000000..abc912e0e --- /dev/null +++ b/spirv-tools/fix-cmake-install.patch @@ -0,0 +1,12 @@ +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() +