version 1.1.114

Not 1.1.115 yet due to other build fix issues need to attend to first
But won't be as out of date

4 files changed, 432 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66eb9a8e6cb0..44781ac13b9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-vulkan-icd-loader
 	pkgdesc = Vulkan Installable Client Driver (ICD) Loader (mingw-w64)
-	pkgver = 1.1.97
+	pkgver = 1.1.114
 	pkgrel = 1
 	url = https://www.khronos.org/vulkan/
 	arch = any
@@ -14,10 +14,14 @@ pkgbase = mingw-w64-vulkan-icd-loader
 	options = staticlibs
 	options = !strip
 	options = !emptydirs
-	source = Vulkan-Loader-1.1.97.tar.gz::https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.1.97.tar.gz
+	source = Vulkan-Loader-1.1.114.tar.gz::https://github.com/KhronosGroup/Vulkan-Loader/archive/v1.1.114.tar.gz
 	source = 001-build-fix.patch
-	sha256sums = fe76a062b408e0dddc9214a86b68774b744450f76fd6ccaa40eab9df1979db49
+	source = 002-proper-def-files-for-32bit.patch
+	source = 003-generate-pkgconfig-files.patch
+	sha256sums = b5dd14f51f80de38d93dbf25b6a0232e3621507b97122a30534d39a82d89fa6f
 	sha256sums = 64ef57d8551a0b33f63aa98a06c276d5e8e24d9b4ff27347baa8fcb2a39c1295
+	sha256sums = 0182a4c25214fd63290396a23d162dd1e523232a5746e77bec2de1616de31c59
+	sha256sums = 5c189b3f76fa53ad12077cd8932423a0cf385f9464cdde60ba711589ccde19ad
 
 pkgname = mingw-w64-vulkan-icd-loader
 
