[packages/VirtualBox.git] / 18-system-xorg.patch

Description: Build the X.Org driver only for the selected system X Server version.
Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de>

diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
--- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
@@ -40,8 +40,8 @@ LIBRARIES += \
 	VBoxGuestR3LibShared
 ifndef VBOX_ONLY_TESTSUITE
  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
-  LIBRARIES += \
-  	VBoxGuestR3LibXFree86
+#  LIBRARIES += \
+#  	VBoxGuestR3LibXFree86
  endif
 endif
 LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
--- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk
@@ -63,18 +63,12 @@
 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
 
diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
--- a/src/VBox/Additions/x11/Makefile.kmk
+++ b/src/VBox/Additions/x11/Makefile.kmk
@@ -17,6 +17,10 @@
 SUB_DEPTH = ../../../..
 include $(KBUILD_PATH)/subheader.kmk
 
+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
+ XSERVER_VERSION := 17
+endif
+
 # Include sub-makefiles.
 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -23,7 +23,6 @@ include	$(KBUILD_PATH)/subheader.kmk
 # vboxmouse_drv
 #
 if1of ($(KBUILD_TARGET), linux)
- SYSMODS += vboxmouse_drv
  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
  vboxmouse_drv_DEFS.linux = linux
  vboxmouse_drv_DEFS.x86 += __i386__
@@ -59,7 +58,6 @@ endif
 #
 # vboxmouse_drv_70
 #
-DLLS += vboxmouse_drv_70
 vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_70_DEFS = \
 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE
@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \
 #
 # vboxmouse_drv_71
 #
-DLLS += vboxmouse_drv_71
 vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
 vboxmouse_drv_71_INCS := \
@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \
 #
 # vboxmouse_drv_13
 #
-DLLS += vboxmouse_drv_13
 vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_13_INCS := \
@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \
 #
 # vboxmouse_drv_14
 #
-DLLS += vboxmouse_drv_14
 vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_14_INCS := \
@@ -126,7 +121,6 @@ endif
 #
 # vboxmouse_drv_15
 #
-DLLS += vboxmouse_drv_15
 vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_15_INCS := \
@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \
 #
 # vboxmouse_drv_16
 #
-DLLS += vboxmouse_drv_16
 vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 vboxmouse_drv_16_INCS := \
@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \
 #
 # vboxmouse_drv_17
 #
-DLLS += vboxmouse_drv_17
 vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \
 #
 # vboxmouse_drv_18
 #
-DLLS += vboxmouse_drv_18
 vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \
 #
 # vboxmouse_drv_19
 #
-DLLS += vboxmouse_drv_19
 vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \
 #
 # vboxmouse_drv_110
 #
-DLLS += vboxmouse_drv_110
 vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
 ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \
 	vboxmouse_15.c
 
 
+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv
+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
+	/usr/include/x11 \
+	/usr/include/xorg \
+	/usr/include/pixman-1
+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
+
+
 # Check the undefined symbols in the X.Org modules against lists of allowed
 # symbols.  Not very elegant, but it will catch problems early.
 ifdef VBOX_WITH_TESTCASES
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -22,7 +22,6 @@ include	$(KBUILD_PATH)/subheader.kmk
 # vboxvideo_drv
 #
 if1of ($(KBUILD_TARGET), linux)
- SYSMODS += vboxvideo_drv
 endif   # target linux
 vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
 vboxvideo_drv_DEFS.linux = linux
@@ -89,7 +88,6 @@ endif   # target linux
 #         base keywords instead of using .solaris or .linux.
 #         Also it is *important* to use := and not = when deriving a property.
 #
-DLLS += vboxvideo_drv_70
 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
 if1of ($(KBUILD_TARGET), linux)
  vboxvideo_drv_70_CFLAGS += \
@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES  = $(vboxvideo_drv_SOURCES)
 #
 # vboxvideo_drv_71
 #
-DLLS += vboxvideo_drv_71
 vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES  = $(vboxvideo_drv_SOURCES)
 #
 # vboxvideo_drv_13
 #
-DLLS += vboxvideo_drv_13
 vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \
 #
 # vboxvideo_drv_14
 #
-DLLS += vboxvideo_drv_14
 vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES  = $(vboxvideo_drv_13_SOURCES)
 #
 # vboxvideo_drv_15
 #
-DLLS += vboxvideo_drv_15
 vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
@@ -192,7 +186,6 @@ endif
 #
 # vboxvideo_drv_16
 #
-DLLS += vboxvideo_drv_16
 vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
 #
 # vboxvideo_drv_17
 #
-DLLS += vboxvideo_drv_17
 vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
 #
 # vboxvideo_drv_18
 #
-DLLS += vboxvideo_drv_18
 vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
 #
 # vboxvideo_drv_19
 #
-DLLS += vboxvideo_drv_19
 vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
 #
 # vboxvideo_drv_110
 #
-DLLS += vboxvideo_drv_110
 vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
 vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
 vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \
 vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES)
 
 
+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
+	/usr/include/xorg \
+	/usr/include/x11 \
+	/usr/include/pixman-1 \
+	/usr/include/X11/dri \
+	/usr/include/drm \
+	/usr/include/libdrm
+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
+
+# required for lenny backports
+ifeq ($(XSERVER_VERSION),14)
+	vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
+endif
+
+
 # Check the undefined symbols in the X.Org modules against lists of allowed
 # symbols.  Not very elegant, but it will catch problems early.
 ifdef VBOX_WITH_TESTCASES
Commit	Line	Data
acf12a87 AM	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>
	3
	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 += \
	8	VBoxGuestR3LibShared
	9	ifndef VBOX_ONLY_TESTSUITE
	10	if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
	11	- LIBRARIES += \
	12	- VBoxGuestR3LibXFree86
	13	+# LIBRARIES += \
	14	+# VBoxGuestR3LibXFree86
	15	endif
	16	endif
	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
5d8f03ab	21	@@ -63,18 +63,12 @@
acf12a87 AM	22	VBoxOGL_INCS = .
	23	if1of ($(KBUILD_TARGET), linux solaris freebsd)
	24	VBoxOGL_INCS += \
	25	- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
	26	- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
5d8f03ab	27	- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
acf12a87 AM	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 \
5d8f03ab KK	33	- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
5d8f03ab KK	34	- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
acf12a87 AM	35	+ /usr/include/x11 \
	36	+ /usr/include/xorg \
	37	+ /usr/include/pixman-1 \
	38	$(VBOX_MESA_INCS) \
	39	- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
	40	+ /usr/include/drm \
	41	+ /usr/include/libdrm
	42	VBoxOGL_DEFS += VBOX_NO_NATIVEGL
	43	endif
	44
	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
	48	@@ -17,6 +17,10 @@
	49	SUB_DEPTH = ../../../..
	50	include $(KBUILD_PATH)/subheader.kmk
	51
91eb6bbe	52	+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
acf12a87 AM	53	+ XSERVER_VERSION := 17
	54	+endif
	55	+
	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
	63	# vboxmouse_drv
	64	#
	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
	71	#
	72	# vboxmouse_drv_70
	73	#
	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 = \
	79	#
	80	# vboxmouse_drv_71
	81	#
	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 = \
	87	#
	88	# vboxmouse_drv_13
	89	#
	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 = \
	95	#
	96	# vboxmouse_drv_14
	97	#
	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
	103	#
	104	# vboxmouse_drv_15
	105	#
	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 = \
	111	#
	112	# vboxmouse_drv_16
	113	#
	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 = \
119	#
120	# vboxmouse_drv_17
121	#
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 = \
127	#
128	# vboxmouse_drv_18
129	#
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 = \
135	#
136	# vboxmouse_drv_19
137	#
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
91eb6bbe AM	142	@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \
	143	#
	144	# vboxmouse_drv_110
	145	#
	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 = \
acf12a87 AM	151	vboxmouse_15.c
	152
	153
	154	+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv
	155	+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
	156	+ /usr/include/x11 \
	157	+ /usr/include/xorg \
	158	+ /usr/include/pixman-1
	159	+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
	160	+
	161	+
	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
	169	# vboxvideo_drv
	170	#
	171	if1of ($(KBUILD_TARGET), linux)
	172	- SYSMODS += vboxvideo_drv
	173	endif # target linux
	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.
	179	#
	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)
	185	#
	186	# vboxvideo_drv_71
	187	#
	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)
	193	#
	194	# vboxvideo_drv_13
	195	#
	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 = \
	201	#
	202	# vboxvideo_drv_14
	203	#
	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)
	209	#
	210	# vboxvideo_drv_15
	211	#
	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
217	#
218	# vboxvideo_drv_16
219	#
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)
225	#
226	# vboxvideo_drv_17
227	#
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)
233	#
234	# vboxvideo_drv_18
235	#
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)
241	#
242	# vboxvideo_drv_19
243	#
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)
91eb6bbe AM	248	@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
	249	#
	250	# vboxvideo_drv_110
	251	#
	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)
acf12a87 AM	258
	259
	260	+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
	261	+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
	262	+ /usr/include/xorg \
	263	+ /usr/include/x11 \
	264	+ /usr/include/pixman-1 \
	265	+ /usr/include/X11/dri \
	266	+ /usr/include/drm \
	267	+ /usr/include/libdrm
	268	+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
	269	+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
	270	+
	271	+# required for lenny backports
	272	+ifeq ($(XSERVER_VERSION),14)
	273	+ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
	274	+endif
	275	+
	276	+
	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