mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added winex11-compile-vulkan patchset
This commit is contained in:
parent
12d22ddfd7
commit
a7ae3783c5
@ -396,6 +396,7 @@ patch_enable_all ()
|
||||
enable_winex11_Window_Style="$1"
|
||||
enable_winex11_XEMBED="$1"
|
||||
enable_winex11__NET_ACTIVE_WINDOW="$1"
|
||||
enable_winex11_compile_vulkan="$1"
|
||||
enable_winex11_wglShareLists="$1"
|
||||
enable_winhttp_Accept_Headers="$1"
|
||||
enable_winhttp_System_Proxy_Autoconfig="$1"
|
||||
@ -1367,6 +1368,9 @@ patch_enable ()
|
||||
winex11-_NET_ACTIVE_WINDOW)
|
||||
enable_winex11__NET_ACTIVE_WINDOW="$2"
|
||||
;;
|
||||
winex11-compile-vulkan)
|
||||
enable_winex11_compile_vulkan="$2"
|
||||
;;
|
||||
winex11-wglShareLists)
|
||||
enable_winex11_wglShareLists="$2"
|
||||
;;
|
||||
@ -8020,6 +8024,22 @@ if test "$enable_winex11_XEMBED" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winex11-compile-vulkan
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#45554] - Correct compile error with gcc 4.5
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/loader.c, dlls/ntdll/tests/info.c, dlls/winex11.drv/vulkan.c, include/wine/server_protocol.h,
|
||||
# | server/request.h, server/trace.c
|
||||
# |
|
||||
if test "$enable_winex11_compile_vulkan" -eq 1; then
|
||||
patch_apply winex11-compile-vulkan/0001-winex11.drv-Correct-bBuild-fail-with-GCC-4.5.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Józef Kucia", "winex11.drv: Correct bBuild fail with GCC 4.5.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset winex11-wglShareLists
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
@ -0,0 +1,24 @@
|
||||
From d4ca594567b19b44dfa64fc9fc64fd82b097fad2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B3zef=20Kucia?= <jkucia@codeweavers.com>
|
||||
Date: Fri, 3 Aug 2018 08:35:47 +1000
|
||||
Subject: [PATCH] winex11.drv: Correct bBuild fail with GCC 4.5
|
||||
|
||||
---
|
||||
dlls/winex11.drv/vulkan.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c
|
||||
index f9eea74..5de8557 100644
|
||||
--- a/dlls/winex11.drv/vulkan.c
|
||||
+++ b/dlls/winex11.drv/vulkan.c
|
||||
@@ -55,7 +55,6 @@ static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 };
|
||||
|
||||
static XContext vulkan_hwnd_context;
|
||||
|
||||
-typedef VkFlags VkXlibSurfaceCreateFlagsKHR;
|
||||
#define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000
|
||||
|
||||
struct wine_vk_surface
|
||||
--
|
||||
1.9.1
|
||||
|
2
patches/winex11-compile-vulkan/definition
Normal file
2
patches/winex11-compile-vulkan/definition
Normal file
@ -0,0 +1,2 @@
|
||||
Fixes: [45554] - Correct compile error with gcc 4.5
|
||||
|
Loading…
Reference in New Issue
Block a user