vulkan: Update to 1.2.194

mingw-w64-vulkan-headers/PKGBUILD

@@ -4,8 +4,8 @@
 _realname=Vulkan-Headers
 pkgbase=mingw-w64-vulkan-headers
 pkgname=("${MINGW_PACKAGE_PREFIX}-vulkan-headers")
-pkgver=1.2.179
-pkgrel=2
+pkgver=1.2.194
+pkgrel=1
 pkgdesc='Vulkan header files (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -17,7 +17,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-ninja")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz"
         "0001-fix-export.patch")
-sha256sums=('b659719ae08379be36022d545247cba50036827fdeec5ae1b30889d50f358459'
+sha256sums=('8700d4c88fc2cde245829135a316d68f854cf979e87db5504ee4c42f24023355'
             '155048d7f96a84d59c0746889ab8d5741b4393213b11b7ebe3c78eb3b395cece')
 
 prepare() {

mingw-w64-vulkan-loader/002-proper-def-files-for-32bit.patch

@@ -1,22 +1,8 @@
---- Vulkan-Loader-1.2.158.orig/loader/CMakeLists.txt
-+++ Vulkan-Loader-1.2.158/loader/CMakeLists.txt
-@@ -70,6 +70,7 @@
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
- 
- if(WIN32)
-+    if(MSVC)
-     # Use static MSVCRT libraries
-     foreach(configuration
-             in
-@@ -89,6 +90,7 @@
-                            "${${configuration}}")
-         endif()
-     endforeach()
-+    endif()
- 
-     if(ENABLE_WIN10_ONECORE)
-         # Note: When linking your app or driver to OneCore.lib, be sure to remove any links to non-umbrella libs (such as
-@@ -137,7 +139,7 @@
+diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
+index 56ff014..8e884f3 100644
+--- a/loader/CMakeLists.txt
++++ b/loader/CMakeLists.txt
+@@ -172,7 +172,7 @@ set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG}Note that this may be unsafe, as the C co
  set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG} the stack frame for certain calls. If the compiler does not do this, then unknown device")
  set(ASM_FAILURE_MSG "${ASM_FAILURE_MSG} extensions will suffer from a corrupted stack.")
  if(WIN32)
@@ -25,7 +11,7 @@
          find_program(JWASM_FOUND jwasm)
          if (JWASM_FOUND)
              set(CMAKE_ASM_MASM_COMPILER ${JWASM_FOUND})
-@@ -155,7 +157,7 @@
+@@ -190,7 +190,7 @@ if(WIN32)
      if (USE_MASM)
        enable_language(ASM_MASM)
      endif ()
@@ -34,7 +20,7 @@
          if(MINGW)
              set(CMAKE_ASM_MASM_FLAGS ${CMAKE_ASM_MASM_FLAGS} ${JWASM_FLAGS})
          elseif(NOT CMAKE_CL_64 AND NOT JWASM_FOUND)
-@@ -169,12 +171,14 @@
+@@ -204,12 +204,14 @@ if(WIN32)
          set_target_properties(loader_asm_gen_files PROPERTIES FOLDER ${LOADER_HELPER_FOLDER})
          add_library(loader-unknown-chain OBJECT unknown_ext_chain_masm.asm)
          add_dependencies(loader-unknown-chain loader_asm_gen_files)
@@ -43,39 +29,36 @@
          message(WARNING "Could not find working MASM assebler\n${ASM_FAILURE_MSG}")
          add_custom_target(loader_asm_gen_files)
          add_library(loader-unknown-chain OBJECT unknown_ext_chain.c)
-         target_compile_options(loader-unknown-chain PUBLIC "$<$<CONFIG:DEBUG>:${LOCAL_C_FLAGS_REL}>")
+         set_target_properties(loader-unknown-chain PROPERTIES CMAKE_C_FLAGS_DEBUG "${MODIFIED_C_FLAGS_DEBUG}")
          target_compile_options(loader-unknown-chain PUBLIC ${MSVC_LOADER_COMPILE_OPTIONS})
 +        set_target_properties(loader-unknown-chain PROPERTIES DEFINE_SYMBOL "VK_BUILDING_DLL")
      endif()
  elseif(APPLE)
      # For MacOS, use the C code and force the compiler's tail-call optimization instead of using assembly code.
