forked from pool/virtualbox
374881396c
This should fix bnc#929697 - Adds patch: * virtualbox-system-x.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=186
60 lines
2.3 KiB
Diff
60 lines
2.3 KiB
Diff
Description: Build the X.Org driver only for the selected system X Server version.
|
|
Author: Michael Meskes <meskes@debian.org>, Felix Geyer <fgeyer@debian.org>
|
|
|
|
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 += \
|