Update to 6.0-rc6

4 years ago · ac4f40d604
parent adac2aa7fe
commit ac4f40d604
4 changed files with 23 additions and 36 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,3 @@
-/wine-6.0-rc5.tar.xz
-/wine-6.0-rc5.tar.xz.sign
-/wine-staging-6.0-rc5.tar.gz
+/wine-6.0-rc6.tar.xz
+/wine-6.0-rc6.tar.xz.sign
+/wine-staging-6.0-rc6.tar.gz
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (wine-6.0-rc5.tar.xz) = e995ad4ddd2c71c9f5ffd963e2d9743a45fc325aa12c9b69e81d8ea014ddf4709e73beb58b8105cb992543c6300137f2d9b54b8bcfba36a49a79f85068067e5d
-SHA512 (wine-6.0-rc5.tar.xz.sign) = 6816538d34a521362735f0efc2e733041676384db1b3843cca098ee47453dcf4c52b684c5bc79a5f8ea40da3406b635f94e56569af53b392fb34fd886815ef0f
-SHA512 (wine-staging-6.0-rc5.tar.gz) = d12ebe5b529bce8900958e45cd58f47ac43b8312e5d429647483e05d87527abbda0ce44f46c69348fe045abe436743f6ad824c4ff3efc52667df1aab6f2f0524
+SHA512 (wine-6.0-rc6.tar.xz) = 55f43c6a770085c70d6afafd82e6da6df94ff6c6b04dc07b706aaba46978bf83b06b6d384f4bcbd61c035e1a0116968d2ccf1f5ebe5a5d073fc0e56fb89f4c15
+SHA512 (wine-6.0-rc6.tar.xz.sign) = 317c8ab61be69d76e85b4b7e39f6f5dbb3c1bc80a3389326230dd31b9271477c7f55fdad477dd7c8bbfd14622de4d5d427b655e33f1ec80ff34296a0592f578e
+SHA512 (wine-staging-6.0-rc6.tar.gz) = fcf9e5d22ca2085b4e2754e8528f3b6e1b36b1c3704a5a1dbb4ff68904ac208ad66eb5181bedc8ad2f074d0edc6c531a2311379aa865807e6116fe878e22923e
--- a/wine-6.0-vulkan-child-window.patch
+++ b/wine-6.0-vulkan-child-window.patch
@ -17,7 +17,7 @@ diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
 index 28ae1a9e0e8..3b0bf58c107 100644
 --- a/dlls/winex11.drv/vulkan.c
 +++ b/dlls/winex11.drv/vulkan.c
-@@ -32,6 +32,7 @@
+@@ -33,6 +33,7 @@
 #include "wine/debug.h"
 #include "wine/heap.h"
 #include "x11drv.h"
@ -25,7 +25,7 @@ index 28ae1a9e0e8..3b0bf58c107 100644
 
 #define VK_NO_PROTOTYPES
 #define WINE_VK_HOST
-@@ -56,6 +57,7 @@
+@@ -55,6 +56,7 @@ static CRITICAL_SECTION_DEBUG critsect_debug =
 static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 };
 
 static XContext vulkan_hwnd_context;
@ -33,7 +33,7 @@ index 28ae1a9e0e8..3b0bf58c107 100644
 
 #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000
 
-@@ -63,6 +65,7 @@
+@@ -62,6 +64,7 @@ struct wine_vk_surface
 {
     LONG ref;
     Window window;
@ -41,22 +41,7 @@ index 28ae1a9e0e8..3b0bf58c107 100644
     VkSurfaceKHR surface; /* native surface */
 };
 
-@@ -95,6 +98,7 @@
- static VkBool32 (*pvkGetPhysicalDeviceXlibPresentationSupportKHR)(VkPhysicalDevice, uint32_t, Display *, VisualID);
- static VkResult (*pvkGetSwapchainImagesKHR)(VkDevice, VkSwapchainKHR, uint32_t *, VkImage *);
- static VkResult (*pvkQueuePresentKHR)(VkQueue, const VkPresentInfoKHR *);
-+static VkResult (*pvkQueueWaitIdle)(VkQueue);
- 
- static void *X11DRV_get_vk_device_proc_addr(const char *name);
- static void *X11DRV_get_vk_instance_proc_addr(VkInstance instance, const char *name);
-@@ -142,12 +146,14 @@
-     LOAD_FUNCPTR(vkGetPhysicalDeviceXlibPresentationSupportKHR);
-     LOAD_FUNCPTR(vkGetSwapchainImagesKHR);
-     LOAD_FUNCPTR(vkQueuePresentKHR);
-+    LOAD_FUNCPTR(vkQueueWaitIdle);
-     LOAD_OPTIONAL_FUNCPTR(vkGetDeviceGroupSurfacePresentModesKHR);
-     LOAD_OPTIONAL_FUNCPTR(vkGetPhysicalDevicePresentRectanglesKHR);
- #undef LOAD_FUNCPTR
+@@ -135,6 +138,7 @@ static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context)
 #undef LOAD_OPTIONAL_FUNCPTR
 
     vulkan_hwnd_context = XUniqueContext();
