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
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)/libXext-1.3.1 \
28 - $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
29 - $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
30 - $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
31 - $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
32 - $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
33 - $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
34 - $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
37 + /usr/include/pixman-1 \
39 - $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
42 VBoxOGL_DEFS += VBOX_NO_NATIVEGL
45 diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
46 --- a/src/VBox/Additions/x11/Makefile.kmk
47 +++ b/src/VBox/Additions/x11/Makefile.kmk
49 SUB_DEPTH = ../../../..
50 include $(KBUILD_PATH)/subheader.kmk
52 +ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
53 + XSERVER_VERSION := 17
56 # Include sub-makefiles.
57 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
58 include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
59 diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
60 --- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
61 +++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
62 @@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk
65 if1of ($(KBUILD_TARGET), linux)
66 - SYSMODS += vboxmouse_drv
67 vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
68 vboxmouse_drv_DEFS.linux = linux
69 vboxmouse_drv_DEFS.x86 += __i386__
70 @@ -59,7 +58,6 @@ endif
74 -DLLS += vboxmouse_drv_70
75 vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
76 vboxmouse_drv_70_DEFS = \
77 XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE
78 @@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \
82 -DLLS += vboxmouse_drv_71
83 vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
84 vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
85 vboxmouse_drv_71_INCS := \
86 @@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \
90 -DLLS += vboxmouse_drv_13
91 vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
92 vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
93 vboxmouse_drv_13_INCS := \
94 @@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \
98 -DLLS += vboxmouse_drv_14
99 vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
100 vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
101 vboxmouse_drv_14_INCS := \
102 @@ -126,7 +121,6 @@ endif
106 -DLLS += vboxmouse_drv_15
107 vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
108 vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
109 vboxmouse_drv_15_INCS := \
110 @@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \
114 -DLLS += vboxmouse_drv_16
115 vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
116 vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
117 vboxmouse_drv_16_INCS := \
118 @@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \
122 -DLLS += vboxmouse_drv_17
123 vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
124 vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
125 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
126 @@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \
130 -DLLS += vboxmouse_drv_18
131 vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
132 vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
133 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
134 @@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \
138 -DLLS += vboxmouse_drv_19
139 vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
140 vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
141 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
142 @@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \
146 -DLLS += vboxmouse_drv_110
147 vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
148 vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
149 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
150 @@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \
154 +vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv
155 +vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
157 + /usr/include/xorg \
158 + /usr/include/pixman-1
159 +DLLS += vboxmouse_drv_$(XSERVER_VERSION)
162 # Check the undefined symbols in the X.Org modules against lists of allowed
163 # symbols. Not very elegant, but it will catch problems early.
164 ifdef VBOX_WITH_TESTCASES
165 diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
166 --- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
167 +++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
168 @@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk
171 if1of ($(KBUILD_TARGET), linux)
172 - SYSMODS += vboxvideo_drv
174 vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
175 vboxvideo_drv_DEFS.linux = linux
176 @@ -89,7 +88,6 @@ endif # target linux
177 # base keywords instead of using .solaris or .linux.
178 # Also it is *important* to use := and not = when deriving a property.
180 -DLLS += vboxvideo_drv_70
181 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
182 if1of ($(KBUILD_TARGET), linux)
183 vboxvideo_drv_70_CFLAGS += \
184 @@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
188 -DLLS += vboxvideo_drv_71
189 vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
190 vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
191 vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
192 @@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
196 -DLLS += vboxvideo_drv_13
197 vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
198 vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
199 vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
200 @@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \
204 -DLLS += vboxvideo_drv_14
205 vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
206 vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
207 vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
208 @@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES)
212 -DLLS += vboxvideo_drv_15
213 vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
214 vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
215 vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
216 @@ -192,7 +186,6 @@ endif
220 -DLLS += vboxvideo_drv_16
221 vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
222 vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
223 vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
224 @@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
228 -DLLS += vboxvideo_drv_17
229 vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
230 vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
231 vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
232 @@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
236 -DLLS += vboxvideo_drv_18
237 vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
238 vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
239 vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
240 @@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
244 -DLLS += vboxvideo_drv_19
245 vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
246 vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
247 vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
248 @@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
252 -DLLS += vboxvideo_drv_110
253 vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
254 vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
255 vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS)
256 @@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \
257 vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
260 +vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
261 +vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
262 + /usr/include/xorg \
264 + /usr/include/pixman-1 \
265 + /usr/include/X11/dri \
267 + /usr/include/libdrm
268 +vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
269 +DLLS += vboxvideo_drv_$(XSERVER_VERSION)
271 +# required for lenny backports
272 +ifeq ($(XSERVER_VERSION),14)
273 + vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
277 # Check the undefined symbols in the X.Org modules against lists of allowed
278 # symbols. Not very elegant, but it will catch problems early.
279 ifdef VBOX_WITH_TESTCASES