diff --git a/virtualbox-LocalConfig.kmk b/virtualbox-LocalConfig.kmk index e34ab95..6a6dd84 100644 --- a/virtualbox-LocalConfig.kmk +++ b/virtualbox-LocalConfig.kmk @@ -3,6 +3,9 @@ VBOX_WITH_TESTSUITE = VBOX_WITH_ORIGIN := VBOX_WITH_REGISTRATION_REQUEST = VBOX_WITH_UPDATE_REQUEST = +VBOX_WITH_INSTALLER = 1 +VBOX_WITH_LINUX_ADDITIONS = 1 +VBOX_WITH_X11_ADDITIONS = 1 VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) diff --git a/virtualbox-system-x.patch b/virtualbox-system-x.patch new file mode 100644 index 0000000..c93b529 --- /dev/null +++ b/virtualbox-system-x.patch @@ -0,0 +1,59 @@ +Description: Build the X.Org driver only for the selected system X Server version. +Author: Michael Meskes , Felix Geyer + +Index: virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +=================================================================== +--- virtualbox.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500 ++++ virtualbox/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-11-19 04:36:33.913630598 -0500 +@@ -40,8 +40,6 @@ + VBoxGuestR3LibShared + ifndef VBOX_ONLY_TESTSUITE + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) +- LIBRARIES += \ +- VBoxGuestR3LibXFree86 + endif + if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) + LIBRARIES += \ +Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk +=================================================================== +--- virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500 ++++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-11-19 04:35:17.181627034 -0500 +@@ -74,18 +74,12 @@ + VBoxOGL_INCS = . + if1of ($(KBUILD_TARGET), linux solaris freebsd) + VBoxOGL_INCS += \ +- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ +- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ +- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \ +- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ +- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ +- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ +- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ +- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ +- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ +- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 \ + $(VBOX_MESA_INCS) \ +- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 ++ /usr/include/drm \ ++ /usr/include/libdrm + VBoxOGL_DEFS += VBOX_NO_NATIVEGL + endif + +@@ -215,10 +209,10 @@ + $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) + if1of ($(KBUILD_TARGET), linux solaris freebsd) + VBoxOGL_LIBS += \ +- $(PATH_STAGE_LIB)/libXcomposite.so \ +- $(PATH_STAGE_LIB)/libXdamage.so \ +- $(PATH_STAGE_LIB)/libXfixes.so \ +- $(PATH_STAGE_LIB)/libXext.so ++ Xcomposite \ ++ Xdamage \ ++ Xfixes \ ++ Xext + ifdef VBoxOGL_FAKEDRI + ifeq ($(KBUILD_TARGET), freebsd) + VBoxOGL_LIBS += \ diff --git a/virtualbox.changes b/virtualbox.changes index 6fe389f..650d1e1 100644 --- a/virtualbox.changes +++ b/virtualbox.changes @@ -1,7 +1,10 @@ ------------------------------------------------------------------- Wed May 6 16:52:56 UTC 2015 - tchvatal@suse.com -- Try to build with system libs for X instead of localy built ones +- Build with system libs for X instead of localy built ones. + This should fix bnc#929697 +- Adds patch: + * virtualbox-system-x.patch ------------------------------------------------------------------- Wed May 6 15:51:43 UTC 2015 - tchvatal@suse.com diff --git a/virtualbox.spec b/virtualbox.spec index 86a0dde..ae9b5a1 100644 --- a/virtualbox.spec +++ b/virtualbox.spec @@ -55,6 +55,8 @@ Patch3: vbox-vboxweb-init-script.diff #file :http://www.virtualbox.org/browser/trunk/src/VBox/Devices/PC/vbox.ds #see thread : http://lists.freebsd.org/pipermail/freebsd-acpi/2010-October/006795.html Patch6: vbox-smc-napa.diff +#PATCH-FIX-OPENSUSE: Use system X libraries and do not build local things +Patch4: virtualbox-system-x.patch #fix build of Python and dev package on openSUSE 11.3 Patch8: vbox-python-detection.diff #deprecated old-style C++ service proxies and objects,we have to use soapcpp2 -z1 flag @@ -85,7 +87,6 @@ BuildRequires: fdupes BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: glibc-devel-static -#gsoap,libopenssl and java needed for building webservice BuildRequires: gsoap-devel BuildRequires: java-devel >= 1.6.0 BuildRequires: kbuild >= 0.1.9998svn2689 @@ -268,6 +269,7 @@ This package contains icons for guest desktop files that were created on the des %patch1 %patch2 %patch3 -p1 +%patch4 -p1 %patch6 -p1 %patch8 -p1 %patch9 -p1 @@ -332,7 +334,6 @@ echo "build basic parts" VBOX_USE_SYSTEM_XORG_HEADERS=1 \ VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \ TOOL_YASM_AS=yasm \ - VBOX_WITH_VMSVGA= VBOX_WITH_VMSVGA3D= \ VBOX_BUILD_PUBLISHER=_SUSE \ TOOL_GCC3_CFLAGS="%{optflags}" TOOL_GCC3_CXXFLAGS="%{optflags}" \ VBOX_GCC_OPT="%{optflags}" @@ -430,15 +431,7 @@ pushd out/linux.*/release/bin/additions/ #VBoxClient daemon (support for clipboard,autoresize,seamless windows) install -m 755 VBoxClient %{buildroot}%{_bindir} # xorg drivers for video -%if 0%{?suse_version} > 1320 - install -m 755 vboxvideo_drv_117.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so -%endif -%if 0%{?suse_version} == 1315 - install -m 755 vboxvideo_drv_116.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so -%endif -%if 0%{?suse_version} == 1310 - install -m 755 vboxvideo_drv_114.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so -%endif +install -m 755 vboxvideo_drv_system.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so popd # VBoxOGL* libs for guest-x11 subpackage install -m 644 out/linux.*/release/bin/additions/VBoxOGL*.so \