commit d10dce778097c84d9d2e39dddd29e035b8edcc37 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sat Nov 23 19:10:11 2019 +1100 spirv-tools-32: new commit diff --git a/spirv-tools-32/.footprint b/spirv-tools-32/.footprint index 1992132..00b7063 100644 --- a/spirv-tools-32/.footprint +++ b/spirv-tools-32/.footprint @@ -1,5 +1,22 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib32/ +drwxr-xr-x root/root usr/lib32/cmake/ +drwxr-xr-x root/root usr/lib32/cmake/SPIRV-Tools-link/ +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools-link/SPIRV-Tools-linkConfig.cmake +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets-release.cmake +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools-link/SPIRV-Tools-linkTargets.cmake +drwxr-xr-x root/root usr/lib32/cmake/SPIRV-Tools-opt/ +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools-opt/SPIRV-Tools-optConfig.cmake +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets-release.cmake +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake +drwxr-xr-x root/root usr/lib32/cmake/SPIRV-Tools-reduce/ +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceConfig.cmake +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget-release.cmake +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools-reduce/SPIRV-Tools-reduceTarget.cmake +drwxr-xr-x root/root usr/lib32/cmake/SPIRV-Tools/ +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools/SPIRV-ToolsConfig.cmake +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools/SPIRV-ToolsTarget-release.cmake +-rw-r--r-- root/root usr/lib32/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake -rw-r--r-- root/root usr/lib32/libSPIRV-Tools-link.a -rw-r--r-- root/root usr/lib32/libSPIRV-Tools-opt.a -rw-r--r-- root/root usr/lib32/libSPIRV-Tools-reduce.a diff --git a/spirv-tools-32/.signature b/spirv-tools-32/.signature index 040de0c..b66fe04 100644 --- a/spirv-tools-32/.signature +++ b/spirv-tools-32/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXXEo/qY2btEL/IueGF07GlfvfiY0nuYwVIJ6DnQxP1uwP1Gg9zJlfBbV8KrOMZb9dbkPwZiFBjbQ7QAdmw96WwI= -SHA256 (Pkgfile) = 12e8e37a324071b7aa2b20e3e25d896390fd94899330461a6abd35415743570b -SHA256 (.footprint) = 18875d5e13ef976316368e5988ca8109818607102812599965f9dbfd4675b9ca -SHA256 (aa9e8f538041db3055ea443080e0ccc315fa114f) = 7d84713e5760108991edb02b0e65dcf46ce7a1137108a46a9e9d204c8a8fb40d +RWSwxGo/zH7eXRIduWmV58qoIb4U2/n6XnFLZdNlgVTLWDRekFwmjgGeiAovY5qvCL/uPlaDglyCsxXzwh0kHHsNhfKsUtLCWAE= +SHA256 (Pkgfile) = 16c32969565ee53dad073f25f804677ad2ba58063ff9d8ba57494b20fc0d79d7 +SHA256 (.footprint) = 242e30720070a57dd96fadc34548139b480ea807c262e3b5ae6e88851cad8b09 +SHA256 (spirv-tools-3e4abc9ac382b6fc7a88316a700652404b6fb9f7.tar.gz) = c0738c9a8d2f7c91fc264b3bb4095bbab5478972f003b8d2d3f4aa8ac4be3f9a +SHA256 (fix-cmake-install.patch) = 2ece687f65ae274476b5bda7ad404aadc8cbd34b4528cd636bdbba29d4055733 diff --git a/spirv-tools-32/Pkgfile b/spirv-tools-32/Pkgfile index 42bb95a..b028f3f 100644 --- a/spirv-tools-32/Pkgfile +++ b/spirv-tools-32/Pkgfile @@ -5,19 +5,19 @@ name=spirv-tools-32 version=2019.4 -commit=aa9e8f538041db3055ea443080e0ccc315fa114f -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#/spirv-to... + fix-cmake-install.patch ) build() { - mv $commit SPIRV-Tools-$commit.zip - bsdtar -xf SPIRV-Tools-$commit.zip cd SPIRV-Tools-$commit # cd SPIRV-Tools-$version + patch -p1 -i $SRC/fix-cmake-install.patch mkdir build cd build diff --git a/spirv-tools-32/fix-cmake-install.patch b/spirv-tools-32/fix-cmake-install.patch new file mode 100644 index 0000000..abc912e --- /dev/null +++ b/spirv-tools-32/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() +