diff --git a/mingw-w64-spirv-tools/001-cmake-files-location.patch b/mingw-w64-spirv-tools/001-cmake-files-location.patch deleted file mode 100644 index 4a129e03f8..0000000000 --- a/mingw-w64-spirv-tools/001-cmake-files-location.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2020-03-10 12:35:41.979200000 +0300 -+++ b/CMakeLists.txt 2020-03-10 12:35:41.979200000 +0300 -@@ -210,7 +210,7 @@ - endif() - - if(ENABLE_SPIRV_TOOLS_INSTALL) -- if(WIN32) -+ if(MSVC) - macro(spvtools_config_package_dir TARGET PATH) - set(${PATH} ${TARGET}/cmake) - endmacro() diff --git a/mingw-w64-spirv-tools/PKGBUILD b/mingw-w64-spirv-tools/PKGBUILD index 590dc11e4f..624ac15f27 100644 --- a/mingw-w64-spirv-tools/PKGBUILD +++ b/mingw-w64-spirv-tools/PKGBUILD @@ -4,7 +4,7 @@ _realname=spirv-tools pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2023.1 +pkgver=2023.2 pkgrel=1 pkgdesc="API and commands for processing SPIR-V modules (mingw-w64)" arch=('any') @@ -13,21 +13,18 @@ url="https://www.khronos.org/vulkan/" license=('spdx:Apache-2.0') groups=("${MINGW_PACKAGE_PREFIX}-vulkan-devel") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-python" - "${MINGW_PACKAGE_PREFIX}-spirv-headers" - "${MINGW_PACKAGE_PREFIX}-cc") + "${MINGW_PACKAGE_PREFIX}-spirv-headers") source=("${_realname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/SPIRV-Tools/archive/v${pkgver}.tar.gz" - 001-cmake-files-location.patch 002-Do-not-statically-link-to-the-C-runtime-with-mingw.patch) -sha512sums=('ffc1860d54e4badc185f1dd8877fc1d52205670c808c351c0889de95ad27e5854d345333e336a5caa17ab98741597b06508ad71fb00fb07086ee0c31fea8c04e' - '8cbad8289e5f29c621cf225756e69a7784eba005998a041ae3d81cb017582956ec2d07d163ea7a3de38f3f7bd34900509511a8104d2a2d196da23d87c8e35a58' +sha512sums=('988f5e31508e3f19c1dd9d9a013c8e9ff89eba86207a769d7d804f9ee0201c794f412a874c860167b2c040b2c5e1fb1c835ae3684c70feaac86e47f90c1a5010' 'fff1df5dd4b216a1a384b8c61644c1478db61a38e1892095f38d86894a9610f7446a94fa9aea7e638767ab3c56b5eaa9ddd6f172158c096cfbc52f31c1cd932a') prepare() { cd SPIRV-Tools-${pkgver} - patch -p1 -i ${srcdir}/001-cmake-files-location.patch patch -p1 -i ${srcdir}/002-Do-not-statically-link-to-the-C-runtime-with-mingw.patch } @@ -40,7 +37,6 @@ build() { fi echo "Building static library" - [[ -d "${srcdir}"/build-${MSYSTEM}-static ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-static mkdir -p "${srcdir}"/build-${MSYSTEM}-static && cd "${srcdir}"/build-${MSYSTEM}-static MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ @@ -59,7 +55,6 @@ build() { ${MINGW_PREFIX}/bin/cmake.exe --build ./ echo "Building shared library" - [[ -d "${srcdir}"/build-${MSYSTEM}-shared ]] && rm -rf "${srcdir}"/build-${MSYSTEM}-shared mkdir -p "${srcdir}"/build-${MSYSTEM}-shared && cd "${srcdir}"/build-${MSYSTEM}-shared MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \