wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

vulkan-Vulkan_Implementation: Fix compilation when XCB extension is not present.

Browse Source
This commit is contained in:
Michael Müller 2016-03-21 20:47:25 +01:00
parent 084d7524a3
commit ffad0e5c7b
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/patchinstall.sh
View File

@ -6916,7 +6916,7 @@ if test "$enable_vulkan_Vulkan_Implementation" -eq 1; then
patch_apply vulkan-Vulkan_Implementation/0001-vulkan-Initial-implementation.patch
patch_apply vulkan-Vulkan_Implementation/0002-vulkan-Implement-vkGetPhysicalDeviceWin32Presentatio.patch
(
echo '+ { "Sebastian Lackner", "vulkan: Initial implementation.", 1 },';
echo '+ { "Sebastian Lackner", "vulkan: Initial implementation.", 2 },';
echo '+ { "Michael Müller", "vulkan: Implement vkGetPhysicalDeviceWin32PresentationSupportKHR.", 1 },';
) >> "$patchlist"
fi

29
patches/vulkan-Vulkan_Implementation/0001-vulkan-Initial-implementation.patch
View File

@ -1,10 +1,10 @@
From cf24f42b278183e732542925177a0b3cf405dfc7 Mon Sep 17 00:00:00 2001
From 714f200adf4d127a5669e41a1245c001b408791f Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 19 Mar 2016 00:42:10 +0100
Subject: vulkan: Initial implementation.
Subject: vulkan: Initial implementation. (v2)
---
configure.ac | 14 +
configure.ac | 16 +
dlls/vulkan-1/Makefile.in | 1 +
dlls/vulkan-1/vulkan-1.spec | 160 +
dlls/vulkan/Makefile.in | 8 +
@ -12,7 +12,7 @@ Subject: vulkan: Initial implementation.
dlls/vulkan/vulkan_main.c | 327 +++
dlls/vulkan/vulkan_private.h | 3296 +++++++++++++++++++++
dlls/vulkan/vulkan_thunks.c | 6593 ++++++++++++++++++++++++++++++++++++++++++
8 files changed, 10559 insertions(+)
8 files changed, 10561 insertions(+)
create mode 100644 dlls/vulkan-1/Makefile.in
create mode 100644 dlls/vulkan-1/vulkan-1.spec
create mode 100644 dlls/vulkan/Makefile.in
@ -22,10 +22,19 @@ Subject: vulkan: Initial implementation.
create mode 100644 dlls/vulkan/vulkan_thunks.c
diff --git a/configure.ac b/configure.ac
index 77c54c8..149ec4c 100644
index 8c22a4f..ef03473 100644
--- a/configure.ac
+++ b/configure.ac
@@ -985,6 +985,7 @@ then
@@ -80,6 +80,8 @@ AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xco
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi])
AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi])
+AC_ARG_WITH(xcb, AS_HELP_STRING([--without-xcb],[do not use X11 XCB extension]),
+ [if test "x$withval" = "xno"; then ac_cv_header_X11_Xlib_xcb_h=no; fi])
AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)]),
[if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi])
AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]),
@@ -985,6 +987,7 @@ then
dnl *** All of the following tests require X11/Xlib.h
AC_CHECK_HEADERS([X11/Xlib.h \
@ -33,7 +42,7 @@ index 77c54c8..149ec4c 100644
X11/XKBlib.h \
X11/Xutil.h \
X11/Xcursor/Xcursor.h \
@@ -1108,6 +1109,14 @@ then
@@ -1108,6 +1111,14 @@ then
WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"],
[libxcomposite ${notice_platform}development files not found, Xcomposite won't be supported.])
@ -42,13 +51,13 @@ index 77c54c8..149ec4c 100644
+ then
+ WINE_CHECK_SONAME(X11-xcb,XGetXCBConnection,,,[$X_LIBS $X_EXTRA_LIBS])
+ fi
+ WINE_NOTICE_WITH(X11-xcb,[test "x$ac_cv_lib_soname_X11_xcb" = "x"],
+ WINE_NOTICE_WITH(xcb,[test "x$ac_cv_lib_soname_X11_xcb" = "x"],
+ [X11-xcb ${notice_platform}development files not found, the XCB extension won't be supported.])
+
dnl *** Check for XICCallback struct
AC_CHECK_MEMBERS([XICCallback.callback, XEvent.xcookie],,,
[#ifdef HAVE_X11_XLIB_H
@@ -1160,6 +1169,9 @@ without X support, which probably isn't what you want. You will need
@@ -1160,6 +1171,9 @@ without X support, which probably isn't what you want. You will need
to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.],
[enable_winex11_drv])
@ -58,7 +67,7 @@ index 77c54c8..149ec4c 100644
test "x$ac_cv_lib_GLU_gluLookAt" != xyes && enable_glu32=${enable_glu32:-no}
dnl **** Check for OpenCL ****
@@ -3310,6 +3322,8 @@ WINE_CONFIG_DLL(vnbt.vxd,enable_win16)
@@ -3311,6 +3325,8 @@ WINE_CONFIG_DLL(vnbt.vxd,enable_win16)
WINE_CONFIG_DLL(vnetbios.vxd,enable_win16)
WINE_CONFIG_DLL(vssapi)
WINE_CONFIG_DLL(vtdapi.vxd,enable_win16)