-@@ -207,12 +211,14 @@
+@@ -242,12 +244,14 @@ endif()
  
  if(WIN32)
      add_library(loader-norm OBJECT ${NORMAL_LOADER_SRCS} dirent_on_windows.c)
 +    set_target_properties(loader-norm PROPERTIES DEFINE_SYMBOL "VK_BUILDING_DLL")
-     target_compile_options(loader-norm PUBLIC "$<$<CONFIG:DEBUG>:${LOCAL_C_FLAGS_DBG}>")
+     # target_compile_options(loader-norm PUBLIC "$<$<CONFIG:DEBUG>:${LOCAL_C_FLAGS_DBG}>")
      target_compile_options(loader-norm PUBLIC ${MSVC_LOADER_COMPILE_OPTIONS})
      target_include_directories(loader-norm PRIVATE "$<TARGET_PROPERTY:Vulkan::Headers,INTERFACE_INCLUDE_DIRECTORIES>")
  
      add_library(loader-opt OBJECT ${OPT_LOADER_SRCS})
      add_dependencies(loader-opt loader_asm_gen_files)
 +    set_target_properties(loader-opt PROPERTIES DEFINE_SYMBOL "VK_BUILDING_DLL")
-     target_compile_options(loader-opt PUBLIC "$<$<CONFIG:DEBUG>:${LOCAL_C_FLAGS_REL}>")
+     set_target_properties(loader-opt PROPERTIES CMAKE_C_FLAGS_DEBUG "${MODIFIED_C_FLAGS_DEBUG}")
      target_compile_options(loader-opt PUBLIC ${MSVC_LOADER_COMPILE_OPTIONS})
      target_include_directories(loader-opt PRIVATE "$<TARGET_PROPERTY:Vulkan::Headers,INTERFACE_INCLUDE_DIRECTORIES>")
-@@ -224,6 +230,7 @@
-                 $<TARGET_OBJECTS:loader-unknown-chain>
-                 ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-1.def
-                 ${CMAKE_CURRENT_SOURCE_DIR}/loader.rc)
+@@ -267,10 +271,17 @@ if(WIN32)
+     # when adding the suffix the import and runtime library names must be consistent
+     # mingw: libvulkan-1.dll.a / libvulkan-1.dll
+     # msvc: vulkan-1.lib / vulkan-1.dll
 +    if(MSVC)
      set_target_properties(vulkan
-                           PROPERTIES LINK_FLAGS_DEBUG
-                                      "/ignore:4098"
-@@ -231,9 +238,16 @@
-                                      vulkan-1
-                                      PREFIX
-                                      "")
+                           PROPERTIES
+                           OUTPUT_NAME vulkan-1)
+-
 +    else()
 +    set_target_properties(vulkan
 +                          PROPERTIES
@@ -85,14 +68,12 @@
 +    endif()
      target_link_libraries(vulkan Vulkan::Headers)
  
--    if(ENABLE_WIN10_ONECORE)
-+    if(ENABLE_WIN10_ONECORE AND MSVC)
-         target_link_libraries(vulkan OneCoreUAP.lib LIBCMT.LIB LIBCMTD.LIB LIBVCRUNTIME.LIB LIBUCRT.LIB)
-         set_target_properties(vulkan PROPERTIES LINK_FLAGS "/NODEFAULTLIB")
-     else()
---- Vulkan-Loader-1.2.158.orig/loader/loader.h
-+++ Vulkan-Loader-1.2.158/loader/loader.h
-@@ -38,7 +38,13 @@
+     if(MSVC AND ENABLE_WIN10_ONECORE)
+diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
+index f603f19..987465e 100644
+--- a/loader/vk_loader_platform.h
++++ b/loader/vk_loader_platform.h
+@@ -71,7 +71,13 @@
  #include "vk_layer_dispatch_table.h"
  #include "vk_loader_extensions.h"
  
@@ -107,9 +88,11 @@
  #define LOADER_EXPORT __attribute__((visibility("default")))
  #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
  #define LOADER_EXPORT __attribute__((visibility("default")))
---- Vulkan-Loader-1.2.158.orig/loader/vulkan-1.def
-+++ Vulkan-Loader-1.2.158/loader/vulkan-1.def
-@@ -21,7 +21,7 @@
+diff --git a/loader/vulkan-1.def b/loader/vulkan-1.def
+index aa74306..ca91743 100644
+--- a/loader/vulkan-1.def
++++ b/loader/vulkan-1.def
+@@ -22,7 +22,7 @@
  ;
  ;;;;  End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
@@ -118,20 +101,3 @@
  EXPORTS
     vkCreateInstance
     vkDestroyInstance
---- Vulkan-Loader-1.2.158.orig/tests/layers/vk_format_utils.h
-+++ Vulkan-Loader-1.2.158/tests/layers/vk_format_utils.h
-@@ -25,7 +25,13 @@
- #include "vulkan/vulkan.h"
- 
- #if !defined(VK_LAYER_EXPORT)
--#if defined(__GNUC__) && __GNUC__ >= 4
-+#if defined(_WIN32)
-+#  if defined (VK_BUILDING_DLL)
-+#    define VK_LAYER_EXPORT __declspec(dllexport)
-+#  else
-+#    define VK_LAYER_EXPORT
-+#  endif
-+#elif defined(__GNUC__) && __GNUC__ >= 4
- #define VK_LAYER_EXPORT __attribute__((visibility("default")))
- #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
- #define VK_LAYER_EXPORT __attribute__((visibility("default")))

mingw-w64-vulkan-loader/PKGBUILD

@@ -6,8 +6,8 @@ pkgbase=mingw-w64-vulkan-loader
 pkgname=("${MINGW_PACKAGE_PREFIX}-vulkan-loader")
 provides=("${MINGW_PACKAGE_PREFIX}-vulkan")
 replaces=("${MINGW_PACKAGE_PREFIX}-vulkan")
-pkgver=1.2.179
-pkgrel=2
+pkgver=1.2.194
+pkgrel=1
 pkgdesc='Vulkan Installable Client Driver (ICD) Loader (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -20,18 +20,21 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-vulkan-headers"
              "${MINGW_PACKAGE_PREFIX}-python")
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/${_realname}/archive/v${pkgver}.tar.gz"
+        "https://github.com/KhronosGroup/Vulkan-Loader/commit/8c0ee92.patch"
         002-proper-def-files-for-32bit.patch
         003-generate-pkgconfig-files.patch
         004-disable-suffix-in-static-lib.patch
         libvulkan-32.def)
