2019-01-28 21:37:13 +01:00
|
|
|
Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
2017-08-07 20:11:53 +02:00
|
|
|
===================================================================
|
2019-01-28 21:37:13 +01:00
|
|
|
--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
|
|
|
+++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
2017-08-07 20:11:53 +02:00
|
|
|
@@ -23,6 +23,9 @@ vboxvideo_70_DEFS := \
|
|
|
|
ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
|
|
|
|
vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this?
|
|
|
|
endif
|
|
|
|
+if1of ($(KBUILD_TARGET), linux)
|
|
|
|
+ vboxvideo_70_DEFS += _POSIX_SOURCE ## X requires POSIX extensions
|
|
|
|
+endif
|
|
|
|
vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
|
|
|
|
vboxvideo_15_DEFS := \
|
|
|
|
$(vboxvideo_13_DEFS) NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS _XORG_SERVER_H_ _DIX_CONFIG_H_
|
2019-01-28 21:37:13 +01:00
|
|
|
Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/edid.c
|
2017-08-07 20:11:53 +02:00
|
|
|
===================================================================
|
2019-01-28 21:37:13 +01:00
|
|
|
--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/edid.c
|
|
|
|
+++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/edid.c
|
|
|
|
@@ -35,10 +35,6 @@
|
2017-12-29 20:22:29 +01:00
|
|
|
* Michael Thayer <michael.thayer@oracle.com>
|
2017-08-07 20:11:53 +02:00
|
|
|
*/
|
|
|
|
|
|
|
|
-#if XORG_VERSION_CURRENT >= 11900000
|
|
|
|
-#include <bits/sigset.h>
|
|
|
|
-typedef __sigset_t sigset_t;
|
|
|
|
-#endif
|
2017-12-29 20:22:29 +01:00
|
|
|
#include "misc.h"
|
|
|
|
#include "xf86DDC.h"
|
|
|
|
#include "xf86Crtc.h"
|
2019-01-28 21:37:13 +01:00
|
|
|
Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
|
2017-08-07 20:11:53 +02:00
|
|
|
===================================================================
|
2019-01-28 21:37:13 +01:00
|
|
|
--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
|
|
|
|
+++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/pointer.c
|
|
|
|
@@ -39,10 +39,6 @@
|
2017-12-29 20:22:29 +01:00
|
|
|
#include "cursorstr.h"
|
|
|
|
#include "servermd.h"
|
2017-08-07 20:11:53 +02:00
|
|
|
|
|
|
|
-#if XORG_VERSION_CURRENT >= 11900000
|
|
|
|
-#include <bits/sigset.h>
|
|
|
|
-typedef __sigset_t sigset_t;
|
|
|
|
-#endif
|
2017-12-29 20:22:29 +01:00
|
|
|
#include "vboxvideo.h"
|
2017-08-07 20:11:53 +02:00
|
|
|
|
2017-12-29 20:22:29 +01:00
|
|
|
#ifdef XORG_7X
|
2019-01-28 21:37:13 +01:00
|
|
|
Index: VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
2017-08-07 20:11:53 +02:00
|
|
|
===================================================================
|
2019-01-28 21:37:13 +01:00
|
|
|
--- VirtualBox-6.0.2.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
|
|
|
+++ VirtualBox-6.0.2/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
2017-12-29 20:22:29 +01:00
|
|
|
@@ -42,8 +42,8 @@
|
2019-01-28 21:37:13 +01:00
|
|
|
# pragma once
|
|
|
|
#endif
|
2017-08-07 20:11:53 +02:00
|
|
|
|
2017-12-29 20:22:29 +01:00
|
|
|
-#include <VBoxVideoGuest.h>
|
|
|
|
-#include <VBoxVideo.h>
|
|
|
|
+#include <VBox/Graphics/VBoxVideoGuest.h>
|
|
|
|
+#include <VBox/Graphics/VBoxVideo.h>
|
2017-08-07 20:11:53 +02:00
|
|
|
#include "version-generated.h"
|
2017-12-29 20:22:29 +01:00
|
|
|
|
|
|
|
#define VBOX_VENDORID 0x80EE
|