Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10328/devel
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-3.2.10-cpuid.patch
VirtualBox-OSE-3.2.10-noansi.patch
VirtualBox-OSE-3.2.10-xorg17.patch
Removed Files:
VirtualBox-OSE-3.2.0-cpuid.patch
VirtualBox-OSE-3.2.0-noansi.patch
VirtualBox-OSE-3.2.0-xorg17.patch
VirtualBox-OSE-90-vboxdrv.rules.hardening
Log Message:
Update to later release
VirtualBox-OSE-3.2.10-cpuid.patch:
Makefile.kmk | 3 ---
1 file changed, 3 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.10-cpuid.patch ---
From 0d94661041e17d3de686a66d2bca55428fd07f25 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Mon, 17 May 2010 20:34:30 +0200
Subject: [PATCH] Disabling a cpuid testcase
Triggers bug in register allocation for inline asm, disabling a test
case seems to be a better solution than disabling inlining of
ASMCpuId().
Bugzilla reference:
https://bugzilla.redhat.com/show_bug.cgi?id=593064
---
src/VBox/Runtime/testcase/Makefile.kmk | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/src/VBox/Runtime/testcase/Makefile.kmk
b/src/VBox/Runtime/testcase/Makefile.kmk
index 53038d4..09bfdb3 100644
--- a/src/VBox/Runtime/testcase/Makefile.kmk
+++ b/src/VBox/Runtime/testcase/Makefile.kmk
@@ -65,7 +65,6 @@ PROGRAMS += \
tstHandleTable \
tstRTHeapOffset \
tstRTHeapSimple \
- tstInlineAsm \
tstLdr \
tstLdrLoad \
tstRTList \
@@ -122,7 +121,6 @@ PROGRAMS.linux += \
tstRTProcWait \
tstRTProcIsRunningByName \
tstRTBitOperationsPIC3 \
- tstInlineAsmPIC \
tstInlineAsmPIC3
PROGRAMS.solaris += \
tstRTCoreDump
--
1.7.3.1
VirtualBox-OSE-3.2.10-noansi.patch:
Config.kmk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.10-noansi.patch ---
From d9392b26a2ffc8be01c1a1767661f5796d953762 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Wed, 28 Apr 2010 12:11:49 +0200
Subject: [PATCH] Build as c99
On Rawhide as of 01 Sep 2009 x86_64 /usr/include/bits/mathinline.h
contains a non-iso/ansi c inline assembly construct.
---
Config.kmk | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Config.kmk b/Config.kmk
index 47394a4..83c6243 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -3925,7 +3925,7 @@ if1of ($(KBUILD_TARGET), dragonfly freebsd linux netbsd openbsd) #
the gnu ld gu
TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86 = -m elf_i386
TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 = -m elf_x86_64
endif
-TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)
-fno-merge-constants -std=c99 $(VBOX_GCC_fno-stack-protector) -ffreestanding
+TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS)
-fno-merge-constants -std=gnu99 $(VBOX_GCC_fno-stack-protector) -ffreestanding
TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS)
-fno-merge-constants $(VBOX_GCC_fno-stack-protector) -ffreestanding
TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
TEMPLATE_VBOXGUESTR3XF86MOD_LIBS = \
@@ -3941,7 +3941,7 @@ TEMPLATE_VBOXGUESTR3XORGMOD = VBox X.org Guest Module
TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL
TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE)
TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS)
-std=c99
+TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS)
-std=gnu99
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR
VBOX_GUESTR3XORGMOD RTMEM_NO_WRAP_TO_EF_APIS
ifeq ($(KBUILD_TARGET_ARCH),amd64)
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64
--
1.7.3.1
VirtualBox-OSE-3.2.10-xorg17.patch:
vboxmouse/Makefile.kmk | 12 +++++-----
vboxvideo/Makefile.kmk | 55 +++++++++++++++++++++++++++++--------------------
2 files changed, 39 insertions(+), 28 deletions(-)
--- NEW FILE VirtualBox-OSE-3.2.10-xorg17.patch ---
From cf97fe601554d38ef8ea433bdd3ff75079aafdab Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Wed, 28 Apr 2010 12:04:23 +0200
Subject: [PATCH] Build drivers for XOrg 1.7 ABI
And only them.
---
src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 12 +++---
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 54 +++++++++++++++----------
2 files changed, 39 insertions(+), 27 deletions(-)
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
index f8e2666..672bafe 100644
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -59,7 +59,7 @@ endif
#
# vboxmouse_drv_70
#
-DLLS += vboxmouse_drv_70
+#DLLS += vboxmouse_drv_70
vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_70_DEFS = \
XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X
@@ -80,7 +80,7 @@ vboxmouse_drv_70_SOURCES = \
#
# vboxmouse_drv_71
#
-DLLS += vboxmouse_drv_71
+#DLLS += vboxmouse_drv_71
vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
vboxmouse_drv_71_INCS := \
@@ -112,7 +112,7 @@ vboxmouse_drv_13_SOURCES = \
#
# vboxmouse_drv_14
#
-DLLS += 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 := \
@@ -133,7 +133,7 @@ endif
#
# vboxmouse_drv_15
#
-DLLS += 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 := \
@@ -148,7 +148,7 @@ vboxmouse_drv_15_SOURCES = \
#
# vboxmouse_drv_16
#
-DLLS += 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 := \
@@ -223,7 +223,7 @@ vboxmouse_drv_19_SOURCES = \
# 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
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
index bfe0ad9..5b2010e 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -81,7 +81,7 @@ endif # target linux
# base keywords instead of using .solaris or .linux.
# Also it is *important* to use := and not = when deriving a properity.
#
-DLLS += vboxvideo_drv_70
+#DLLS += vboxvideo_drv_70
vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
if1of ($(KBUILD_TARGET), linux)
vboxvideo_drv_70_CFLAGS += \
@@ -102,7 +102,7 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES)
#
# vboxvideo_drv_71
#
-DLLS += 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)
@@ -116,7 +116,7 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES)
#
# vboxvideo_drv_13
#
-DLLS += 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
@@ -139,7 +139,7 @@ vboxvideo_drv_13_SOURCES = \
# This uses the same code (vboxvideo_13.c) as 1.3, but is built
# for 1.4 as well in case there should be any relevant header changes.
#
-DLLS += 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)
@@ -157,7 +157,7 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES)
#
# vboxvideo_drv_15
#
-DLLS += 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 \
@@ -183,7 +183,7 @@ endif
#
# vboxvideo_drv_16
#
-DLLS += 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)
@@ -208,20 +208,32 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxvideo_drv_17_INCS = \
- $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
- $(VBOX_PATH_X11_ROOT)/mesa-7.2/include \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
- $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18
+ /usr/include/drm \
+ /usr/include/X11/dri \
+ /usr/include/pixman-1 \
+ /usr/share/xorg-x11-server-source \
+ /usr/share/xorg-x11-server-source/fb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/common \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ddc \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dri \
+ /usr/share/xorg-x11-server-source/hw/xfree86/i2c \
+ /usr/share/xorg-x11-server-source/hw/xfree86/int10 \
+ /usr/share/xorg-x11-server-source/hw/xfree86/modes \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ramdac \
+ /usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vbe \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vgahw \
+ /usr/share/xorg-x11-server-source/hw/xquartz/xpr \
+ /usr/share/xorg-x11-server-source/include \
+ /usr/share/xorg-x11-server-source/mi \
+ /usr/share/xorg-x11-server-source/miext/damage \
+ /usr/share/xorg-x11-server-source/randr \
+ /usr/share/xorg-x11-server-source/Xext \
+ /usr/share/xorg-x11-server-source/render \
+ /usr/share/xorg-x11-server-source/hw/xfree86/parser
vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES)
@@ -279,7 +291,7 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES)
# 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
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
--
1.7.3.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 8 Aug 2010 14:29:22 -0000 1.24
+++ .cvsignore 12 Nov 2010 12:47:55 -0000 1.25
@@ -1,2 +1,2 @@
UserManual.pdf
-VirtualBox-3.2.8-OSE.tar.bz2
+VirtualBox-3.2.10-OSE.tar.bz2
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- VirtualBox-OSE.spec 8 Aug 2010 14:29:22 -0000 1.62
+++ VirtualBox-OSE.spec 12 Nov 2010 12:47:55 -0000 1.63
@@ -14,7 +14,7 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print
toupper("%{prerel}")}')}
Name: VirtualBox-OSE
-Version: 3.2.8
+Version: 3.2.10
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -32,12 +32,12 @@
Patch1: VirtualBox-OSE-3.2.0-noupdate.patch
Patch2: VirtualBox-OSE-3.2.0-strings.patch
Patch3: VirtualBox-OSE-3.2.4-libcxx.patch
-Patch5: VirtualBox-OSE-3.2.0-xorg17.patch
+Patch5: VirtualBox-OSE-3.2.10-xorg17.patch
Patch9: VirtualBox-OSE-3.2.4-optflags.patch
Patch10: VirtualBox-OSE-3.2.0-32bit.patch
Patch11: VirtualBox-OSE-3.2.0-visibility.patch
-Patch12: VirtualBox-OSE-3.2.0-noansi.patch
-Patch13: VirtualBox-OSE-3.2.0-cpuid.patch
+Patch12: VirtualBox-OSE-3.2.10-noansi.patch
+Patch13: VirtualBox-OSE-3.2.10-cpuid.patch
Patch14: VirtualBox-OSE-3.2.6-vboxkeyboard.patch
Patch15: VirtualBox-OSE-3.2.6-gcc45.patch
@@ -451,6 +451,9 @@
%changelog
+* Fri Nov 12 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.10-1
+- New release
+
* Sun Aug 8 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.8-1
- New release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 8 Aug 2010 14:29:22 -0000 1.24
+++ sources 12 Nov 2010 12:47:55 -0000 1.25
@@ -1,2 +1,2 @@
322feb471c55b81e95e0caecdc93efb0 UserManual.pdf
-84de65bddb365ba61eddd3b112b303e5 VirtualBox-3.2.8-OSE.tar.bz2
+5aad764cd4e886f9d80d7bde42163c7a VirtualBox-3.2.10-OSE.tar.bz2
--- VirtualBox-OSE-3.2.0-cpuid.patch DELETED ---
--- VirtualBox-OSE-3.2.0-noansi.patch DELETED ---
--- VirtualBox-OSE-3.2.0-xorg17.patch DELETED ---
--- VirtualBox-OSE-90-vboxdrv.rules.hardening DELETED ---