From 40f607616195509d043d9b2c0412542035a34eda Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Wed, 7 Apr 2021 00:50:27 +1000 Subject: [PATCH] spirv-tools: add missing dependency cmake, use gz instead of zip in source, a rebuild is not required --- spirv-tools/.signature | 6 +++--- spirv-tools/Pkgfile | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/spirv-tools/.signature b/spirv-tools/.signature index dd26dde21..161d4cae1 100644 --- a/spirv-tools/.signature +++ b/spirv-tools/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/VUhjywzBREZh//j/DtnELH5Bz1WG934Q3Z3RVDHK6r2ZX3I8JlCTYlW8Pv6mkzCZPyyCtCXlT/VAuJ0RK94dA0= -SHA256 (Pkgfile) = 12d0016c960de9c7ef6c9bb7027f9a9bae785deeaaf91f75ea882fb374c22b37 +RWSE3ohX2g5d/diy7Kb6lCbgHq9SWYGjsEHTUzOQT0hEwTndbm5iljpVU3X/EKldVzsXqKP11vkZLKu7Js2RwyjA3DXHv+i4ZAk= +SHA256 (Pkgfile) = 63e1b899c96cdc44e806dce2d7c5ce40e5591e3aaa7281eaab86a1b33a04ab85 SHA256 (.footprint) = 792b1ed5f9cf11954a951716c2b0c3849acf6c2ef0a45d91ec512bcc0dd79ba5 SHA256 (SPIRV-Tools-v2020.7.tar.gz) = c06eed1c7a1018b232768481184b5ae4d91d614d7bd7358dc2fe306bd0a39c6e -SHA256 (f88a1f98fa7a44ccfcf33d810c72b200e7d9a78a.zip) = b209fe7fd0db5a2eb61db5d93525ce0f39e4d615f2f82bd02ff0ee512bd45a1e +SHA256 (SPIRV-Headers-f88a1f98fa7a44ccfcf33d810c72b200e7d9a78a.tar.gz) = 11659b29beeb13b5dc56589f7a933def60bd284ee8955c03a8d7510a465e9f51 diff --git a/spirv-tools/Pkgfile b/spirv-tools/Pkgfile index 52ca56dae..b843346de 100644 --- a/spirv-tools/Pkgfile +++ b/spirv-tools/Pkgfile @@ -1,18 +1,20 @@ # 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: cmake name=spirv-tools version=2020.7 +_spirv_headers=f88a1f98fa7a44ccfcf33d810c72b200e7d9a78a release=1 source=(https://github.com/KhronosGroup/SPIRV-Tools/archive/v$version/SPIRV-Tools-v$version.tar.gz - https://github.com/KhronosGroup/SPIRV-Headers/archive/f88a1f98fa7a44ccfcf33d810c72b200e7d9a78a.zip) + https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/SPIRV-Headers-$_spirv_headers.tar.gz) build() { - mv SPIRV-Headers-f88a1f98fa7a44ccfcf33d810c72b200e7d9a78a SPIRV-Headers + mv SPIRV-Headers-$_spirv_headers SPIRV-Headers prt-get isinst ninja && PKGMK_SPIRV_TOOLS+=' -G Ninja' - PKGMK_GLSLANG+=" \ + PKGMK_SPIRV_TOOLS+=" \ -S SPIRV-Tools-$version \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ @@ -23,13 +25,13 @@ build() { -DSPIRV-Headers_SOURCE_DIR="${SRC}"/SPIRV-Headers \ -Wno-dev" - cmake -B build-static $PKGMK_GLSLANG \ + cmake -B build-static $PKGMK_SPIRV_TOOLS \ -D CMAKE_C_FLAGS_RELEASE="${CFLAGS}" \ -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" \ -D BUILD_SHARED_LIBS=OFF cmake --build build-static - cmake -B build-shared $PKGMK_GLSLANG \ + cmake -B build-shared $PKGMK_SPIRV_TOOLS \ -D CMAKE_C_FLAGS_RELEASE="${CFLAGS}" \ -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" \ -D BUILD_SHARED_LIBS=ON