-sha256sums=('bc035c3735cc5147b98aed4856446ebe7e2512394b8c86193891bb08baf15f66'
-            'e02c140457301960c81d7941e01675d5676ca29e5894525c10fb17097d1ced69'
+sha256sums=('5c5017ac93dbfbead705d2bb9d10c8bbaeed9f916b9043b61950fb6a2fb91d65'
+            '50ddd856059adf3959a4f4a5871862a39e395049a1cb65c89288378a056cc273'
+            '4b10b486ebcf20b9ca7ede4184427adc2222b2cbea14c505603bfd17f6abccaa'
             '97c5ff3d945d2ed5d5a8b9cc8b6199ff55d4e6b210e59143228c4e82d0252cb4'
             'ee0def2718356a2ed441a786e99a0136b9c425274f660cd4447ed0aff4b0de6a'
             '70a65c93c9bd4fece5ea50cdbf77dad615996d9264813c840b19b1c14186b73b')
 
 prepare() {
   cd ${srcdir}/${_realname}-${pkgver}
+  patch -p1 -i "${srcdir}/8c0ee92.patch"
   patch -p1 -i ${srcdir}/002-proper-def-files-for-32bit.patch
   patch -p1 -i ${srcdir}/003-generate-pkgconfig-files.patch
   patch -p1 -i ${srcdir}/004-disable-suffix-in-static-lib.patch

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.2.179
+pkgver=1.2.194
 pkgrel=1
 pkgdesc='Vulkan Validation Layers (mingw-w64)'
 arch=('any')
@@ -25,7 +25,7 @@ source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/KhronosGroup/${_rea
         001-fix-json-layers-install-dest.patch
         002-proper-def-files-for-32bit.patch
         003-install-layout.patch)
-sha256sums=('3c9bd746c4f025674083d1d63bafc561149130be1a8e514532d43f5dcad45e9d'
+sha256sums=('c2a601fa8ccf2ae633c9e929149c489fbf97e951995f8982001e129fa1b850c2'
             'aae34364773bbe39fa510713c48a5c1bf0fb7b5fe984770bc9e2fd4e1cd12f60'
             '07e12b905174d2b2cb44babe548fe521d913226000daf29e1d812a10ce67829a'
             '02dc645bdae0b7150766e1663cc9e675681201d7247d68375c307a5f75db4ce0')