jengelh/virtualbox
SHA256
1
0
Fork 0
forked from pool/virtualbox
Code Pull Requests Activity
fb04d2a68e
virtualbox/virtualbox-system-x.patch

55 lines
2.1 KiB
Diff
Raw Normal View History

- Version bump to 5.0.0: * Major bump from 4 series with tons of changes. * Read upstream changelog for in-depth informations - Obsoleted patches: * gcc5-support.patch * gcc51-support.patch - Refreshed patches: * gcc5-real-support.patch * vbox-disable-updates.diff * virtualbox-system-x.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=206
2015-07-11 13:43:54 +02:00
diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-5.0.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk
--- VirtualBox-5.0.0.old/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-07-11 13:17:27.581698930 +0200
+++ VirtualBox-5.0.0/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-07-11 13:19:09.146886862 +0200
@@ -67,18 +67,12 @@
- Build with system libs for X instead of localy built ones. 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
2015-05-06 22:07:21 +02:00
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
- Version bump to 5.0.0: * Major bump from 4 series with tons of changes. * Read upstream changelog for in-depth informations - Obsoleted patches: * gcc5-support.patch * gcc51-support.patch - Refreshed patches: * gcc5-real-support.patch * vbox-disable-updates.diff * virtualbox-system-x.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=206
2015-07-11 13:43:54 +02:00
@@ -213,10 +207,10 @@
- Build with system libs for X instead of localy built ones. 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
2015-05-06 22:07:21 +02:00
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 += \
- Version bump to 5.0.0: * Major bump from 4 series with tons of changes. * Read upstream changelog for in-depth informations - Obsoleted patches: * gcc5-support.patch * gcc51-support.patch - Refreshed patches: * gcc5-real-support.patch * vbox-disable-updates.diff * virtualbox-system-x.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=206
2015-07-11 13:43:54 +02:00
diff -urN VirtualBox-5.0.0.old/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-5.0.0/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
--- VirtualBox-5.0.0.old/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2015-07-11 13:17:27.580698928 +0200
+++ VirtualBox-5.0.0/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2015-07-11 13:19:09.146886862 +0200
@@ -40,8 +40,6 @@
VBoxGuestR3LibShared
ifndef VBOX_ONLY_VALIDATIONKIT
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
- LIBRARIES += \
- VBoxGuestR3LibXFree86
endif
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
LIBRARIES += \
Copy Permalink