1 Description: Build the X.Org driver only for the selected system X Server version.
2 Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de>
4 diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
5 --- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
6 +++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
7 @@ -40,8 +40,8 @@ LIBRARIES += \
9 ifndef VBOX_ONLY_TESTSUITE
10 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
12 - VBoxGuestR3LibXFree86
14 +# VBoxGuestR3LibXFree86
17 LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
18 diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
19 --- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
20 +++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
21 @@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL
23 if1of ($(KBUILD_TARGET), linux solaris freebsd)
25 - $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
26 - $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
27 - $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
28 - $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
29 - $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
30 - $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
31 - $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
32 - $(VBOX_PATH_X11_ROOT)/1.3/xorg \
35 + /usr/include/pixman-1 \
37 - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
40 VBoxOGL_DEFS += VBOX_NO_NATIVEGL
43 diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
44 --- a/src/VBox/Additions/x11/Makefile.kmk
45 +++ b/src/VBox/Additions/x11/Makefile.kmk
47 SUB_DEPTH = ../../../..
48 include $(KBUILD_PATH)/subheader.kmk
50 +ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
51 + XSERVER_VERSION := 17
54 # Include sub-makefiles.
55 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
56 include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
57 diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
58 --- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
59 +++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
60 @@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk
63 if1of ($(KBUILD_TARGET), linux)
64 - SYSMODS += vboxmouse_drv
65 vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
66 vboxmouse_drv_DEFS.linux = linux
67 vboxmouse_drv_DEFS.x86 += __i386__
68 @@ -59,7 +58,6 @@ endif
72 -DLLS += vboxmouse_drv_70
73 vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
74 vboxmouse_drv_70_DEFS = \
75 XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE
76 @@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \
80 -DLLS += vboxmouse_drv_71
81 vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
82 vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
83 vboxmouse_drv_71_INCS := \
84 @@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \
88 -DLLS += vboxmouse_drv_13
89 vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
90 vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
91 vboxmouse_drv_13_INCS := \
92 @@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \
96 -DLLS += vboxmouse_drv_14
97 vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
98 vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
99 vboxmouse_drv_14_INCS := \
100 @@ -126,7 +121,6 @@ endif
104 -DLLS += vboxmouse_drv_15
105 vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
106 vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
107 vboxmouse_drv_15_INCS := \
108 @@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \
112 -DLLS += vboxmouse_drv_16
113 vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
114 vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
115 vboxmouse_drv_16_INCS := \
116 @@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \
120 -DLLS += vboxmouse_drv_17
121 vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
122 vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
123 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
124 @@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \
128 -DLLS += vboxmouse_drv_18
129 vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
130 vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
131 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
132 @@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \
136 -DLLS += vboxmouse_drv_19
137 vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
138 vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
139 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
140 @@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \
144 -DLLS += vboxmouse_drv_110
145 vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
146 vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
147 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
148 @@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \
152 +vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv
153 +vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
155 + /usr/include/xorg \
156 + /usr/include/pixman-1
157 +DLLS += vboxmouse_drv_$(XSERVER_VERSION)
160 # Check the undefined symbols in the X.Org modules against lists of allowed
161 # symbols. Not very elegant, but it will catch problems early.
162 ifdef VBOX_WITH_TESTCASES
163 diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
164 --- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
165 +++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
166 @@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk
169 if1of ($(KBUILD_TARGET), linux)
170 - SYSMODS += vboxvideo_drv
172 vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
173 vboxvideo_drv_DEFS.linux = linux
174 @@ -89,7 +88,6 @@ endif # target linux
175 # base keywords instead of using .solaris or .linux.
176 # Also it is *important* to use := and not = when deriving a property.
178 -DLLS += vboxvideo_drv_70
179 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
180 if1of ($(KBUILD_TARGET), linux)
181 vboxvideo_drv_70_CFLAGS += \
182 @@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
186 -DLLS += vboxvideo_drv_71
187 vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
188 vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
189 vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
190 @@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
194 -DLLS += vboxvideo_drv_13
195 vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
196 vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
197 vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
198 @@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \
202 -DLLS += vboxvideo_drv_14
203 vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
204 vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
205 vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
206 @@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES)
210 -DLLS += vboxvideo_drv_15
211 vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
212 vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
213 vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
214 @@ -192,7 +186,6 @@ endif
218 -DLLS += vboxvideo_drv_16
219 vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
220 vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
221 vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
222 @@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
226 -DLLS += vboxvideo_drv_17
227 vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
228 vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
229 vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
230 @@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
234 -DLLS += vboxvideo_drv_18
235 vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
236 vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
237 vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
238 @@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
242 -DLLS += vboxvideo_drv_19
243 vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
244 vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
245 vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
246 @@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
250 -DLLS += vboxvideo_drv_110
251 vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
252 vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
253 vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS)
254 @@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \
255 vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
258 +vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
259 +vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
260 + /usr/include/xorg \
262 + /usr/include/pixman-1 \
263 + /usr/include/X11/dri \
265 + /usr/include/libdrm
266 +vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
267 +DLLS += vboxvideo_drv_$(XSERVER_VERSION)
269 +# required for lenny backports
270 +ifeq ($(XSERVER_VERSION),14)
271 + vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
275 # Check the undefined symbols in the X.Org modules against lists of allowed
276 # symbols. Not very elegant, but it will catch problems early.
277 ifdef VBOX_WITH_TESTCASES