2011-07-10 19:29:11 +00:00
|
|
|
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
|
|
|
|
|
2011-10-04 10:54:49 +00:00
|
|
|
+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111)
|
2011-07-10 19:29:11 +00:00
|
|
|
+ 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
|