diff --git a/002-proper-def-files-for-32bit.patch b/002-proper-def-files-for-32bit.patch
new file mode 100644
index 000000000000..72158a248eb3
--- /dev/null
+++ b/002-proper-def-files-for-32bit.patch
@@ -0,0 +1,390 @@
+diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/CMakeLists.txt Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/CMakeLists.txt
+--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/CMakeLists.txt	2017-04-05 00:36:39.000000000 +0300
++++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/CMakeLists.txt	2017-06-29 08:34:52.393725000 +0300
+@@ -61,6 +61,16 @@
+     endif()
+ endif()
+ 
++if (WIN32)
++  if(${CMAKE_SIZEOF_VOID_P} EQUAL 8)
++    set(DEFFILE_SUFFIX "")
++    set(WINBITS Win64)
++  else()
++    set(DEFFILE_SUFFIX "-x86")
++    set(WINBITS Win32)
++  endif()
++endif()
++
+ if(WIN32)
+     # Treat warnings as errors
+     add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/WX>")
+diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/CMakeLists.txt Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/CMakeLists.txt
+--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/CMakeLists.txt	2017-06-29 08:19:36.448133100 +0300
++++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/CMakeLists.txt	2017-06-29 08:42:41.322355600 +0300
+@@ -137,6 +137,7 @@
+ set_target_properties(loader_gen_files PROPERTIES FOLDER ${LOADER_HELPER_FOLDER})
+ 
+ if(WIN32)
++    if(MSVC)
+     # Use static MSVCRT libraries
+     foreach(configuration
+             in
+@@ -156,6 +157,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
+@@ -190,24 +192,32 @@
+                     $<TARGET_OBJECTS:loader-opt>
+                     $<TARGET_OBJECTS:loader-norm>
+                     $<TARGET_OBJECTS:loader-unknown-chain>
+-                    ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-1.def
++                    ${CMAKE_CURRENT_SOURCE_DIR}/vulkan-1${DEFFILE_SUFFIX}.def
+                     ${CMAKE_CURRENT_SOURCE_DIR}/loader.rc)
++        if(MSVC)
+         set_target_properties(vulkan
+                               PROPERTIES LINK_FLAGS_DEBUG
+                                          "/ignore:4098"
+                                          OUTPUT_NAME
+                                          vulkan-1)
++        else()
++        set_target_properties(vulkan
++                              PROPERTIES
++                              LIBRARY_OUTPUT_NAME vulkan
++                              RUNTIME_OUTPUT_NAME vulkan-1
++                              ARCHIVE_OUTPUT_NAME vulkan)
++        endif()
+         target_link_libraries(vulkan Vulkan::Headers)
+     else()
+         add_library(vulkan
+                     STATIC
+                     $<TARGET_OBJECTS:loader-opt>
+                     $<TARGET_OBJECTS:loader-norm>
+                     $<TARGET_OBJECTS:loader-unknown-chain>)
+         set_target_properties(vulkan PROPERTIES OUTPUT_NAME VKstatic.1)
+     endif()
+ 
+-    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()
+diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/vulkan-1-x86.def Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/vulkan-1-x86.def
+--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/vulkan-1-x86.def	1970-01-01 03:00:00.000000000 +0300
++++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/vulkan-1-x86.def	2017-04-05 00:36:39.000000000 +0300
+@@ -0,0 +1,221 @@
++
++;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
++;
++; Copyright (c) 2015-2017 The Khronos Group Inc.
++; Copyright (c) 2015-2017 Valve Corporation
++; Copyright (c) 2015-2017 LunarG, Inc.
++;
++; Licensed under the Apache License, Version 2.0 (the "License");
++; you may not use this file except in compliance with the License.
++; You may obtain a copy of the License at
++;
++;     http://www.apache.org/licenses/LICENSE-2.0
++;
++; Unless required by applicable law or agreed to in writing, software
++; distributed under the License is distributed on an "AS IS" BASIS,
++; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++; See the License for the specific language governing permissions and
++; limitations under the License.
++;
++;  Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
++;
++;;;;  End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
++
++LIBRARY vulkan-1.dll
++EXPORTS
++   vkCreateInstance@12
++   vkDestroyInstance@8
++   vkEnumeratePhysicalDevices@12
++   vkGetPhysicalDeviceFeatures@8
++   vkGetPhysicalDeviceFormatProperties@12
++   vkGetPhysicalDeviceImageFormatProperties@28
++   vkGetPhysicalDeviceProperties@8
++   vkGetPhysicalDeviceQueueFamilyProperties@12
++   vkGetPhysicalDeviceMemoryProperties@8
++   vkGetInstanceProcAddr@8
++   vkGetDeviceProcAddr@8
++   vkCreateDevice@16
++   vkDestroyDevice@8
++   vkEnumerateInstanceExtensionProperties@12
++   vkEnumerateDeviceExtensionProperties@16
++   vkEnumerateInstanceLayerProperties@8
++   vkEnumerateDeviceLayerProperties@12
++   vkGetDeviceQueue@16
++   vkQueueSubmit@20
++   vkQueueWaitIdle@4
++   vkDeviceWaitIdle@4
++   vkAllocateMemory@16
++   vkFreeMemory@16
++   vkMapMemory@36
++   vkUnmapMemory@12
++   vkFlushMappedMemoryRanges@12
++   vkInvalidateMappedMemoryRanges@12
++   vkGetDeviceMemoryCommitment@16
++   vkBindBufferMemory@28
++   vkBindImageMemory@28
++   vkGetBufferMemoryRequirements@16
++   vkGetImageMemoryRequirements@16
++   vkGetImageSparseMemoryRequirements@20
++   vkGetPhysicalDeviceSparseImageFormatProperties@32
++   vkQueueBindSparse@20
++   vkCreateFence@16
++   vkDestroyFence@16
++   vkResetFences@12
++   vkGetFenceStatus@12
++   vkWaitForFences@24
++   vkCreateSemaphore@16
++   vkDestroySemaphore@16
++   vkCreateEvent@16
++   vkDestroyEvent@16
++   vkGetEventStatus@12
++   vkSetEvent@12
++   vkResetEvent@12
++   vkCreateQueryPool@16
++   vkDestroyQueryPool@16
++   vkGetQueryPoolResults@40
++   vkCreateBuffer@16
++   vkDestroyBuffer@16
++   vkCreateBufferView@16
++   vkDestroyBufferView@16
++   vkCreateImage@16
++   vkDestroyImage@16
++   vkGetImageSubresourceLayout@20
++   vkCreateImageView@16
++   vkDestroyImageView@16
++   vkCreateShaderModule@16
++   vkDestroyShaderModule@16
++   vkCreatePipelineCache@16
++   vkDestroyPipelineCache@16
++   vkGetPipelineCacheData@20
++   vkMergePipelineCaches@20
++   vkCreateGraphicsPipelines@28
++   vkCreateComputePipelines@28
++   vkDestroyPipeline@16
++   vkCreatePipelineLayout@16
++   vkDestroyPipelineLayout@16
++   vkCreateSampler@16
++   vkDestroySampler@16
++   vkCreateDescriptorSetLayout@16
++   vkDestroyDescriptorSetLayout@16
++   vkCreateDescriptorPool@16
++   vkDestroyDescriptorPool@16
++   vkResetDescriptorPool@16
++   vkAllocateDescriptorSets@12
++   vkFreeDescriptorSets@20
++   vkUpdateDescriptorSets@20
++   vkCreateFramebuffer@16
++   vkDestroyFramebuffer@16
++   vkCreateRenderPass@16
++   vkDestroyRenderPass@16
++   vkGetRenderAreaGranularity@16
++   vkCreateCommandPool@16
++   vkDestroyCommandPool@16
++   vkResetCommandPool@16
++   vkAllocateCommandBuffers@12
++   vkFreeCommandBuffers@20
++   vkBeginCommandBuffer@8
++   vkEndCommandBuffer@4
++   vkResetCommandBuffer@8
++   vkCmdBindPipeline@16
++   vkCmdSetViewport@16
++   vkCmdSetScissor@16
++   vkCmdSetLineWidth@8
++   vkCmdSetDepthBias@16
++   vkCmdSetBlendConstants@8
++   vkCmdSetDepthBounds@12
++   vkCmdSetStencilCompareMask@12
++   vkCmdSetStencilWriteMask@12
++   vkCmdSetStencilReference@12
++   vkCmdBindDescriptorSets@36
++   vkCmdBindIndexBuffer@24
++   vkCmdBindVertexBuffers@20
++   vkCmdDraw@20
++   vkCmdDrawIndexed@24
++   vkCmdDrawIndirect@28
++   vkCmdDrawIndexedIndirect@28
++   vkCmdDispatch@16
++   vkCmdDispatchIndirect@20
++   vkCmdCopyBuffer@28
++   vkCmdCopyImage@36
++   vkCmdBlitImage@40
++   vkCmdCopyBufferToImage@32
++   vkCmdCopyImageToBuffer@32
++   vkCmdUpdateBuffer@32
++   vkCmdFillBuffer@32
++   vkCmdClearColorImage@28
++   vkCmdClearDepthStencilImage@28
++   vkCmdClearAttachments@20
++   vkCmdResolveImage@36
++   vkCmdSetEvent@16
++   vkCmdResetEvent@16
++   vkCmdWaitEvents@44
++   vkCmdPipelineBarrier@40
++   vkCmdBeginQuery@20
++   vkCmdEndQuery@16
++   vkCmdResetQueryPool@20
++   vkCmdWriteTimestamp@20
++   vkCmdCopyQueryPoolResults@48
++   vkCmdPushConstants@28
++   vkCmdBeginRenderPass@12
++   vkCmdNextSubpass@8
++   vkCmdEndRenderPass@4
++   vkCmdExecuteCommands@12
++   vkDestroySurfaceKHR@16
++   vkGetPhysicalDeviceSurfaceSupportKHR@20
++   vkGetPhysicalDeviceSurfaceCapabilitiesKHR@16
++   vkGetPhysicalDeviceSurfaceFormatsKHR@20
++   vkGetPhysicalDeviceSurfacePresentModesKHR@20
++   vkCreateSwapchainKHR@16
++   vkDestroySwapchainKHR@16
++   vkGetSwapchainImagesKHR@20
++   vkAcquireNextImageKHR@40
++   vkQueuePresentKHR@8
++   vkGetPhysicalDeviceDisplayPropertiesKHR@12
++   vkGetPhysicalDeviceDisplayPlanePropertiesKHR@12
++   vkGetDisplayPlaneSupportedDisplaysKHR@16
++   vkGetDisplayModePropertiesKHR@20
++   vkCreateDisplayModeKHR@24
++   vkGetDisplayPlaneCapabilitiesKHR@20
++   vkCreateDisplayPlaneSurfaceKHR@16
++   vkCreateSharedSwapchainsKHR@20
++   vkCreateWin32SurfaceKHR@16
++   vkGetPhysicalDeviceWin32PresentationSupportKHR@8
++
++   vkEnumerateInstanceVersion@4
++   vkEnumeratePhysicalDeviceGroups@12
++   vkGetPhysicalDeviceFeatures2@8
++   vkGetPhysicalDeviceProperties2@8
++   vkGetPhysicalDeviceFormatProperties2@12
++   vkGetPhysicalDeviceQueueFamilyProperties2@12
++   vkGetPhysicalDeviceMemoryProperties2@8
++   vkGetPhysicalDeviceSparseImageFormatProperties2@16
++   vkGetPhysicalDeviceExternalBufferProperties@12
++   vkGetPhysicalDeviceExternalSemaphoreProperties@12
++   vkGetPhysicalDeviceExternalFenceProperties@12
++   vkBindBufferMemory2@12
++   vkBindImageMemory2@12
++   vkGetDeviceGroupPeerMemoryFeatures@20
++   vkCmdSetDeviceMask@8
++   vkCmdDispatchBase@28
++   vkGetImageMemoryRequirements2@12
++   vkGetBufferMemoryRequirements2@12
++   vkTrimCommandPool@16
++   vkGetDeviceQueue2@12
++   vkCreateSamplerYcbcrConversion@16
++   vkDestroySamplerYcbcrConversion@16
++   vkGetDescriptorSetLayoutSupport@12
++   vkGetDeviceGroupPresentCapabilitiesKHR@8
++   vkGetDeviceGroupSurfacePresentModesKHR@16
++   vkGetPhysicalDevicePresentRectanglesKHR@20
++   vkAcquireNextImage2KHR@12
++   vkCreateDescriptorUpdateTemplate@16
++   vkDestroyDescriptorUpdateTemplate@16
++   vkUpdateDescriptorSetWithTemplate@24
++
++   vkGetPhysicalDeviceDisplayProperties2KHR@12
++   vkGetPhysicalDeviceDisplayPlaneProperties2KHR@12
++   vkGetDisplayModeProperties2KHR@20
++   vkGetDisplayPlaneCapabilities2KHR@12
++
++   vkGetImageSparseMemoryRequirements2@16
++   vkGetPhysicalDeviceImageFormatProperties2@12
+diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/tests/layers/CMakeLists.txt Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/tests/layers/CMakeLists.txt
+--- Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0-orig/tests/layers/CMakeLists.txt	2017-04-05 00:36:39.000000000 +0300
++++ Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0/tests/layers/CMakeLists.txt	2017-06-29 08:39:07.115088000 +0300
+@@ -19,12 +19,12 @@
+ 
+ if(WIN32)
+     macro(AddVkLayer target)
+-        file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/VkLayer_${target}.def DEF_FILE)
++        file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/VkLayer_${target}${DEFFILE_SUFFIX}.def DEF_FILE)
+         add_custom_target(copy-${target}-def-file ALL
+-                          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DEF_FILE} VkLayer_${target}.def
++                          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DEF_FILE} VkLayer_${target}${DEFFILE_SUFFIX}.def
+                           VERBATIM)
+         set_target_properties(copy-${target}-def-file PROPERTIES FOLDER ${LOADER_HELPER_FOLDER})
+-        add_library(VkLayer_${target} SHARED ${ARGN} VkLayer_${target}.def)
++        add_library(VkLayer_${target} SHARED ${ARGN} VkLayer_${target}${DEFFILE_SUFFIX}.def)
+         target_compile_options(VkLayer_${target} PUBLIC ${MSVC_LOADER_COMPILE_OPTIONS})
+         add_dependencies(VkLayer_${target} generate_helper_files)
+     endmacro()
+diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/tests/layers/VkLayer_test-x86.def Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/tests/layers/VkLayer_test-x86.def
+--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/tests/layers/VkLayer_test-x86.def	1970-01-01 03:00:00.000000000 +0300
++++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/tests/layers/VkLayer_test-x86.def	2017-04-05 00:36:39.000000000 +0300
+@@ -0,0 +1,32 @@
++; THIS FILE IS GENERATED.  DO NOT EDIT.
++
++;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
++; Vulkan
++;
++; Copyright (c) 2015-2016 The Khronos Group Inc.
++; Copyright (c) 2015-2016 Valve Corporation
++; Copyright (c) 2015-2016 LunarG, Inc.
++;
++; Licensed under the Apache License, Version 2.0 (the "License");
++; you may not use this file except in compliance with the License.
++; You may obtain a copy of the License at
++;
++;     http://www.apache.org/licenses/LICENSE-2.0
++;
++; Unless required by applicable law or agreed to in writing, software
++; distributed under the License is distributed on an "AS IS" BASIS,
++; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++; See the License for the specific language governing permissions and
++; limitations under the License.
++;
++;  Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
++;;;;  End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
++
++; The following is required on Windows, for exporting symbols from the DLL
++
++LIBRARY VkLayer_test
++EXPORTS
++vkGetInstanceProcAddr@8
++vkGetDeviceProcAddr@8
++vkEnumerateInstanceLayerProperties@8
++vkEnumerateInstanceExtensionProperties@12
+diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/tests/layers/VkLayer_wrap_objects-x86.def Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/tests/layers/VkLayer_wrap_objects-x86.def
+--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/tests/layers/VkLayer_wrap_objects-x86.def	1970-01-01 03:00:00.000000000 +0300
++++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/tests/layers/VkLayer_wrap_objects-x86.def	2017-04-05 00:36:39.000000000 +0300
+@@ -0,0 +1,32 @@
++; THIS FILE IS GENERATED.  DO NOT EDIT.
++
++;;;; Begin Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
++; Vulkan
++;
++; Copyright (c) 2015-2016 The Khronos Group Inc.
++; Copyright (c) 2015-2016 Valve Corporation
++; Copyright (c) 2015-2016 LunarG, Inc.
++;
++; Licensed under the Apache License, Version 2.0 (the "License");
++; you may not use this file except in compliance with the License.
++; You may obtain a copy of the License at
++;
++;     http://www.apache.org/licenses/LICENSE-2.0
++;
++; Unless required by applicable law or agreed to in writing, software
++; distributed under the License is distributed on an "AS IS" BASIS,
++; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++; See the License for the specific language governing permissions and
++; limitations under the License.
++;
++;  Author: Courtney Goeltzenleuchter <courtney@LunarG.com>
++;;;;  End Copyright Notice ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
++
++; The following is required on Windows, for exporting symbols from the DLL
++
++LIBRARY VkLayer_wrap_objects
++EXPORTS
++vkGetInstanceProcAddr@8
++vkGetDeviceProcAddr@8
++vkEnumerateInstanceLayerProperties@8
++vkEnumerateInstanceExtensionProperties@12
diff --git a/003-generate-pkgconfig-files.patch b/003-generate-pkgconfig-files.patch
new file mode 100644
index 000000000000..770079b3de1f
--- /dev/null
+++ b/003-generate-pkgconfig-files.patch
@@ -0,0 +1,18 @@
+diff -Naur Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/CMakeLists.txt Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/CMakeLists.txt
+--- Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0-orig/loader/CMakeLists.txt	2017-06-29 08:19:36.448133100 +0300
++++ Vulkan-LoaderAndValidationLayers-sdk-1.0.46.0/loader/CMakeLists.txt	2017-06-29 08:42:41.322355600 +0300
+@@ -286,6 +286,7 @@
+     if(INSTALL_LVL_FILES)
+         install(TARGETS ${API_LOWERCASE} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+     endif()
++endif()
+ 
+     if(NOT APPLE)
+         # Generate pkg-config file.
+@@ -302,6 +302,5 @@
+             endif()
+         endif()
+     endif()
+-endif()
+ 
+ 
diff --git a/PKGBUILD b/PKGBUILD
index bb41321290db..2d5fe4fd09a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=mingw-w64-vulkan-icd-loader
 _pkgname=Vulkan-Loader
-pkgver=1.1.97
+pkgver=1.1.114
 pkgrel=1
 pkgdesc="Vulkan Installable Client Driver (ICD) Loader (mingw-w64)"
 arch=(any)
@@ -17,19 +17,29 @@ makedepends=(mingw-w64-cmake mingw-w64-vulkan-headers python-lxml)
 depends=(mingw-w64-crt)
 options=(!buildflags staticlibs !strip !emptydirs)
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/${_pkgname}/archive/v${pkgver}.tar.gz"
-        "001-build-fix.patch")
-sha256sums=('fe76a062b408e0dddc9214a86b68774b744450f76fd6ccaa40eab9df1979db49'
-            '64ef57d8551a0b33f63aa98a06c276d5e8e24d9b4ff27347baa8fcb2a39c1295')
+        "001-build-fix.patch"
+        "002-proper-def-files-for-32bit.patch"
+        "003-generate-pkgconfig-files.patch")
+sha256sums=('b5dd14f51f80de38d93dbf25b6a0232e3621507b97122a30534d39a82d89fa6f'
+            '64ef57d8551a0b33f63aa98a06c276d5e8e24d9b4ff27347baa8fcb2a39c1295'
+            '0182a4c25214fd63290396a23d162dd1e523232a5746e77bec2de1616de31c59'
+            '5c189b3f76fa53ad12077cd8932423a0cf385f9464cdde60ba711589ccde19ad')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}/loader"
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+
   # From the PedroHLC's aur package mingw-w64-vulkan-loader
   # which is based of https://github.com/Alexpux/MINGW-packages/blob/master/mingw-w64-vulkan-loader/PKGBUILD
