forked from pool/virtualbox
fb62e748b1
Version Bump to 6.1.40
This is a maintenance release. The following items were fixed and/or added:
GUI: Fixed missed machine-items state translation on language change
USB: Fixed possible crash when the device got detached while the controller is resetting the port
Main: Provide guest's absolute pointing mouse device with buttons state when mouse integration is ON
Linux Host and Guest Additions: Prevented build failure on 5.8+ 32-bit kernels
Linux Host and Guest Additions: Introduced additional fixes for kernel 6.0
Linux Host and Guest Additions: Introduced additional fixes for Debian specific kernels
Solaris and Linux Guest Additions: Added better handling of negative screen sizes which some X11 desktop environments are reporting
Windows Guest Additions: Added fixes related to VBoxTray IPC
- Fix boo#1204233 boo#1204331 boo#1202851
- Remove file fix_error_in_USB_header.patch - fixed upstream
OBS-URL: https://build.opensuse.org/request/show/1029812
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=661
60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
|
===================================================================
|
|
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
|
+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
|
|
@@ -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_
|
|
Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/edid.c
|
|
+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/edid.c
|
|
@@ -35,10 +35,6 @@
|
|
* Michael Thayer <michael.thayer@oracle.com>
|
|
*/
|
|
|
|
-#if XORG_VERSION_CURRENT >= 11900000
|
|
-#include <bits/sigset.h>
|
|
-typedef __sigset_t sigset_t;
|
|
-#endif
|
|
#include "misc.h"
|
|
#include "xf86DDC.h"
|
|
#include "xf86Crtc.h"
|
|
Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
|
|
+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/pointer.c
|
|
@@ -39,10 +39,6 @@
|
|
#include "cursorstr.h"
|
|
#include "servermd.h"
|
|
|
|
-#if XORG_VERSION_CURRENT >= 11900000
|
|
-#include <bits/sigset.h>
|
|
-typedef __sigset_t sigset_t;
|
|
-#endif
|
|
#include "vboxvideo.h"
|
|
|
|
#ifdef XORG_7X
|
|
Index: VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
|
===================================================================
|
|
--- VirtualBox-6.1.40.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
|
+++ VirtualBox-6.1.40/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
|
|
@@ -42,8 +42,8 @@
|
|
# pragma once
|
|
#endif
|
|
|
|
-#include <VBoxVideoGuest.h>
|
|
-#include <VBoxVideo.h>
|
|
+#include <VBox/Graphics/VBoxVideoGuest.h>
|
|
+#include <VBox/Graphics/VBoxVideo.h>
|
|
#include "version-generated.h"
|
|
|
|
#define VBOX_VENDORID 0x80EE
|