jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity
17a3ba2102
virtualbox/Fix_for_server_1.19.patch

78 lines
3.2 KiB
Diff
Raw Normal View History

- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
===================================================================
--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.h
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
@@ -52,6 +52,10 @@
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
#ifndef _VBOXVIDEO_H_
#define _VBOXVIDEO_H_
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
+#if XORG_VERSION_CURRENT >= 11900000
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
+#include <bits/sigset.h>
+typedef __sigset_t sigset_t;
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
+#endif
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
#include <VBox/VBoxVideoGuest.h>
#include <VBox/VBoxVideo.h>
#include "version-generated.h"
Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c
===================================================================
--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/helpers.c
+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/helpers.c
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
@@ -82,7 +82,11 @@ void vbvxSetIntegerPropery(ScrnInfoPtr p
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
property_name = MakeAtom(pszName, strlen(pszName), TRUE);
VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName));
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
+#if XORG_VERSION_CURRENT >= 11900000
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
+ dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
+#else
ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
+#endif
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
}
void vbvxReprobeCursor(ScrnInfoPtr pScrn)
Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
===================================================================
--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/vboxvideo.c
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
@@ -1229,7 +1229,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
updateGraphicsCapability(pScrn, TRUE);
/* Register block and wake-up handlers for getting new screen size hints. */
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
+#if XORG_VERSION_CURRENT >= 11900000
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
+ RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
+#else
RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
+#endif
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
/* software cursor */
miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c
===================================================================
--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/pointer.c
+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/pointer.c
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
@@ -15,6 +15,10 @@
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
* hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
*/
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
+#if XORG_VERSION_CURRENT >= 11900000
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
+#include <bits/sigset.h>
+typedef __sigset_t sigset_t;
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
+#endif
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
#include <VBox/VBoxGuestLib.h>
#ifndef PCIACCESS
Index: VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c
===================================================================
--- VirtualBox-5.1.10.orig/src/VBox/Additions/x11/vboxvideo/edid.c
+++ VirtualBox-5.1.10/src/VBox/Additions/x11/vboxvideo/edid.c
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
@@ -44,6 +44,10 @@
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
* Dave Airlie <airlied@redhat.com>
*/
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
+#if XORG_VERSION_CURRENT >= 11900000
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
+#include <bits/sigset.h>
+typedef __sigset_t sigset_t;
- I now have the necessary preprocessor symbol to modify the source depending on whether the server is 1.19.0 or greater. It is no longer necessary to detect the server version in the spec file, thus the solution is cleaner. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=299
2016-12-05 23:43:01 +01:00
+#endif
- Add patch file "Fix_for_server_1.19.patch" to support xorg-x11-server v. 1.19.0. The spec file now interrogates the rpm for the server and conditionally applies the patch, thus both versions build OK. OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=297
2016-12-05 04:50:25 +01:00
#include <misc.h>
#include <xf86DDC.h>
#include <xf86Crtc.h>
Copy Permalink