Djam/virtualbox
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/virtualbox.git synced 2025-02-23 17:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
virtualbox/VirtualBox-4.2.2-system-xorg.patch
Charlie Root 71d35ce896 SILENT: ABF Import
2012-11-13 00:43:58 +00:00

294 lines
10 KiB
Diff
Raw Blame History

--- VirtualBox-4.2.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk.xorg~ 2012-10-18 16:19:30.000000000 +0200
+++ VirtualBox-4.2.2/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-10-25 06:42:45.910739485 +0200
@@ -63,18 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES
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
--- VirtualBox-4.2.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.xorg~ 2012-10-18 16:19:25.000000000 +0200
+++ VirtualBox-4.2.2/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-10-25 06:42:45.910739485 +0200
@@ -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
--- VirtualBox-4.2.2/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg~ 2012-10-18 16:19:45.000000000 +0200
+++ VirtualBox-4.2.2/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-10-25 06:42:45.910739485 +0200
@@ -29,7 +29,6 @@ vboxmouse_xorg_INCS = \
# vboxmouse_drv
#
if1of ($(KBUILD_TARGET), linux)
- SYSMODS += vboxmouse_drv
vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
vboxmouse_drv_DEFS.linux = linux
vboxmouse_drv_DEFS.x86 += __i386__
@@ -69,7 +68,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 DONT_DEFINE_WRAPPERS NO_ANSIC
@@ -85,7 +83,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) NO_ANSIC
vboxmouse_drv_71_INCS := \
@@ -100,7 +97,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 := \
@@ -114,7 +110,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 := \
@@ -128,7 +123,6 @@ vboxmouse_drv_14_SOURCES = \
#
# 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 := \
@@ -142,7 +136,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 := \
@@ -158,7 +151,6 @@ ifneq ($(KBUILD_TARGET), linux)
#
# 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
@@ -173,7 +165,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
@@ -188,7 +179,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
@@ -203,7 +193,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
@@ -214,7 +203,6 @@ vboxmouse_drv_110_INCS := \
vboxmouse_drv_110_SOURCES = \
vboxmouse.c
-DLLS += vboxmouse_drv_111
vboxmouse_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_111_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
@@ -225,7 +213,6 @@ vboxmouse_drv_111_INCS := \
vboxmouse_drv_111_SOURCES = \
vboxmouse.c
-DLLS += vboxmouse_drv_112
vboxmouse_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_112_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
@@ -236,6 +223,13 @@ vboxmouse_drv_112_INCS := \
vboxmouse_drv_112_SOURCES = \
vboxmouse.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)
+
endif # neq ($(KBUILD_TARGET),linux)
--- VirtualBox-4.2.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg~ 2012-10-18 16:19:45.000000000 +0200
+++ VirtualBox-4.2.2/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-10-25 06:42:45.911739499 +0200
@@ -53,7 +53,6 @@ vboxvideo_xorg_INCS = \
# vboxvideo_drv
#
if1of ($(KBUILD_TARGET), linux)
- SYSMODS += vboxvideo_drv
endif # target linux
vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
vboxvideo_drv_DEFS.linux = linux
@@ -128,7 +127,6 @@ vboxvideo_drv_SOURCES = \
# 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 += \
@@ -149,7 +147,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_
#
# 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_70_DEFS) XORG_VERSION_CURRENT=700100000
@@ -164,7 +161,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_
#
# 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_13_DEFS) XORG_VERSION_CURRENT=100300000
@@ -178,7 +174,6 @@ vboxvideo_drv_13_SOURCES = $(vboxvideo_d
#
# 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_13_DEFS) XORG_VERSION_CURRENT=100400000
@@ -192,7 +187,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_
#
# 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_15_DEFS) XORG_VERSION_CURRENT=100503000
@@ -213,7 +207,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_15_DEFS) XORG_VERSION_CURRENT=100600000
@@ -227,7 +220,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_
#
# 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_15_DEFS) XORG_VERSION_CURRENT=100699000
@@ -241,7 +233,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_
#
# 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_15_DEFS) XORG_VERSION_CURRENT=100800000
@@ -255,7 +246,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_
#
# 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_15_DEFS) XORG_VERSION_CURRENT=100900000
@@ -269,7 +259,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_
#
# 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_15_DEFS) XORG_VERSION_CURRENT=101000000
@@ -283,7 +272,6 @@ vboxvideo_drv_110_SOURCES := $(vboxvideo
#
# vboxvideo_drv_111
#
-DLLS += vboxvideo_drv_111
vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
@@ -297,7 +285,6 @@ vboxvideo_drv_111_SOURCES := $(vboxvideo
#
# vboxvideo_drv_112
#
-DLLS += vboxvideo_drv_112
vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
@@ -311,7 +298,6 @@ vboxvideo_drv_112_SOURCES := $(vboxvideo
#
# vboxvideo_drv_113
#
-DLLS += vboxvideo_drv_113
vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
@@ -321,6 +307,20 @@ vboxvideo_drv_113_INCS = \
vboxvideo_drv_113_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_15_SOURCES)
+#
+# build only for selected server
+#
+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)
+
ifdef VBOX_USE_SYSTEM_XORG_HEADERS
# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
Reference in a new issue View git blame Copy permalink