[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,16 +63,12 @@ VBoxOGL_TEMPLATE       = VBOXCROGLR3GUESTDLL
 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)/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)/1.3/xorg \
+	/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), 70 71 13 14 15 16 17 18 19)
+ 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
@@ -214,6 +204,14 @@ vboxmouse_drv_19_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)
@@ -290,6 +280,23 @@ vboxvideo_drv_19_INCS = \
 vboxvideo_drv_19_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
	21	@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL
	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 \
	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 \
	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	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
	46	@@ -17,6 +17,10 @@
	47	SUB_DEPTH = ../../../..
	48	include $(KBUILD_PATH)/subheader.kmk
	49
	50	+ifn1of ($(XSERVER_VERSION), 70 71 13 14 15 16 17 18 19)
	51	+ XSERVER_VERSION := 17
	52	+endif
	53	+
	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
	61	# vboxmouse_drv
	62	#
	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
69	#
70	# vboxmouse_drv_70
71	#
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 = \
77	#
78	# vboxmouse_drv_71
79	#
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 = \
85	#
86	# vboxmouse_drv_13
87	#
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 = \
93	#
94	# vboxmouse_drv_14
95	#
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
101	#
102	# vboxmouse_drv_15
103	#
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 = \
109	#
110	# vboxmouse_drv_16
111	#
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 = \
117	#
118	# vboxmouse_drv_17
119	#
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 = \
125	#
126	# vboxmouse_drv_18
127	#
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 = \
133	#
134	# vboxmouse_drv_19
135	#
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	@@ -214,6 +204,14 @@ vboxmouse_drv_19_SOURCES = \
141	vboxmouse_15.c
142
143
144	+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv
145	+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
146	+ /usr/include/x11 \
147	+ /usr/include/xorg \
148	+ /usr/include/pixman-1
149	+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
150	+
151	+
152	# Check the undefined symbols in the X.Org modules against lists of allowed
153	# symbols. Not very elegant, but it will catch problems early.
154	ifdef VBOX_WITH_TESTCASES
155	diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
156	--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
157	+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
158	@@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk
159	# vboxvideo_drv
160	#
161	if1of ($(KBUILD_TARGET), linux)
162	- SYSMODS += vboxvideo_drv
163	endif # target linux
164	vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
165	vboxvideo_drv_DEFS.linux = linux
166	@@ -89,7 +88,6 @@ endif # target linux
167	# base keywords instead of using .solaris or .linux.
168	# Also it is important to use := and not = when deriving a property.
169	#
170	-DLLS += vboxvideo_drv_70
171	vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
172	if1of ($(KBUILD_TARGET), linux)
173	vboxvideo_drv_70_CFLAGS += \
174	@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
175	#
176	# vboxvideo_drv_71
177	#
178	-DLLS += vboxvideo_drv_71
179	vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
180	vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
181	vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
182	@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
183	#
184	# vboxvideo_drv_13
185	#
186	-DLLS += vboxvideo_drv_13
187	vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
188	vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
189	vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
190	@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \
191	#
192	# vboxvideo_drv_14
193	#
194	-DLLS += vboxvideo_drv_14
195	vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
196	vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
197	vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
198	@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES)
199	#
200	# vboxvideo_drv_15
201	#
202	-DLLS += vboxvideo_drv_15
203	vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
204	vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
205	vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
206	@@ -192,7 +186,6 @@ endif
207	#
208	# vboxvideo_drv_16
209	#
210	-DLLS += vboxvideo_drv_16
211	vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
212	vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
213	vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
214	@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES)
215	#
216	# vboxvideo_drv_17
217	#
218	-DLLS += vboxvideo_drv_17
219	vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
220	vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
221	vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
222	@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
223	#
224	# vboxvideo_drv_18
225	#
226	-DLLS += vboxvideo_drv_18
227	vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
228	vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
229	vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
230	@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES)
231	#
232	# vboxvideo_drv_19
233	#
234	-DLLS += vboxvideo_drv_19
235	vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
236	vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
237	vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
238	@@ -290,6 +280,23 @@ vboxvideo_drv_19_INCS = \
239	vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
240
241
242	+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
243	+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
244	+ /usr/include/xorg \
245	+ /usr/include/x11 \
246	+ /usr/include/pixman-1 \
247	+ /usr/include/X11/dri \
248	+ /usr/include/drm \
249	+ /usr/include/libdrm
250	+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
251	+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
252	+
253	+# required for lenny backports
254	+ifeq ($(XSERVER_VERSION),14)
255	+ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
256	+endif
257	+
258	+
259	# Check the undefined symbols in the X.Org modules against lists of allowed
260	# symbols. Not very elegant, but it will catch problems early.
261	ifdef VBOX_WITH_TESTCASES