- 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

Fix_for_server_1.19.patch

@@ -0,0 +1,66 @@
+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,8 @@
+ #ifndef _VBOXVIDEO_H_
+ #define _VBOXVIDEO_H_
+ 
++#include <bits/sigset.h>
++typedef __sigset_t sigset_t;
+ #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
+@@ -82,7 +82,7 @@ void vbvxSetIntegerPropery(ScrnInfoPtr p
+ 
+     property_name = MakeAtom(pszName, strlen(pszName), TRUE);
+     VBVXASSERT(property_name != BAD_RESOURCE, ("Failed to set atom \"%s\"\n", pszName));
+-    ChangeWindowProperty(ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
++    dixChangeWindowProperty(serverClient, ROOT_WINDOW(pScrn), property_name, XA_INTEGER, 32, PropModeReplace, cData, paData, fSendEvent);
+ }
+ 
+ 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,8 +1229,7 @@ static Bool VBOXScreenInit(ScreenPtr pSc
+     updateGraphicsCapability(pScrn, TRUE);
+ 
+     /* Register block and wake-up handlers for getting new screen size hints. */
+-    RegisterBlockAndWakeupHandlers(vboxBlockHandler, (WakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
+-
++    RegisterBlockAndWakeupHandlers(vboxBlockHandler, (ServerWakeupHandlerProcPtr)NoopDDA, (pointer)pScrn);
+     /* 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,8 @@
+  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+  */
+ 
++#include <bits/sigset.h>
++typedef __sigset_t sigset_t;
+ #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
+@@ -44,6 +44,8 @@
+  *    Dave Airlie <airlied@redhat.com>
+  */
+ 
++#include <bits/sigset.h>
++typedef __sigset_t sigset_t;
+ #include <misc.h>
+ #include <xf86DDC.h>
+ #include <xf86Crtc.h>

virtualbox.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
 

virtualbox.spec

@@ -92,6 +92,8 @@ Patch113:       vbox_remove_smp_mflags.patch
 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 +132,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
@@ -304,6 +307,9 @@ This package contains icons for guest desktop files that were created on the des
 ###########################################
 
 %prep
+xserver_str=`rpm -q xorg-x11-server`
+XSERVER_VERSION=`expr match "$xserver_str" '.*\(\([0-9]\.[0-9][0-9]\.[0-9]\)\)'`
+#XSERVER_VERSION=`echo $XSERVER_VERSION | sed -e 's/\.//g'`
 %setup -q -n VirtualBox-%{version}
 %patch1 -p1
 %patch2 -p1
@@ -328,6 +334,11 @@ This package contains icons for guest desktop files that were created on the des
 %patch113 -p1
 %patch114 -p1
 %patch115 -p1
+if [ "$XSERVER_VERSION" = "1.18.4" ] ; then
+  echo "Patch 116 not applied"
+else
+%patch116 -p1
+fi
 
 #copy user manual
 cp %{SOURCE1} UserManual.pdf