upstream fixes for linux 4.14 (r69143, r69525, r69539)
[packages/VirtualBox.git] / 18-system-xorg.patch
1 Description: Build the X.Org driver only for the selected system X Server version.
2 Author: Michael Meskes <meskes@debian.org>, Felix Geyer <fgeyer@debian.org>
3
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 += \
11 -       VBoxGuestR3LibXFree86
12 +#  LIBRARIES += \
13 +#      VBoxGuestR3LibXFree86
14   endif
15  endif
16  LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
17 --- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
18 +++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
19 @@ -63,18 +63,12 @@ VBoxOGL_TEMPLATE       = VBOXCROGLR3GUES
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 \
25 -       $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
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 \
31 -       $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
32 -       $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
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  
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
This page took 0.04109 seconds and 3 git commands to generate.