diff --git a/Fix_for_server_1.19.patch b/Fix_for_server_1.19.patch new file mode 100644 index 0000000..7ed47a2 --- /dev/null +++ b/Fix_for_server_1.19.patch @@ -0,0 +1,77 @@ +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 +@@ -52,6 +52,10 @@ + #ifndef _VBOXVIDEO_H_ + #define _VBOXVIDEO_H_ + ++#if XORG_VERSION_CURRENT >= 11900000 ++#include ++typedef __sigset_t sigset_t; ++#endif + #include + #include + #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 +@@ -82,7 +82,11 @@ void vbvxSetIntegerPropery(ScrnInfoPtr p + + property_name = MakeAtom(pszName, strlen(pszName), TRUE); + VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName)); ++#if XORG_VERSION_CURRENT >= 11900000 ++ dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent); ++#else + ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent); ++#endif + } + + 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 +@@ -1229,7 +1229,11 @@ static Bool VBOXScreenInit(ScreenPtr pSc + updateGraphicsCapability(pScrn, TRUE); + + /* Register block and wake-up handlers for getting new screen size hints. */ ++#if XORG_VERSION_CURRENT >= 11900000 ++ RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn); ++#else + RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn); ++#endif + + /* 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 +@@ -15,6 +15,10 @@ + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + ++#if XORG_VERSION_CURRENT >= 11900000 ++#include ++typedef __sigset_t sigset_t; ++#endif + #include + + #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 +@@ -44,6 +44,10 @@ + * Dave Airlie + */ + ++#if XORG_VERSION_CURRENT >= 11900000 ++#include ++typedef __sigset_t sigset_t; ++#endif + #include + #include + #include diff --git a/UserManual.pdf b/UserManual.pdf index 093f7ab..b9d761f 100644 --- a/UserManual.pdf +++ b/UserManual.pdf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f235abffb94c8e057ce7770863a628b4218f0defd62f4b09ba3c40c356f801b5 -size 4354675 +oid sha256:40d625bf41b86bc7c6c6895e29c0ce50e5dd0697bf18b56c5b810eeeb3a912a4 +size 4357657 diff --git a/VirtualBox-5.1.10-patched.tar.bz2 b/VirtualBox-5.1.10-patched.tar.bz2 deleted file mode 100644 index aad9ba4..0000000 --- a/VirtualBox-5.1.10-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:43de72609db33633b0bd857c689e5594b6f3c1d96c7e985a41874729d740402f -size 80265447 diff --git a/VirtualBox-5.1.12-patched.tar.bz2 b/VirtualBox-5.1.12-patched.tar.bz2 new file mode 100644 index 0000000..58fcc26 --- /dev/null +++ b/VirtualBox-5.1.12-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:212ff0b27e892df670be694627a0ad968f3abbebcfa770bebc33cc976a76a9e5 +size 80300379 diff --git a/_constraints b/_constraints index 56d0a62..56c3463 100644 --- a/_constraints +++ b/_constraints @@ -2,7 +2,7 @@ - 12000 + 8000 diff --git a/vbox_hidpi_support.patch b/vbox_hidpi_support.patch deleted file mode 100644 index a8c350a..0000000 --- a/vbox_hidpi_support.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: VirtualBox-5.1.10/src/VBox/Frontends/VirtualBox/src/main.cpp -=================================================================== ---- VirtualBox-5.1.10.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2016-11-21 18:31:06.000000000 +0100 -+++ VirtualBox-5.1.10/src/VBox/Frontends/VirtualBox/src/main.cpp 2016-11-30 14:04:31.028269344 +0100 -@@ -446,6 +446,12 @@ extern "C" DECLEXPORT(int) TrustedMain(i - qInstallMsgHandler(QtMessageOutput); - #endif /* QT_VERSION < 0x050000 */ - -+#if QT_VERSION >= 0x050600 -+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -+#endif -+#if QT_VERSION >= 0x050700 -+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); -+#endif - /* Create application: */ - QApplication a(argc, argv); - -@@ -603,6 +609,12 @@ int main(int argc, char **argv, char **e - /* Initialization failed: */ - if (RT_FAILURE(rc)) - { -+#if QT_VERSION >= 0x050600 -+ QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -+#endif -+#if QT_VERSION >= 0x050700 -+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); -+#endif - /* We have to create QApplication anyway - * just to show the only one error-message: */ - QApplication a(argc, &argv[0]); diff --git a/virtualbox.changes b/virtualbox.changes index 34a3599..4c824d3 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,3 +1,52 @@ +------------------------------------------------------------------- +Wed Dec 21 03:19:26 UTC 2016 - Larry.Finger@lwfinger.net + +- Version bump to 5.1.12 (released 2016-12-20 by Oracle) + +This is a maintenance release. The following items were fixed and/or added: + + VMM: fixed VERR_IEM_ASPECT_NOT_IMPLEMENTED Guru Meditations with certain Linux guests if KVM paravirtualization is enabled (5.1 regression; bugs #15613 and #16251) + VMM: fixed VERR_VMX_UNABLE_TO_START_VM Guru Meditations under rare conditions + GUI: prevent a crash under certain conditions if the VM is terminated very early + GUI: fixed certain keyboard capture issues (5.1.10 regression; Mac OS X hosts only; bug #16150) + GUI: fixed dragging guest windows in seamless mode with the keyboard captured (X11 hosts only; bug #15837) + GUI: fixed a problem where the new version detected dialog was covered by the appliance import dialog (Mac OS X hosts only; bug #16238) + Storage: fixed NVMe reset processing when doing rmmod nvme; modprobe nvme in a Linux guest (bug #16080) + Storage: fixed creating a snapshot when the VM is running and an NVMe controller is present + Storage: fixed a problem with the LsiLogic SCSI controller where requests could be lost with SMP guests + E1000: fixed "cable disconnected" issue (Mac OS X guests only; 5.1.10 regression; bug #16260) + E1000: fixed "TX unit hang" issue (Linux guests only; 5.1.10 regression; bug #16221) + API: don't crash when sanitizing certain VM names (bug #16299) + Linux hosts: automatically disable asynchronous I/O on Linux 2.6.18 kernels as high I/O load may trigger kernel oopses on these kernels if this feature is enabled + Linux hosts / guests: Linux 2.6.28 compile fix (bug #16267) + Linux hosts: compile Linux 4.9 compile fix (bug #16286) + Linux Additions: warn the user about a known bug with older Linux guests (e.g. Debian 7) requiring manual work to get 3D working (bug #15319) + Linux Additions: fix the graphics driver build with Linux 4.10 and later (bug #16298) + Windows Additions: fixed a crash in the WDDM driver under certain conditions + +------------------------------------------------------------------- +Mon Dec 12 16:27:28 UTC 2016 - Larry.Finger@lwfinger.net + +- Revert "vbox_hdpi_support.patch. This patch may improve things for asn@cryptomilk.org, but it breaks other systems. + See https://forums.opensuse.org/showthread.php/521520-VirtualBox-interface-scaling and bsc #1014694. + +------------------------------------------------------------------- +Mon Dec 5 22:34:34 UTC 2016 - Larry.Finger@lwfinger.net + +- 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. + +------------------------------------------------------------------- +Mon Dec 5 17:03:34 UTC 2016 - Larry.Finger@lwfinger.net + +- Leap 42.2 still has server v. 1.18.3, thus the test failed. The test has been changed to look at only the 1.xx part of the version. + +------------------------------------------------------------------- +Sun Dec 4 16:59:29 UTC 2016 - Larry.Finger@lwfinger.net + +- 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. + ------------------------------------------------------------------- Wed Nov 30 16:45:43 UTC 2016 - asn@cryptomilk.org diff --git a/virtualbox.spec b/virtualbox.spec index bf56f61..38fa38f 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -19,7 +19,7 @@ %define _vbox_instdir %{_libexecdir}/virtualbox %define _udevrulesdir %{_libexecdir}/udev/rules.d Name: virtualbox -Version: 5.1.10 +Version: 5.1.12 Release: 0 Summary: VirtualBox is an Emulator License: GPL-2.0+ @@ -90,8 +90,8 @@ Patch112: modify_for_4_8_bo_move.patch Patch113: vbox_remove_smp_mflags.patch # Fix build error on kernel 4.9 Patch114: vbox_fix_4.9_api_changes.patch -# Add support for HiDPI in the management frontend -Patch115: vbox_hidpi_support.patch +# Fix for missing include needed for server 1.19 +Patch116: Fix_for_server_1.19.patch # BuildRequires: LibVNCServer-devel BuildRequires: SDL-devel @@ -130,6 +130,7 @@ BuildRequires: update-desktop-files BuildRequires: which BuildRequires: xorg-x11 BuildRequires: xorg-x11-server +#BuildRequires: xorg-x11-server > 7.6_1.18.4-2.1 BuildRequires: xorg-x11-server-sdk BuildRequires: yasm BuildRequires: zlib-devel-static @@ -327,7 +328,7 @@ This package contains icons for guest desktop files that were created on the des %patch112 -p1 %patch113 -p1 %patch114 -p1 -%patch115 -p1 +%patch116 -p1 #copy user manual cp %{SOURCE1} UserManual.pdf