spirv-tools: update to 2020.3

* use source tarball instead of git repository
* add spirv-headers as a make depdency
* remove explicity set compiler flags
* use cmake command to build and install
This commit is contained in:
Biswapriyo Nath
2020-07-17 20:16:47 +05:30
parent b4bd23d744
commit 70fc1e77c5

View File

@@ -3,7 +3,7 @@
_realname=spirv-tools
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2020.2
pkgver=2020.3
pkgrel=1
pkgdesc="API and commands for processing SPIR-V modules (mingw-w64)"
arch=('any')
@@ -13,16 +13,14 @@ groups=("${MINGW_PACKAGE_PREFIX}-vulkan-devel")
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-python"
"git")
source=("git+https://github.com/KhronosGroup/SPIRV-Tools.git#tag=v${pkgver}"
"git+https://github.com/KhronosGroup/SPIRV-Headers.git"
"${MINGW_PACKAGE_PREFIX}-spirv-headers")
source=("${_realname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/SPIRV-Tools/archive/v2020.3.tar.gz"
001-cmake-files-location.patch)
sha256sums=('SKIP'
'SKIP'
'b76834f15d7af8c268897fac1584e94199c976a57dafb2c4390e0fce28934776')
sha512sums=('8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f'
'8cbad8289e5f29c621cf225756e69a7784eba005998a041ae3d81cb017582956ec2d07d163ea7a3de38f3f7bd34900509511a8104d2a2d196da23d87c8e35a58')
prepare() {
cd SPIRV-Tools
cd SPIRV-Tools-${pkgver}
patch -p1 -i ${srcdir}/001-cmake-files-location.patch
}
@@ -37,19 +35,18 @@ build() {
extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
fi
CFLAGS+=" -Wno-switch"
CXXFLAGS+=" -Wno-switch"
msg2 "Building shared library"
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake \
-G'MSYS Makefiles' \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
"${extra_config[@]}" \
-DSPIRV_WERROR=OFF \
-DBUILD_SHARED_LIBS=ON \
-DSPIRV-Headers_SOURCE_DIR=${srcdir}/SPIRV-Headers \
../SPIRV-Tools
make
-DSPIRV-Headers_SOURCE_DIR=${MINGW_PREFIX} \
../SPIRV-Tools-${pkgver}
${MINGW_PREFIX}/bin/cmake --build ./
msg2 "Building static library"
[[ -d "${srcdir}"/build-${CARCH}-static ]] && rm -rf "${srcdir}"/build-${CARCH}-static
@@ -59,21 +56,23 @@ build() {
-G'MSYS Makefiles' \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
"${extra_config[@]}" \
-DSPIRV_WERROR=OFF \
-DBUILD_SHARED_LIBS=OFF \
-DSPIRV-Headers_SOURCE_DIR=${srcdir}/SPIRV-Headers \
../SPIRV-Tools
make
-DSPIRV-Headers_SOURCE_DIR=${MINGW_PREFIX} \
../SPIRV-Tools-${pkgver}
${MINGW_PREFIX}/bin/cmake --build ./
}
package() {
cd "${srcdir}"/build-${CARCH}-shared
make DESTDIR="${pkgdir}" install
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install
cd "${srcdir}"/build-${CARCH}-static
make DESTDIR="${pkgdir}" install
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build ./ --target install
install -dm755 "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}"
install -m644 ${srcdir}/SPIRV-Tools/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/"
install -m644 ${srcdir}/SPIRV-Tools-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/"
local _WIN_PREFIX=$(cygpath -am ${MINGW_PREFIX})
for _f in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do