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

LOG Re-diff system-xorg patch

Browse source
This commit is contained in:
Andrey Bondrov 2013-04-14 23:27:33 +11:00
parent 179b8591ab
commit 3c40640f3b
2 changed files with 46 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
VirtualBox-4.2.2-system-xorg.patch → VirtualBox-4.2.12-system-xorg.patch
View file

@ -1,6 +1,7 @@
--- 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
diff -urN VirtualBox-4.2.12/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.12-patched/src/VBox/Additions/common/crOpenGL/Makefile.kmk
--- VirtualBox-4.2.12/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-04-12 21:35:06.000000000 +1100
+++ VirtualBox-4.2.12-patched/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-04-14 23:24:09.109992882 +1100
@@ -63,18 +63,12 @@
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_INCS += \
@ -24,9 +25,10 @@
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 += \
diff -urN VirtualBox-4.2.12/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.12-patched/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
--- VirtualBox-4.2.12/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-04-12 21:35:01.000000000 +1100
+++ VirtualBox-4.2.12-patched/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-04-14 23:24:09.109992882 +1100
@@ -40,8 +40,8 @@
VBoxGuestR3LibShared
ifndef VBOX_ONLY_TESTSUITE
if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
@ -37,9 +39,10 @@
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 = \
diff -urN VirtualBox-4.2.12/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.12-patched/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
--- VirtualBox-4.2.12/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-04-12 21:35:20.000000000 +1100
+++ VirtualBox-4.2.12-patched/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-04-14 23:24:09.110492883 +1100
@@ -29,7 +29,6 @@
# vboxmouse_drv
#
if1of ($(KBUILD_TARGET), linux)
@ -47,7 +50,7 @@
vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
vboxmouse_drv_DEFS.linux = linux
vboxmouse_drv_DEFS.x86 += __i386__
@@ -69,7 +68,6 @@ endif
@@ -69,7 +68,6 @@
#
# vboxmouse_drv_70
#
@ -55,7 +58,7 @@
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 = \
@@ -85,7 +83,6 @@
#
# vboxmouse_drv_71
#
@ -63,7 +66,7 @@
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 = \
@@ -100,7 +97,6 @@
#
# vboxmouse_drv_13
#
@ -71,7 +74,7 @@
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 = \
@@ -114,7 +110,6 @@
#
# vboxmouse_drv_14
#
@ -79,7 +82,7 @@
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 = \
@@ -128,7 +123,6 @@
#
# vboxmouse_drv_15
#
@ -87,7 +90,7 @@
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 = \
@@ -142,7 +136,6 @@
#
# vboxmouse_drv_16
#
@ -95,7 +98,7 @@
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)
@@ -158,7 +151,6 @@
#
# vboxmouse_drv_17
#
@ -103,7 +106,7 @@
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 = \
@@ -173,7 +165,6 @@
#
# vboxmouse_drv_18
#
@ -111,7 +114,7 @@
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 = \
@@ -188,7 +179,6 @@
#
# vboxmouse_drv_19
#
@ -119,7 +122,7 @@
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 = \
@@ -203,7 +193,6 @@
#
# vboxmouse_drv_110
#
@ -127,7 +130,7 @@
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 := \
@@ -214,7 +203,6 @@
vboxmouse_drv_110_SOURCES = \
vboxmouse.c
@ -135,7 +138,7 @@
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 := \
@@ -225,7 +213,6 @@
vboxmouse_drv_111_SOURCES = \
vboxmouse.c
@ -143,7 +146,7 @@
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 := \
@@ -236,6 +223,13 @@
vboxmouse_drv_112_SOURCES = \
vboxmouse.c
@ -157,9 +160,10 @@
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 = \
diff -urN VirtualBox-4.2.12/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.12-patched/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
--- VirtualBox-4.2.12/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-04-12 21:35:20.000000000 +1100
+++ VirtualBox-4.2.12-patched/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-04-14 23:24:09.110492883 +1100
@@ -53,7 +53,6 @@
# vboxvideo_drv
#
if1of ($(KBUILD_TARGET), linux)
@ -167,7 +171,7 @@
endif # target linux
vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
vboxvideo_drv_DEFS.linux = linux
@@ -128,7 +127,6 @@ vboxvideo_drv_SOURCES = \
@@ -128,7 +127,6 @@
# base keywords instead of using .solaris or .linux.
# Also it is *important* to use := and not = when deriving a property.
#
@ -175,7 +179,7 @@
vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
if1of ($(KBUILD_TARGET), linux)
vboxvideo_drv_70_CFLAGS += \
@@ -149,7 +147,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_
@@ -149,7 +147,6 @@
#
# vboxvideo_drv_71
#
@ -183,7 +187,7 @@
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_
@@ -164,7 +161,6 @@
#
# vboxvideo_drv_13
#
@ -191,7 +195,7 @@
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
@@ -178,7 +174,6 @@
#
# vboxvideo_drv_14
#
@ -199,7 +203,7 @@
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_
@@ -192,7 +187,6 @@
#
# vboxvideo_drv_15
#
@ -207,7 +211,7 @@
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
@@ -213,7 +207,6 @@
#
# vboxvideo_drv_16
#
@ -215,7 +219,7 @@
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_
@@ -227,7 +220,6 @@
#
# vboxvideo_drv_17
#
@ -223,7 +227,7 @@
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_
@@ -241,7 +233,6 @@
#
# vboxvideo_drv_18
#
@ -231,7 +235,7 @@
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_
@@ -255,7 +246,6 @@
#
# vboxvideo_drv_19
#
@ -239,7 +243,7 @@
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_
@@ -269,7 +259,6 @@
#
# vboxvideo_drv_110
#
@ -247,7 +251,7 @@
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
@@ -283,7 +272,6 @@
#
# vboxvideo_drv_111
#
@ -255,7 +259,7 @@
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
@@ -297,7 +285,6 @@
#
# vboxvideo_drv_112
#
@ -263,7 +267,7 @@
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
@@ -311,7 +298,6 @@
#
# vboxvideo_drv_113
#
@ -271,7 +275,7 @@
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 = \
@@ -321,6 +307,20 @@
vboxvideo_drv_113_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
vboxvideo_drv_113_SOURCES := $(vboxvideo_drv_15_SOURCES)
@ -290,5 +294,5 @@
+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.
#
# vboxvideo_drv_114

2
virtualbox.spec
View file

@ -57,7 +57,7 @@ Patch9: VirtualBox-4.1.8-dont-check-for-mkisofs-or-makeself.patch
# (Debian) build X server drivers only for the selected version
# but we're not using the full patch, only the parts we need (e.g. the section
# about Debian Lenny), so we regenerate the patch
Patch10: VirtualBox-4.2.2-system-xorg.patch
Patch10: VirtualBox-4.2.12-system-xorg.patch
# (Debian) Only display warnings about broken USB support when it's actually
# used (i.e. the machine has USB device filters)
Patch11: VirtualBox-4.1.8-usb-warning-filters.patch