Update proton-winevulkan patchsets for 88da78e and move previous vers…

…ions to legacy

proton-tkg/PKGBUILD

@@ -1,7 +1,7 @@
 # Created by: Tk-Glitch <ti3nou at gmail dot com>
 
 pkgname=proton-tkg-git
-pkgver=6.4.r13.g3d3cbfce
+pkgver=6.5.r1.g2e42e7d9
 pkgrel=1
 _frogwhere="$PWD"
 # Arch chroot workaround

wine-tkg-git/PKGBUILD

@@ -1,7 +1,7 @@
 # Created by: Tk-Glitch <ti3nou at gmail dot com>
 
 pkgname=wine-tkg-git
-pkgver=6.4.r13.g3d3cbfce
+pkgver=6.5.r1.g2e42e7d9
 
 # workaround for pkgrel overwritten on regen
 pkgrel=1
@@ -435,8 +435,8 @@ md5sums=('SKIP'
          '3d7f6a56676689c811f659c11a9f3f2d'
          '5f35a4e35e21055381f54d2693a87dc2'
          '87eb77f746f8c29bc8cff1d4dfce4bdc'
-         '21fdec6ec7011e8e3dd3ba451ec6a0e7'
-         '35fe66e7d56fc88cef7886df8d723109'
+         'e818c3c596b5c9e10a1561f807cf0655'
+         'ddf4b9957d86d9dcc6fb4893491a0146'
          '853baac75d041f8b1c4f3543b5ee47dd'
          '7a5d2d682248ca3367d4a299fdf6cf27'
          '6d05eb9a910d693201f4e045284bb868'

wine-tkg-git/wine-tkg-patches/proton/proton-winevulkan-nofshack.patch

@@ -448,7 +448,7 @@ index 82d0c3a0a5e..8da14348c18 100644
      VkResult (*p_vkReleasePerformanceConfigurationINTEL)(VkDevice, VkPerformanceConfigurationINTEL);
      VkResult (*p_vkResetCommandBuffer)(VkCommandBuffer, VkCommandBufferResetFlags);
      VkResult (*p_vkResetCommandPool)(VkDevice, VkCommandPool, VkCommandPoolResetFlags);
-@@ -1332,18 +1358,24 @@ struct vulkan_instance_funcs
+@@ -1332,13 +1358,19 @@ struct vulkan_instance_funcs
      VkResult (*p_vkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, uint32_t *, VkSurfaceFormat2KHR *);
  #endif
      VkResult (*p_vkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkSurfaceFormatKHR *);
@@ -461,11 +461,6 @@ index 82d0c3a0a5e..8da14348c18 100644
      VkResult (*p_vkGetPhysicalDeviceSurfaceSupportKHR)(VkPhysicalDevice, uint32_t, VkSurfaceKHR, VkBool32 *);
      VkResult (*p_vkGetPhysicalDeviceToolPropertiesEXT)(VkPhysicalDevice, uint32_t *, VkPhysicalDeviceToolPropertiesEXT *);
      VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t);
- #if defined(USE_STRUCT_CONVERSION)
-     void (*p_vkSubmitDebugUtilsMessageEXT)(VkInstance, VkDebugUtilsMessageSeverityFlagBitsEXT, VkDebugUtilsMessageTypeFlagsEXT, const VkDebugUtilsMessengerCallbackDataEXT_host *);
- #else
-     void (*p_vkSubmitDebugUtilsMessageEXT)(VkInstance, VkDebugUtilsMessageSeverityFlagBitsEXT, VkDebugUtilsMessageTypeFlagsEXT, const VkDebugUtilsMessengerCallbackDataEXT *);
- #endif
  };
 
  #define ALL_VK_DEVICE_FUNCS() \

wine-tkg-git/wine-tkg-patches/proton/proton-winevulkan.patch

