]>
Commit | Line | Data |
---|---|---|
acf12a87 | 1 | Description: Build the X.Org driver only for the selected system X Server version. |
cc827380 | 2 | Author: Michael Meskes <meskes@debian.org>, Felix Geyer <fgeyer@debian.org> |
acf12a87 | 3 | |
acf12a87 AM |
4 | --- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk |
5 | +++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk | |
6 | @@ -40,8 +40,8 @@ LIBRARIES += \ | |
7 | VBoxGuestR3LibShared | |
8 | ifndef VBOX_ONLY_TESTSUITE | |
9 | if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) | |
10 | - LIBRARIES += \ | |
b328d783 | 11 | - VBoxGuestR3LibXFree86 |
acf12a87 | 12 | +# LIBRARIES += \ |
b328d783 | 13 | +# VBoxGuestR3LibXFree86 |
acf12a87 AM |
14 | endif |
15 | endif | |
16 | LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 | |
acf12a87 AM |
17 | --- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk |
18 | +++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | |
cc827380 | 19 | @@ -63,18 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES |
acf12a87 AM |
20 | VBoxOGL_INCS = . |
21 | if1of ($(KBUILD_TARGET), linux solaris freebsd) | |
22 | VBoxOGL_INCS += \ | |
23 | - $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ | |
24 | - $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ | |
5d8f03ab | 25 | - $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \ |
acf12a87 AM |
26 | - $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ |
27 | - $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ | |
28 | - $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ | |
29 | - $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ | |
30 | - $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ | |
5d8f03ab KK |
31 | - $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \ |
32 | - $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \ | |
acf12a87 AM |
33 | + /usr/include/x11 \ |
34 | + /usr/include/xorg \ | |
35 | + /usr/include/pixman-1 \ | |
36 | $(VBOX_MESA_INCS) \ | |
37 | - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 | |
38 | + /usr/include/drm \ | |
39 | + /usr/include/libdrm | |
40 | VBoxOGL_DEFS += VBOX_NO_NATIVEGL | |
41 | endif | |
42 | ||
cc827380 JR |
43 | @@ -204,10 +198,10 @@ VBoxOGL_LIBS = \ |
44 | $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) | |
45 | if1of ($(KBUILD_TARGET), linux solaris freebsd) | |
46 | VBoxOGL_LIBS += \ | |
47 | - $(PATH_STAGE_LIB)/libXcomposite.so \ | |
48 | - $(PATH_STAGE_LIB)/libXdamage.so \ | |
49 | - $(PATH_STAGE_LIB)/libXfixes.so \ | |
50 | - $(PATH_STAGE_LIB)/libXext.so | |
51 | + Xcomposite \ | |
52 | + Xdamage \ | |
53 | + Xfixes \ | |
54 | + Xext | |
55 | ifdef VBoxOGL_FAKEDRI | |
56 | VBoxOGL_LIBS += \ | |
57 | dl | |
b328d783 JP |
58 | diff -urN VirtualBox-4.3.8.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.3.8/src/VBox/Additions/x11/vboxvideo/Makefile.kmk |
59 | --- VirtualBox-4.3.8.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2014-02-26 12:57:53.419736985 +0100 | |
60 | +++ VirtualBox-4.3.8/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2014-02-26 12:59:09.746407116 +0100 | |
61 | @@ -376,7 +376,7 @@ | |
62 | /usr/include/libdrm \ | |
63 | /usr/include/xorg \ | |
64 | /usr/include/pixman-1 | |
65 | - vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_15_SOURCES) | |
66 | + vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_17_SOURCES) | |
67 | endif | |
68 | ||
69 |