+  patch -p1 -i "${srcdir}/001-build-fix.patch"
+  patch -p1 -i "${srcdir}/002-proper-def-files-for-32bit.patch"
+  patch -p1 -i "${srcdir}/003-generate-pkgconfig-files.patch"
+  cd loader
   sed -i'' -E 's/#include <([^>]+)>/#include <\L\1>/g' *.h *.c
   sed -i'' -E 's/target_link_libraries\(([^\)]+)\)/target_link_libraries\(\L\1\)/g' CMakeLists.txt
-  patch -p2 -i "${srcdir}/001-build-fix.patch"
+  # revert back just the vulkan::headers caused by previous sed
+  sed -i'' -E 's/vulkan::headers/Vulkan::Headers/g' CMakeLists.txt
 
   # Added also this because __declspec(thread) was being ultimately ignored,
   # making a non-tls variable of a tls variable.
@@ -67,14 +77,7 @@ package() {
     make DESTDIR="${pkgdir}" install
     popd
     install -Dm644 "LICENSE.txt" "${pkgdir}/usr/${_arch}/share/licenses/vulkan-loader/LICENSE"
-    install -d "${pkgdir}/usr/${_arch}/lib/pkgconfig"
-    sed -e "s/@CMAKE_INSTALL_PREFIX@/\/usr\/${_arch}/g" \
-      -e "s/@CMAKE_INSTALL_LIBDIR@/lib/g" \
-      -e "s/@CMAKE_PROJECT_NAME@/Vulkan-Loader/g" \
-      -e "s/@VK_API_VERSION@/${pkgver}/g" \
-      -e "s/-lvulkan/-lvulkan-1/g" \
-      -e "s/@PRIVATE_LIBS@/-ladvapi32 -lcfgmgr32/g" \
-      loader/vulkan.pc.in > "${pkgdir}/usr/${_arch}/lib/pkgconfig/vulkan.pc"
+
     ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll
     ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
   done