@@ -452,7 +452,7 @@ index 82d0c3a0a5e..8da14348c18 100644
      VkResult (*p_vkReleasePerformanceConfigurationINTEL)(VkDevice, VkPerformanceConfigurationINTEL);
      VkResult (*p_vkResetCommandBuffer)(VkCommandBuffer, VkCommandBufferResetFlags);
      VkResult (*p_vkResetCommandPool)(VkDevice, VkCommandPool, VkCommandPoolResetFlags);
-@@ -1332,18 +1358,24 @@ struct vulkan_instance_funcs
+@@ -1332,13 +1358,19 @@ struct vulkan_instance_funcs
      VkResult (*p_vkGetPhysicalDeviceSurfaceFormats2KHR)(VkPhysicalDevice, const VkPhysicalDeviceSurfaceInfo2KHR *, uint32_t *, VkSurfaceFormat2KHR *);
  #endif
      VkResult (*p_vkGetPhysicalDeviceSurfaceFormatsKHR)(VkPhysicalDevice, VkSurfaceKHR, uint32_t *, VkSurfaceFormatKHR *);
@@ -465,11 +465,6 @@ index 82d0c3a0a5e..8da14348c18 100644
      VkResult (*p_vkGetPhysicalDeviceSurfaceSupportKHR)(VkPhysicalDevice, uint32_t, VkSurfaceKHR, VkBool32 *);
      VkResult (*p_vkGetPhysicalDeviceToolPropertiesEXT)(VkPhysicalDevice, uint32_t *, VkPhysicalDeviceToolPropertiesEXT *);
      VkBool32 (*p_vkGetPhysicalDeviceWin32PresentationSupportKHR)(VkPhysicalDevice, uint32_t);
- #if defined(USE_STRUCT_CONVERSION)
-     void (*p_vkSubmitDebugUtilsMessageEXT)(VkInstance, VkDebugUtilsMessageSeverityFlagBitsEXT, VkDebugUtilsMessageTypeFlagsEXT, const VkDebugUtilsMessengerCallbackDataEXT_host *);
- #else
-     void (*p_vkSubmitDebugUtilsMessageEXT)(VkInstance, VkDebugUtilsMessageSeverityFlagBitsEXT, VkDebugUtilsMessageTypeFlagsEXT, const VkDebugUtilsMessengerCallbackDataEXT *);
- #endif
  };
 
  #define ALL_VK_DEVICE_FUNCS() \

wine-tkg-git/wine-tkg-scripts/prepare.sh

@@ -2204,14 +2204,16 @@ EOM
 	    _patchname='proton_fs_hack_integer_scaling.patch' && _patchmsg="Enable Proton fs hack integer scaling" && nonuser_patcher
 	  fi
 	  if [ "$_update_winevulkan" = "true" ] && git merge-base --is-ancestor 7e736b5903d3d078bbf7bb6a509536a942f6b9a0 HEAD; then
-	    if git merge-base --is-ancestor c681a0732fc3c6466b228417bb5e0d518d26b819 HEAD; then
+	    if git merge-base --is-ancestor 88da78ef428317ff8c258277511abebf1a75e186 HEAD; then
 	      if [ "$_proton_fs_hack" = "true" ]; then
 	        _patchname='proton-winevulkan.patch' && _patchmsg="Using Proton winevulkan patches" && nonuser_patcher
 	      else
 	        _patchname='proton-winevulkan-nofshack.patch' && _patchmsg="Using Proton winevulkan patches (nofshack)" && nonuser_patcher
 	      fi
 	    else
-	      if git merge-base --is-ancestor eb9f3dd3ad07aae3c9588bcff376ed2a7a8ef8d2 HEAD; then
+	      if git merge-base --is-ancestor c681a0732fc3c6466b228417bb5e0d518d26b819 HEAD; then
+	        _lastcommit="88da78e"
+	      elif git merge-base --is-ancestor eb9f3dd3ad07aae3c9588bcff376ed2a7a8ef8d2 HEAD; then
 	        _lastcommit="c681a07"
 	      elif git merge-base --is-ancestor 7d8c50e4371f2fc5300b90b323210c922d80d4e9 HEAD; then
 	        _lastcommit="eb9f3dd"