@ -64,7 +49,7 @@ index 28ae1a9e0e8..3b0bf58c107 100644
 
     return TRUE;
 
-@@ -265,16 +271,24 @@
+@@ -252,16 +256,24 @@ static VkResult X11DRV_vkCreateSwapchainKHR(VkDevice device,
         const VkSwapchainCreateInfoKHR *create_info,
         const VkAllocationCallbacks *allocator, VkSwapchainKHR *swapchain)
 {
@ -91,7 +76,7 @@ index 28ae1a9e0e8..3b0bf58c107 100644
 }
 
 static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance,
-@@ -290,13 +304,6 @@
+@@ -277,13 +289,6 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance,
     if (allocator)
         FIXME("Support for allocation callbacks not implemented yet\n");
 
@ -105,7 +90,7 @@ index 28ae1a9e0e8..3b0bf58c107 100644
     x11_surface = heap_alloc_zero(sizeof(*x11_surface));
     if (!x11_surface)
         return VK_ERROR_OUT_OF_HOST_MEMORY;
-@@ -313,6 +320,23 @@
+@@ -300,6 +305,23 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance,
         goto err;
     }
 
@ -129,7 +114,7 @@ index 28ae1a9e0e8..3b0bf58c107 100644
     create_info_host.sType = VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR;
     create_info_host.pNext = NULL;
     create_info_host.flags = 0; /* reserved */
-@@ -382,6 +406,7 @@
+@@ -369,6 +391,7 @@ static void X11DRV_vkDestroySwapchainKHR(VkDevice device, VkSwapchainKHR swapcha
         FIXME("Support for allocation callbacks not implemented yet\n");
 
     pvkDestroySwapchainKHR(device, swapchain, NULL /* allocator */);
@ -137,7 +122,7 @@ index 28ae1a9e0e8..3b0bf58c107 100644
 }
 
 static VkResult X11DRV_vkEnumerateInstanceExtensionProperties(const char *layer_name,
-@@ -608,6 +633,22 @@
+@@ -541,6 +564,21 @@ static VkResult X11DRV_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR *
         }
     }
 
@ -152,7 +137,6 @@ index 28ae1a9e0e8..3b0bf58c107 100644
 +            escape.code = X11DRV_FLUSH_GL_DRAWABLE;
 +            escape.gl_drawable = x11_surface->window;
 +            escape.flush = TRUE;
-+            pvkQueueWaitIdle(queue);
 +            ExtEscape(x11_surface->child_window_dc, X11DRV_ESCAPE, sizeof(escape), (LPSTR)&escape, 0, NULL);
 +        }
 +    }
--- a/wine.spec
+++ b/wine.spec
@ -45,13 +45,13 @@

 Name:           wine
 Version:        6.0
-Release:        0.5rc5%{?dist}
+Release:        0.6rc6%{?dist}
 Summary:        A compatibility layer for windows applications

 License:        LGPLv2+
 URL:            https://www.winehq.org/
-Source0:        https://dl.winehq.org/wine/source/6.0/wine-%{version}-rc5.tar.xz
-Source10:       https://dl.winehq.org/wine/source/6.0/wine-%{version}-rc5.tar.xz.sign
+Source0:        https://dl.winehq.org/wine/source/6.0/wine-%{version}-rc6.tar.xz
+Source10:       https://dl.winehq.org/wine/source/6.0/wine-%{version}-rc6.tar.xz.sign

 Source1:        wine.init
 Source2:        wine.systemd
@ -97,7 +97,7 @@ Patch511:       wine-cjk.patch
 %if 0%{?wine_staging}
 # wine-staging patches
 # pulseaudio-patch is covered by that patch-set, too.
-Source900: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.gz#/wine-staging-%{version}-rc5.tar.gz
+Source900: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.gz#/wine-staging-%{version}-rc6.tar.gz
 %endif

 %if !%{?no64bit}
@ -706,7 +706,7 @@ This package adds the opencl driver for wine.
 %endif

 %prep
-%setup -q -n wine-%{version}-rc5
+%setup -q -n wine-%{version}-rc6
 %patch511 -p1 -b.cjk

 %if 0%{?wine_staging}
@ -2424,6 +2424,9 @@ fi
 %endif

 %changelog
+* Sun Jan 10 2021 Michael Cronenworth <mike@cchtml.com> 6.0-0.6rc6
+- version update
+
 * Thu Jan 07 2021 Michael Cronenworth <mike@cchtml.com> 6.0-0.5rc5
 - version update