1 |
commit: c5fca1c68a374712eb2a6b2fde6807c63b6a5f63 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 25 01:16:56 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 25 01:17:57 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5fca1c6 |
7 |
|
8 |
x11-drivers/xf86-video-virtualbox: Fixed build with >=x11-base/xorg-server-1.19 |
9 |
|
10 |
This closes Gentoo bug #602784. |
11 |
|
12 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
13 |
|
14 |
.../xf86-video-virtualbox-5.1.10-xorg119.patch | 82 ++++++++++++++++++++++ |
15 |
.../xf86-video-virtualbox-5.1.14.ebuild | 3 + |
16 |
2 files changed, 85 insertions(+) |
17 |
|
18 |
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch |
19 |
new file mode 100644 |
20 |
index 00000000..26958fe |
21 |
--- /dev/null |
22 |
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-5.1.10-xorg119.patch |
23 |
@@ -0,0 +1,82 @@ |
24 |
+Fix from opensuse: |
25 |
+https://build.opensuse.org/package/view_file/Virtualization/virtualbox/Fix_for_server_1.19.patch |
26 |
+ |
27 |
+https://bugs.gentoo.org/602784 |
28 |
+ |
29 |
+Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h |
30 |
+=================================================================== |
31 |
+--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h |
32 |
++++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h |
33 |
+@@ -52,6 +52,10 @@ |
34 |
+ #ifndef _VBOXVIDEO_H_ |
35 |
+ #define _VBOXVIDEO_H_ |
36 |
+ |
37 |
++#if XORG_VERSION_CURRENT >= 11900000 |
38 |
++#include <bits/sigset.h> |
39 |
++typedef __sigset_t sigset_t; |
40 |
++#endif |
41 |
+ #include <VBox/VBoxVideoGuest.h> |
42 |
+ #include <VBox/VBoxVideo.h> |
43 |
+ #include "version-generated.h" |
44 |
+Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c |
45 |
+=================================================================== |
46 |
+--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/helpers.c |
47 |
++++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c |
48 |
+@@ -82,7 +82,11 @@ void vbvxSetIntegerPropery(ScrnInfoPtr p |
49 |
+ |
50 |
+ property_name = MakeAtom(pszName, strlen(pszName), TRUE); |
51 |
+ VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName)); |
52 |
++#if XORG_VERSION_CURRENT >= 11900000 |
53 |
++ dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent); |
54 |
++#else |
55 |
+ ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent); |
56 |
++#endif |
57 |
+ } |
58 |
+ |
59 |
+ void vbvxReprobeCursor(ScrnInfoPtr pScrn) |
60 |
+Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c |
61 |
+=================================================================== |
62 |
+--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c |
63 |
++++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c |
64 |
+@@ -1229,7 +1229,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc |
65 |
+ updateGraphicsCapability(pScrn, TRUE); |
66 |
+ |
67 |
+ /* Register block and wake-up handlers for getting new screen size hints. */ |
68 |
++#if XORG_VERSION_CURRENT >= 11900000 |
69 |
++ RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn); |
70 |
++#else |
71 |
+ RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn); |
72 |
++#endif |
73 |
+ |
74 |
+ /* software cursor */ |
75 |
+ miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); |
76 |
+Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c |
77 |
+=================================================================== |
78 |
+--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/pointer.c |
79 |
++++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c |
80 |
+@@ -15,6 +15,10 @@ |
81 |
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. |
82 |
+ */ |
83 |
+ |
84 |
++#if XORG_VERSION_CURRENT >= 11900000 |
85 |
++#include <bits/sigset.h> |
86 |
++typedef __sigset_t sigset_t; |
87 |
++#endif |
88 |
+ #include <VBox/VBoxGuestLib.h> |
89 |
+ |
90 |
+ #ifndef PCIACCESS |
91 |
+Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c |
92 |
+=================================================================== |
93 |
+--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/edid.c |
94 |
++++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c |
95 |
+@@ -44,6 +44,10 @@ |
96 |
+ * Dave Airlie <airlied@××××××.com> |
97 |
+ */ |
98 |
+ |
99 |
++#if XORG_VERSION_CURRENT >= 11900000 |
100 |
++#include <bits/sigset.h> |
101 |
++typedef __sigset_t sigset_t; |
102 |
++#endif |
103 |
+ #include <misc.h> |
104 |
+ #include <xf86DDC.h> |
105 |
+ #include <xf86Crtc.h> |
106 |
|
107 |
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild |
108 |
index 016ff4c..65beeec 100644 |
109 |
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild |
110 |
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.1.14.ebuild |
111 |
@@ -56,6 +56,9 @@ PATCHES=( |
112 |
|
113 |
# unset useless/problematic checks in configure |
114 |
"${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch" |
115 |
+ |
116 |
+ # xorg-1.19 patch from opensuse (bug #602784) |
117 |
+ "${FILESDIR}/${PN}-5.1.10-xorg119.patch" |
118 |
) |
119 |
|
120 |
QA_TEXTRELS_x86="usr/lib/VBoxOGL.so" |