Accepting request 213969 from home:sndirsch:branches:Virtualization

- added virtualbox-xorg-1.15.patch to support xorg-server 1.15

OBS-URL: https://build.opensuse.org/request/show/213969
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=148

virtualbox-xorg-1.15.patch

@@ -0,0 +1,34 @@
+Index: VirtualBox-4.2.20/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+===================================================================
+--- VirtualBox-4.2.20.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
++++ VirtualBox-4.2.20/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+@@ -336,6 +336,20 @@ vboxvideo_drv_114_INCS += $(PATH_ROOT)/s
+ vboxvideo_drv_114_SOURCES := $(vboxvideo_drv_15_SOURCES)
+ 
+ 
++#
++# vboxvideo_drv_115
++#
++DLLS += vboxvideo_drv_115
++vboxvideo_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD
++vboxvideo_drv_115_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
++vboxvideo_drv_115_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101500000
++vboxvideo_drv_115_INCS = \
++       $(vboxvideo_xorg_INCS) \
++       /usr/include/xorg
++vboxvideo_drv_115_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
++vboxvideo_drv_115_SOURCES := $(vboxvideo_drv_15_SOURCES)
++
++
+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
+  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
+  DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
+@@ -389,7 +403,7 @@ $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo6
+ 	$$(QUIET)$$(APPEND) -t "$$@" "done"
+     endef
+ 
+-    $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114, $(eval $(def_vboxvideo_test)))
++    $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114 _115, $(eval $(def_vboxvideo_test)))
+ 
+     endif # ! VBOX_ONLY_SDK
+    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))

virtualbox.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 15 09:45:05 UTC 2014 - sndirsch@suse.com
+
+- added virtualbox-xorg-1.15.patch to support xorg-server 1.15
+
 -------------------------------------------------------------------
 Thu Jan 09 12:14:51 UTC 2014 - joerg.lorenzen@ki.tng.de
 

virtualbox.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package virtualbox
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -146,6 +146,8 @@ Patch101:       vbox-default-os-type.diff
 Patch103:       vbox-disable-updates.diff
 #use pie/fPIE for setuid binaries (bnc#743143) 
 Patch104:       vbox-fpie.diff
+#add support for xorg-server 1.15
+Patch105:       virtualbox-xorg-1.15.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         pwdutils permissions
 Requires:       %{name}-host-kmp = %version
@@ -280,6 +282,7 @@ This package contains icons for guest desktop files that were created on the des
 %patch101
 %patch103
 %patch104 -p1
+%patch105 -p1
 #copy user manual
 %__cp %{S:1} UserManual.pdf
 #copy kbuild config
@@ -435,7 +438,11 @@ pushd out/linux.*/release/bin/additions/
 # check the patch https://www.virtualbox.org/changeset/38784, regarding the
 # dropped xorg mouse driver  in >= 1130
 
-%if %suse_version > 1230
+%if %suse_version > 1310
+        %__install -m 755 vboxvideo_drv_115.so \
+                                                %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+%else
+%if %suse_version == 1310
 	%__install -m 755 vboxvideo_drv_114.so \
 						%{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
 %else
@@ -475,7 +482,8 @@ pushd out/linux.*/release/bin/additions/
 %endif #if =1210
 %endif #if =1220
 %endif #if =1230
-%endif #if >1230
+%endif #if =1310
+%endif #if >1310
 popd
 # VBoxOGL* libs for guest-x11 subpackage
 %__install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \