forked from pool/virtualbox
ff1d6fb65b
bump to 5.1.2 I tried to keep all Suse customization as they are. Warning dialogs were ported to Qt5. I did not check for added executables in the new release. Compile tested on all current targets. Runtime tested on Tumbleweed, both host and guest. OBS-URL: https://build.opensuse.org/request/show/414498 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=262
57 lines
2.0 KiB
Diff
57 lines
2.0 KiB
Diff
Index: VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
|
===================================================================
|
|
--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
|
+++ VirtualBox-5.1.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk
|
|
@@ -68,18 +68,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
|
|
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
|
|
|
|
@@ -214,10 +208,10 @@ VBoxOGL_LIBS.win += \
|
|
|
|
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 += \
|
|
Index: VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
|
|
===================================================================
|
|
--- VirtualBox-5.1.2.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
|
|
+++ VirtualBox-5.1.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
|
|
@@ -40,8 +40,6 @@ LIBRARIES += \
|
|
VBoxGuestR3LibShared
|
|
ifndef VBOX_ONLY_VALIDATIONKIT
|
|
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
|
|
- LIBRARIES += \
|
|
- VBoxGuestR3LibXFree86
|
|
endif
|
|
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
|
|
LIBRARIES += \
|