Merge pull request msys2#18583 from lazka/fix-vulkan-utility-librarie…

…s-conflict

vulkan-utility-libraries: fix file conflicts with vulkan-validation-layers

mingw-w64-vulkan-utility-libraries/PKGBUILD

@@ -4,7 +4,7 @@ _realname=Vulkan-Utility-Libraries
 pkgbase=mingw-w64-vulkan-utility-libraries
 pkgname=("${MINGW_PACKAGE_PREFIX}-vulkan-utility-libraries")
 pkgver=1.3.264
-pkgrel=1
+pkgrel=2
 pkgdesc='Libraries for Vulkan developers (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -57,5 +57,9 @@ package() {
   cd ${srcdir}/build-${MSYSTEM}
   DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install .
 
-  install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE.md ${pkgdir}${MINGW_PREFIX}/share/licenses/vulkan-validation-layers/LICENSE
+  # FIXME: Once we update Vulkan-ValidationLayers we can remove this since the header
+  # got removed there: https://github.com/KhronosGroup/Vulkan-ValidationLayers/pull/6385
+  rm "${pkgdir}${MINGW_PREFIX}/include/vulkan/vk_enum_string_helper.h"
+
+  install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE.md ${pkgdir}${MINGW_PREFIX}/share/licenses/vulkan-utility-libraries/LICENSE
 }