rpms/VirtualBox/F-18 VirtualBox-4.2.0-32bit.patch, NONE, 1.1 .cvsignore, 1.38, 1.39 VirtualBox-4.2.0-xorg17.patch, 1.1, 1.2 VirtualBox.spec, 1.16, 1.17 sources, 1.38, 1.39 VirtualBox-OSE-4.0.0-32bit.patch, 1.2, NONE
Sérgio M. Basto
sergiomb at rpmfusion.org
Sun Sep 9 03:25:00 CEST 2012
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9102
Modified Files:
.cvsignore VirtualBox-4.2.0-xorg17.patch VirtualBox.spec
sources
Added Files:
VirtualBox-4.2.0-32bit.patch
Removed Files:
VirtualBox-OSE-4.0.0-32bit.patch
Log Message:
* Sun Sep 09 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-0.6.RC4
- Update to RC4.
- Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch
- Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 !
- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp.
- Removes X11 includes from sources (src/VBox/Additions/x11/x11include).
VirtualBox-4.2.0-32bit.patch:
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 13 ++++++++++---
3 files changed, 19 insertions(+), 4 deletions(-)
--- NEW FILE VirtualBox-4.2.0-32bit.patch ---
>From a9548501755beeec6fa11b0c261f167164a4ee70 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak at v3.sk>
Date: Fri, 26 Mar 2010 04:44:55 +0100
Subject: [PATCH] Build on x86_64 without 32bit toolchain.
This disables the check for 32bit toolchain and tests that need it
(boo).
---
configure | 2 +-
src/VBox/Devices/testcase/Makefile.kmk | 8 ++++++++
src/VBox/VMM/testcase/Makefile.kmk | 9 +++++++++
3 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 42ce775..0932637 100755
--- a/configure
+++ b/configure
@@ -2525,7 +2525,7 @@ if [ "$OS" = "linux" ]; then
fi
check_libcap
check_compiler_h
- [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
+ #[ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit
# tools/common/makeself*
#[ $OSE -ge 1 ] && check_makeself
fi
diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk
index 4debf81..59dae0d 100644
--- a/src/VBox/Devices/testcase/Makefile.kmk
+++ b/src/VBox/Devices/testcase/Makefile.kmk
@@ -45,22 +45,28 @@ VBOX_DEVICES_TESTS_FEATURES = \
# We setup one 'other' target for executing the structure & alignment
# validation testcases. Perhaps a bit hackish, but extremely useful.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
OTHERS += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
endif
endif
+endif
# The normal testing pass.
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_DEVICES_TEST_OUT_DIR)/tstDeviceStructSize.run
+endif
ifdef VBOX_WITH_RAW_MODE
#
# The testcase generator.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSizeRC
+endif
tstDeviceStructSizeRC_TEMPLATE = VBoxRcExe
tstDeviceStructSizeRC_DEFS = $(VBOX_DEVICES_TESTS_FEATURES)
tstDeviceStructSizeRC_SOURCES = tstDeviceStructSizeRC.cpp
@@ -73,7 +79,9 @@ endif # VBOX_WITH_RAW_MODE
#
# The testcase it self.
#
+ifneq ($(KBUILD_HOST_ARCH),amd64)
PROGRAMS += tstDeviceStructSize
+endif
tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST
tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES)
tstDeviceStructSize_INCS = \
--- a/src/VBox/VMM/testcase/Makefile.kmk.32bit 2012-07-18 09:58:08.000000000 +0100
+++ b/src/VBox/VMM/testcase/Makefile.kmk 2012-09-02 04:04:34.551296386 +0100
@@ -21,9 +21,11 @@ include $(KBUILD_PATH)/subheader.kmk
#
# Target lists.
#
-PROGRAMS += tstVMStructSize tstAsmStructs
-ifdef VBOX_WITH_RAW_MODE
- PROGRAMS += tstVMStructRC tstAsmStructsRC
+ifneq ($(KBUILD_HOST_ARCH),amd64)
+ PROGRAMS += tstVMStructSize tstAsmStructs
+ ifdef VBOX_WITH_RAW_MODE
+ PROGRAMS += tstVMStructRC tstAsmStructsRC
+ endif
endif
if !defined(VBOX_ONLY_EXTPACKS) \
&& ( defined(VBOX_WITH_DTRACE_R3) \
@@ -77,16 +79,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR)
#
ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
ifeq ($(filter-out x86.x86 amd64.amd64 x86.amd64, $(KBUILD_TARGET_ARCH).$(KBUILD_HOST_ARCH)),)
+ ifneq ($(KBUILD_HOST_ARCH),amd64)
OTHERS += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+ endif
endif
endif
# The normal testing pass.
+
+ifneq ($(KBUILD_HOST_ARCH),amd64)
TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstAsmStructs.run \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstVMStructSize.run
+endif
ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
TESTING += \
$(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore 8 Sep 2012 02:08:19 -0000 1.38
+++ .cvsignore 9 Sep 2012 01:25:00 -0000 1.39
@@ -1 +1 @@
-VirtualBox-4.2.0_RC3.tar.bz2
+VirtualBox-4.2.0_RC4.tar.bz2
VirtualBox-4.2.0-xorg17.patch:
./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk | 8
./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp | 53 ++++
./src/VBox/Additions/x11/vboxmouse/vboxmouse.c | 8
VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 40 +--
VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 108 ++++++----
b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 -
src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4
7 files changed, 146 insertions(+), 89 deletions(-)
Index: VirtualBox-4.2.0-xorg17.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox-4.2.0-xorg17.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-4.2.0-xorg17.patch 8 Sep 2012 02:08:19 -0000 1.1
+++ VirtualBox-4.2.0-xorg17.patch 9 Sep 2012 01:25:00 -0000 1.2
@@ -43,25 +43,25 @@
# generate rules.
---- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/vboxmouse.c.xorg17 2012-09-07 02:38:56.473777159 +0100
-+++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/vboxmouse.c 2012-09-07 02:39:11.025882086 +0100
-@@ -52,13 +52,9 @@
+--- ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c.xorg17 2012-03-13 14:52:26.000000000 +0000
++++ ./src/VBox/Additions/x11/vboxmouse/vboxmouse.c 2012-09-09 01:12:19.440114469 +0100
+@@ -54,12 +54,12 @@
- #include <xf86Module.h>
-
--#ifdef VBOX_GUESTR3XF86MOD
--# define _X_EXPORT
+ #ifdef VBOX_GUESTR3XF86MOD
+ # define _X_EXPORT
-#else
-# include <errno.h>
-# include <fcntl.h>
-# include <unistd.h>
--#endif
+ #endif
+
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
-
++
#include "product-generated.h"
+ static void
--- VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
+++ VirtualBox-4.2.0_RC3/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-07 03:18:17.460463185 +0100
@@ -30,25 +30,12 @@ if1of ($(KBUILD_TARGET), linux)
@@ -262,3 +262,125 @@
+endif # NOT_FEDORA
+
include $(FILE_KBUILD_SUB_FOOTER)
+--- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
++++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2012-09-09 01:05:45.271905105 +0100
+@@ -187,11 +187,9 @@ VBoxGuestR3LibXFree86_SOURCES = \
+ VBoxGuestR3LibVideo.cpp \
+ VBoxGuestR3LibRuntimeXF86.cpp
+ VBoxGuestR3LibXFree86_INCS = \
+- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/common/ \
+- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/hw/xfree86/os-support \
+- $(VBOX_PATH_X11_XFREE_4_3)/programs/Xserver/include \
+- $(VBOX_PATH_X11_XFREE_4_3)/include \
+- $(VBOX_PATH_X11_XFREE_4_3)/exports/include/X11
++ /usr/share/xorg-x11-server-source/hw/xfree86/common/ \
++ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
++ /usr/share/xorg-x11-server-source/include
+
+ VBoxGuestR3LibRuntimeXF86.cpp_CXXFLAGS = -Wno-shadow
+
+# inspired from http://opensource.apple.com/source/X11server/X11server-85/kdrive/xorg-server-1.6.0/hw/xfree86/dummylib/
+#xalloc.c and verrorf.c
+--- ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp.xorg17 2011-01-14 20:15:34.000000000 +0000
++++ ./src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibRuntimeXF86.cpp 2012-09-09 01:04:03.198818717 +0100
+@@ -34,20 +34,55 @@
+ #include <iprt/log.h>
+ #include <iprt/mem.h>
+ #include <iprt/string.h>
++#include <string.h>
++#include <fcntl.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <math.h>
++#include <ctype.h>
+ extern "C" {
+ # define XFree86LOADER
+-# include <xf86_ansic.h>
+ # include <errno.h>
+ # undef size_t
+ }
+
++/** Provide an VErrorF function when used stand-alone. */
++void VErrorF(const char *format, va_list args)
++{
++ vfprintf(stderr, format, args); /* RATS: We assume the format string
++ * is trusted, since it is always
++ * from a log message in our code. */
++}
++
++/* When using this file as part of a stand-alone (i.e., non-X-Server
++ * program, then the ultimate output routines have to be defined. */
++
++/** Provide an ErrorF function when used stand-alone. */
++void ErrorF(const char *format, ...)
++{
++ va_list args;
++
++ va_start(args, format);
++ vfprintf(stderr, format, args); /* RATS: We assume the format string
++ * is trusted, since it is always
++ * from a log message in our code. */
++ va_end(args);
++}
++
++void *xalloc(unsigned long n)
++{
++ if (!n)
++ n = 1;
++ return malloc(n);
++}
++
+ /* This is risky as it restricts call to the ANSI format type specifiers. */
+ RTDECL(size_t) RTStrPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...)
+ {
+ va_list args;
+ int cbRet;
+ va_start(args, pszFormat);
+- cbRet = xf86vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
++ cbRet = vsnprintf(pszBuffer, cchBuffer, pszFormat, args);
+ va_end(args);
+ return cbRet >= 0 ? cbRet : 0;
+ }
+@@ -55,8 +90,8 @@ RTDECL(size_t) RTStrPrintf(char *pszBuff
+ RTDECL(int) RTStrToUInt32Ex(const char *pszValue, char **ppszNext, unsigned uBase, uint32_t *pu32)
+ {
+ char *pszNext = NULL;
+- xf86errno = 0;
+- unsigned long ul = xf86strtoul(pszValue, &pszNext, uBase);
++ errno = 0;
++ unsigned long ul = strtoul(pszValue, &pszNext, uBase);
+ if (ppszNext)
+ *ppszNext = pszNext;
+ if (RT_UNLIKELY(pszValue == pszNext))
+@@ -65,11 +100,11 @@ RTDECL(int) RTStrToUInt32Ex(const char *
+ ul = UINT32_MAX;
+ if (pu32)
+ *pu32 = (uint32_t) ul;
+- if (RT_UNLIKELY(xf86errno == EINVAL))
++ if (RT_UNLIKELY(errno == EINVAL))
+ return VERR_INVALID_PARAMETER;
+- if (RT_UNLIKELY(xf86errno == ERANGE))
++ if (RT_UNLIKELY(errno == ERANGE))
+ return VWRN_NUMBER_TOO_BIG;
+- if (RT_UNLIKELY(xf86errno))
++ if (RT_UNLIKELY(errno))
+ /* RTErrConvertFromErrno() is not available */
+ return VERR_UNRESOLVED_ERROR;
+ if (RT_UNLIKELY(*pszValue == '-'))
+@@ -77,7 +112,7 @@ RTDECL(int) RTStrToUInt32Ex(const char *
+ if (RT_UNLIKELY(*pszNext))
+ {
+ while (*pszNext)
+- if (!xf86isspace(*pszNext))
++ if (!isspace(*pszNext))
+ return VWRN_TRAILING_CHARS;
+ return VWRN_TRAILING_SPACES;
+ }
+@@ -135,6 +170,6 @@ RTDECL(void *) RTMemTmpAllocTag(size_t
+
+ RTDECL(void) RTMemTmpFree(void *pv)
+ {
+- xfree(pv);
++ free(pv);
+ }
+
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/VirtualBox.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- VirtualBox.spec 8 Sep 2012 02:08:19 -0000 1.16
+++ VirtualBox.spec 9 Sep 2012 01:25:00 -0000 1.17
@@ -10,12 +10,12 @@
# major version number, while the kernel module abi is not guarranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
-%global prerel RC3
+%global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox
Version: 4.2.0
-Release: 0.5%{?prerel:.%{prerel}}%{?dist}
+Release: 0.6%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -35,7 +35,7 @@
Patch3: VirtualBox-4.2.0-libcxx.patch
Patch5: VirtualBox-4.2.0-xorg17.patch
%ifarch x86_64
-Patch10: VirtualBox-OSE-4.0.0-32bit.patch
+Patch10: VirtualBox-4.2.0-32bit.patch
%endif
Patch15: VirtualBox-OSE-4.0.0-makeself.patch
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
@@ -192,16 +192,16 @@
%if 0%{?fedora} > 16
%patch23 -p1 -b .mesa
%endif
-%if 0%{?fedora} > 17
-%patch24 -p1 -b .x113
-%endif
+#if 0%{?fedora} > 17
+#patch24 -p1 -b .x113
+#endif
# Remove prebuilt binary tools
%if 0%{?fedora} < 16
rm -rf kBuild
%endif
rm -rf tools
-#rm -rf src/VBox/Additions/x11/x11include
+rm -rf src/VBox/Additions/x11/x11include
# CRLF->LF
sed -i 's/\r//' COPYING
@@ -557,6 +557,13 @@
%changelog
+* Sun Sep 09 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-0.6.RC4
+- Update to RC4.
+- Rename 32-bits patch to VirtualBox-4.2.0-32bit.patch
+- Drop patch23 to fix ABI/API breakages in X11 1.13, appears fixed in RC4 !
+- Compile VBoxGuestLib with X11 sources from system and fix VBoxGuestR3LibRuntimeXF86.cpp.
+- Removes X11 includes from sources (src/VBox/Additions/x11/x11include).
+
* Fri Sep 07 2012 Sérgio Basto <sergio at serjux.com> - 4.2.0-0.5.RC3
- not drop 32-bit patch, on x86_64 as quick resolution of not have glic-devel.i686 on x86_64.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-18/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 8 Sep 2012 02:08:19 -0000 1.38
+++ sources 9 Sep 2012 01:25:00 -0000 1.39
@@ -1 +1 @@
-cc019414a29aa021d82952d763541a2c VirtualBox-4.2.0_RC3.tar.bz2
+697790b7d150569e6e3cc869242ddfe3 VirtualBox-4.2.0_RC4.tar.bz2
--- VirtualBox-OSE-4.0.0-32bit.patch DELETED ---
More information about the rpmfusion-commits
mailing list