diff --git a/mingw-w64-vulkan-validation-layers/004-cmake-fix-spirv-libs.patch b/mingw-w64-vulkan-validation-layers/004-cmake-fix-spirv-libs.patch deleted file mode 100644 index 76f3adb222..0000000000 --- a/mingw-w64-vulkan-validation-layers/004-cmake-fix-spirv-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/layers/CMakeLists.txt -+++ b/layers/CMakeLists.txt -@@ -316,7 +319,7 @@ - target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) - endif() - -- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt) -+ target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools SPIRV-Tools-opt) - - - # The output file needs Unix "/" separators or Windows "\" separators On top of that, Windows separators actually need to be doubled diff --git a/mingw-w64-vulkan-validation-layers/PKGBUILD b/mingw-w64-vulkan-validation-layers/PKGBUILD index ca43a84952..c4f2ed7573 100644 --- a/mingw-w64-vulkan-validation-layers/PKGBUILD +++ b/mingw-w64-vulkan-validation-layers/PKGBUILD @@ -4,7 +4,7 @@ _realname=Vulkan-ValidationLayers pkgbase=mingw-w64-vulkan-validation-layers pkgname=("${MINGW_PACKAGE_PREFIX}-vulkan-validation-layers") -pkgver=1.3.206 +pkgver=1.3.211 pkgrel=1 pkgdesc='Vulkan Validation Layers (mingw-w64)' arch=('any') @@ -25,23 +25,28 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz" 001-fix-json-layers-install-dest.patch 002-proper-def-files-for-32bit.patch - 003-install-layout.patch - 004-cmake-fix-spirv-libs.patch) -sha256sums=('fb189c0d68c86af3b31c0f6c48b54480e7150329ffc1e2f37832ea95ecdbc8d1' + 003-install-layout.patch) +sha256sums=('d748df9a37979cd9fefd342c88a71825fefa25624d8d6326383aac44e66bd5c1' 'aae34364773bbe39fa510713c48a5c1bf0fb7b5fe984770bc9e2fd4e1cd12f60' '91afeaf48dc3b46e0e643e1a0445c4562314732c09b10570f01e8ee58acf8b87' - '02dc645bdae0b7150766e1663cc9e675681201d7247d68375c307a5f75db4ce0' - 'f4149f213e7ed80318911c36d5b6db93069d69d811fee301fdecf852d0b09d9f') + '02dc645bdae0b7150766e1663cc9e675681201d7247d68375c307a5f75db4ce0') + +# Helper macros to help make tasks easier # +apply_patch_with_msg() { + for _patch in "$@" + do + msg2 "Applying $_patch" + patch -Np1 -i "${srcdir}/$_patch" + done +} prepare() { cd ${srcdir}/${_realname}-${pkgver} - patch -p1 -i ${srcdir}/001-fix-json-layers-install-dest.patch - patch -p1 -i ${srcdir}/002-proper-def-files-for-32bit.patch - patch -p1 -i ${srcdir}/003-install-layout.patch - - # Fixed in https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/3781 - patch -p1 -i ${srcdir}/004-cmake-fix-spirv-libs.patch + apply_patch_with_msg \ + 001-fix-json-layers-install-dest.patch \ + 002-proper-def-files-for-32bit.patch \ + 003-install-layout.patch } build() {