Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13384 Modified Files: VirtualBox-4.1.20-libcxx.patch VirtualBox-OSE-4.0.0-32bit.patch VirtualBox-OSE-4.1.4-xorg17.patch VirtualBox.spec Added Files: VirtualBox.modules Log Message: * Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.1.RC3 - New major release, devel release of rpms . - rebase patches VirtualBox-4.1.20-libcxx.patch, VirtualBox-OSE-4.1.4-xorg17.patch and VirtualBox-OSE-4.0.0-32bit.patch --- NEW FILE VirtualBox.modules --- #!/bin/sh # User is advised to run this on upgrades /sbin/modprobe -r -b vboxnetflt &>/dev/null ||: /sbin/modprobe -r -b vboxnetadp &>/dev/null ||: /sbin/modprobe -r -b vboxdrv &>/dev/null ||: # Workaround for https://bugzilla.rpmfusion.org/show_bug.cgi?id=1083 insert_module () { grep -qR "^[ \t]*blacklist[ \t][ \t]*$1[ \t]*" /etc/modprobe.d && return modinfo $1 |awk '/filename:/ {print "insmod "$2}' |$SHELL } insert_module vboxdrv insert_module vboxnetflt insert_module vboxnetadp VirtualBox-4.1.20-libcxx.patch: Config.kmk | 4 ++-- configure | 2 +- src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +--- src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +- src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ src/VBox/HostDrivers/win/Makefile.kmk | 2 +- src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/VBox/Storage/testcase/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- src/libs/zlib-1.2.6/Makefile.kmk | 3 +-- 14 files changed, 20 insertions(+), 23 deletions(-) Index: VirtualBox-4.1.20-libcxx.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.1.20-libcxx.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-4.1.20-libcxx.patch 1 Sep 2012 20:00:37 -0000 1.1 +++ VirtualBox-4.1.20-libcxx.patch 3 Sep 2012 01:28:08 -0000 1.2 @@ -1,13 +1,3 @@ -From: Lubomir Rintel <lkundrak(a)v3.sk&gt; -Date: Fri, 14 May 2010 12:26:33 +0200 -Subject: [PATCH] If anyone finds out why did I remove those I owe him a beer. - -Seems like this patch could be safely left out. -removes -g -pipe ---- - Config.kmk | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel <lkundrak(a)v3.sk&gt; Date: Fri, 18 Jun 2010 10:58:14 +0200 @@ -56,15 +46,6 @@ TEMPLATE_VBoxR3Static_EXTENDS_BY = appending ifeq ($(KBUILD_TARGET),win) TEMPLATE_VBoxR3Static_CFLAGS += $(VBOX_VCC_WERR) -@@ -4055,7 +4055,7 @@ ifdef VBOX_WITH_QTGUI - $(LIB_SDL_INC) - ## @todo Use VBOX_GCC_PEDANTIC_CXX? - TEMPLATE_VBOXQT4GUIEXE_CXXFLAGS = \ -- -g -pipe $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ -+ $(filter-out -Wno-unused,$(VBOX_GCC_WARN)) -frtti -fno-exceptions -Wno-non-virtual-dtor \ - -Wno-long-long -fshort-wchar -fno-strict-aliasing \ - $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden) \ - $(VBOX_GCC_Wno-delete-non-virtual-dtor) diff --git a/configure b/configure index 987cf1b..75d556c 100755 --- a/configure @@ -78,28 +59,23 @@ if [ $WITH_KMODS -eq 1 ]; then check_linux else -diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk -index 52fb6d3..af7ba4b 100644 ---- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk -+++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk -@@ -160,7 +160,7 @@ endif #ifdef VBOX_WITH_WDDM +--- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100 ++++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk 2012-09-02 02:55:41.970453638 +0100 +@@ -195,7 +195,7 @@ endif #ifdef VBOX_WITH_WDDM ifdef VBOXVIDEOWINDBG DLLS += vbvdbg -vbvdbg_TEMPLATE = VBOXR3STATIC +vbvdbg_TEMPLATE = VBOXR3EXE + vbvdbg_SDKS = ReorderCompilerIncs $(VBOX_WINDDK_GST_WLH) vbvdbg_DEFS = UNICODE _UNICODE vbvdbg_SOURCES = \ - wddm/dbg/VBoxVideoWinDbg.cpp \ -diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk -index ee73ed0..e359702 100644 ---- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk -+++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk -@@ -50,10 +50,7 @@ VBoxClient_LIBS = \ - X11 \ - Xrandr \ +--- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk.libcxx 2012-08-03 13:28:42.000000000 +0100 ++++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk 2012-09-02 03:13:43.602348048 +0100 +@@ -49,9 +49,7 @@ VBoxClient_LIBS = \ Xt --# These are static replacements for gcc-specific parts of libstdc++ + # Xtst + # These are static replacements for gcc-specific parts of libstdc++ -VBoxClient_LIBS += \ - supc++ \ - gcc_eh @@ -120,11 +96,9 @@ VBoxOGL2D_USES = qt4 VBoxOGL2D_SDKS = QT4 VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL -diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk -index bf77085..9d67f49 100644 ---- a/src/VBox/HostDrivers/Support/Makefile.kmk -+++ b/src/VBox/HostDrivers/Support/Makefile.kmk -@@ -95,7 +95,7 @@ SUPR3_SOURCES = \ +--- a/src/VBox/HostDrivers/Support/Makefile.kmk.orig 2012-09-02 03:06:50.648190033 +0100 ++++ b/src/VBox/HostDrivers/Support/Makefile.kmk 2012-09-02 03:04:52.703001504 +0100 +@@ -94,7 +94,7 @@ SUPR3_SOURCES = \ # # Static version of SUPR3. # @@ -134,82 +108,77 @@ # diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk -index a40f46d..e29273f 100644 ---- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk -+++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk -@@ -141,7 +141,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +--- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk.libcxx 2012-08-29 15:13:46.000000000 +0100 ++++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk 2012-09-02 02:49:31.198721147 +0100 +@@ -143,7 +143,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # WinNetConfig - static library with host network interface config API # LIBRARIES.win += WinNetConfig - WinNetConfig_TEMPLATE = VBOXR3STATIC + WinNetConfig_TEMPLATE = VBOXR3EXE WinNetConfig_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE - WinNetConfig_SDKS = WINPSDK W2K3DDK + WinNetConfig_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) WinNetConfig_SOURCES = \ -@@ -152,7 +152,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +@@ -154,7 +154,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetFltInstall # PROGRAMS.win += NetFltInstall - NetFltInstall_TEMPLATE = VBOXR3STATIC + NetFltInstall_TEMPLATE = VBOXR3EXE - NetFltInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL + NetFltInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp NetFltInstall_LIBS = \ -@@ -166,7 +166,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +@@ -169,7 +169,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetFltUninstall # PROGRAMS.win += NetFltUninstall - NetFltUninstall_TEMPLATE = VBOXR3STATIC + NetFltUninstall_TEMPLATE = VBOXR3EXE - NetFltUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL + NetFltUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp NetFltUninstall_LIBS = \ -@@ -179,7 +179,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +@@ -183,7 +183,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetAdpInstall # PROGRAMS.win += NetAdpInstall - NetAdpInstall_TEMPLATE = VBOXR3STATIC + NetAdpInstall_TEMPLATE = VBOXR3EXE - NetAdpInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL + NetAdpInstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp NetAdpInstall_LIBS = \ -@@ -193,7 +193,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +@@ -198,7 +198,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # NetAdpUninstall # PROGRAMS.win += NetAdpUninstall - NetAdpUninstall_TEMPLATE = VBOXR3STATIC + NetAdpUninstall_TEMPLATE = VBOXR3EXE - NetAdpUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL + NetAdpUninstall_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp NetAdpUninstall_LIBS = \ -@@ -206,7 +206,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ +@@ -212,7 +212,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNet # VBoxNetFltNobj # DLLS.win += VBoxNetFltNobj - VBoxNetFltNobj_TEMPLATE = VBOXR3STATIC + VBoxNetFltNobj_TEMPLATE = VBOXR3EXE if defined(VBOX_SIGNING_MODE) - VBoxNetFltNobj_NOINST = true - endif -diff --git a/src/VBox/HostDrivers/win/Makefile.kmk b/src/VBox/HostDrivers/win/Makefile.kmk -index 19c15d5..6d2366f 100644 ---- a/src/VBox/HostDrivers/win/Makefile.kmk -+++ b/src/VBox/HostDrivers/win/Makefile.kmk + VBoxNetFltNobj_INSTTYPE = none + VBoxNetFltNobj_DEBUG_INSTTYPE = both +--- a/src/VBox/HostDrivers/win/Makefile.kmk.libcxx 2012-07-18 09:58:10.000000000 +0100 ++++ b/src/VBox/HostDrivers/win/Makefile.kmk 2012-09-02 02:39:16.639533050 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../.. include $(KBUILD_PATH)/subheader.kmk LIBRARIES += VBoxDrvCfg -VBoxDrvCfg_TEMPLATE = VBOXR3STATIC +VBoxDrvCfg_TEMPLATE = VBOXR3EXE - VBoxDrvCfg_SDKS = WINPSDK W2K3DDK + VBoxDrvCfg_SDKS = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBoxDrvCfg_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxDrvCfg_SOURCES = cfg/VBoxDrvCfg.cpp -diff --git a/src/VBox/Installer/win/InstallHelper/Makefile.kmk b/src/VBox/Installer/win/InstallHelper/Makefile.kmk -index 5271e49..aa18e57 100644 ---- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk -+++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk +--- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk.libcxx 2012-08-03 13:28:30.000000000 +0100 ++++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk 2012-09-02 02:59:34.062788499 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. - include $(KBUILD_PATH)/subheader.kmk + include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxInstallHelper -VBoxInstallHelper_TEMPLATE = VBOXR3STATIC @@ -217,12 +186,10 @@ VBoxInstallHelper_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE VBoxInstallHelper_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV) VBoxInstallHelper_DEPS = $(VBOX_SVN_REV_KMK) -diff --git a/src/VBox/Installer/win/Resources/Makefile.kmk b/src/VBox/Installer/win/Resources/Makefile.kmk -index 77ea1b7..5e58fdc 100644 ---- a/src/VBox/Installer/win/Resources/Makefile.kmk -+++ b/src/VBox/Installer/win/Resources/Makefile.kmk +--- a/src/VBox/Installer/win/Resources/Makefile.kmk.libcxx 2012-05-30 11:38:23.000000000 +0100 ++++ b/src/VBox/Installer/win/Resources/Makefile.kmk 2012-09-02 02:57:56.559807746 +0100 @@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../.. - include $(KBUILD_PATH)/subheader.kmk + include $(KBUILD_PATH)/subheader.kmk DLLS += VBoxRes -VBoxRes_TEMPLATE = VBOXR3STATIC @@ -284,4 +251,3 @@ -- 1.7.1 - VirtualBox-OSE-4.0.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(-) Index: VirtualBox-OSE-4.0.0-32bit.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-OSE-4.0.0-32bit.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-OSE-4.0.0-32bit.patch 3 Feb 2011 23:25:21 -0000 1.1 +++ VirtualBox-OSE-4.0.0-32bit.patch 3 Sep 2012 01:28:08 -0000 1.2 @@ -67,26 +67,24 @@ tstDeviceStructSize_TEMPLATE = VBOXR3AUTOTST tstDeviceStructSize_DEFS = $(VBOX_DEVICES_TESTS_FEATURES) tstDeviceStructSize_INCS = \ -diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk -index f947789..95882f1 100644 ---- a/src/VBox/VMM/testcase/Makefile.kmk -+++ b/src/VBox/VMM/testcase/Makefile.kmk -@@ -21,10 +21,14 @@ include $(KBUILD_PATH)/subheader.kmk +--- 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 -+endif - ifdef VBOX_WITH_RAW_MODE -+ifneq ($(KBUILD_HOST_ARCH),amd64) - PROGRAMS += tstVMStructRC tstAsmStructsRC ++ PROGRAMS += tstVMStructSize tstAsmStructs ++ ifdef VBOX_WITH_RAW_MODE ++ PROGRAMS += tstVMStructRC tstAsmStructsRC ++ endif endif -+endif - ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS - PROGRAMS += tstGlobalConfig tstInstrEmul - ifdef VBOX_WITH_RAW_MODE -@@ -67,16 +71,21 @@ BLDDIRS += $(VBOX_VMM_TESTCASE_OUT_DIR) + 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)),) @@ -108,6 +106,3 @@ ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS TESTING += \ $(VBOX_VMM_TESTCASE_OUT_DIR)/tstInstrEmul.run --- -1.7.3.4 - VirtualBox-OSE-4.1.4-xorg17.patch: b/src/VBox/Additions/common/crOpenGL/Makefile.kmk | 14 ++--- b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 15 +++++- b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 40 +++++++++++++++++ src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk | 4 - 4 files changed, 60 insertions(+), 13 deletions(-) Index: VirtualBox-OSE-4.1.4-xorg17.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-OSE-4.1.4-xorg17.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VirtualBox-OSE-4.1.4-xorg17.patch 15 Jan 2012 00:33:09 -0000 1.2 +++ VirtualBox-OSE-4.1.4-xorg17.patch 3 Sep 2012 01:28:08 -0000 1.3 @@ -27,61 +27,42 @@ VBoxOGL_DEFS += VBOX_NO_NATIVEGL endif -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 -@@ -53,9 +53,18 @@ - mouse.c \ - pnp.c \ - VBoxUtils_68.c +--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100 ++++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-02 23:44:33.878251237 +0100 +@@ -57,9 +57,18 @@ if1of ($(KBUILD_TARGET), linux) + vboxmouse_drv_POST_CMDS = \ + objcopy --keep-global-symbol vboxmouseModuleData $(out) $(out)-objcopy$$(NLTAB) \ + $(MV) -f $(out)-objcopy $(out) -endif - +DLLS += vboxmouse_drv_17 +vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD +vboxmouse_drv_17_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \ -+ NO_ANSIC ++ DONT_DEFINE_WRAPPERS NO_ANSIC +vboxmouse_drv_17_INCS := \ + /usr/include/x11 \ + /usr/include/xorg \ + /usr/include/pixman-1 -+vboxmouse_drv_17 = \ -+ vboxmouse_15.c ++vboxmouse_drv_17_SOURCES = \ ++ vboxmouse.c +else # # vboxmouse_drv_70 # -@@ -154,7 +166,6 @@ - vboxmouse_15.c +@@ -391,5 +398,7 @@ endif # neq ($(KBUILD_TARGET),linux) + # endif # ! VBOX_ONLY_ADDITIONS + endif # VBOX_WITH_TESTCASES - --ifneq ($(KBUILD_TARGET), linux) - - # - # vboxmouse_drv_17 -@@ -256,6 +267,8 @@ - $(QUIET)$(APPEND) -t "$@" "done" - endif - -+ifneq ($(KBUILD_TARGET), linux) ++endif # neq ($(KBUILD_TARGET),linux) + - TESTING += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run - OTHERS += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run - $$(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run: $$(vboxmouse_drv_70_1_STAGE_TARGET) -@@ -304,8 +317,6 @@ - $(vboxmouse_drv_16_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined_15 - $(QUIET)$(APPEND) -t "$@" "done" + include $(FILE_KBUILD_SUB_FOOTER) --ifneq ($(KBUILD_TARGET), linux) -- - TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run - OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run - $$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(vboxmouse_drv_17_1_STAGE_TARGET) ---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2011-12-19 12:58:57.000000000 +0000 -+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-01-12 03:47:06.381765975 +0000 -@@ -88,6 +88,42 @@ vboxvideo_drv_SOURCES = \ - $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapsimple.cpp \ - $(PATH_ROOT)/src/VBox/Runtime/common/alloc/heapoffset.cpp +--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17 2012-05-30 11:39:29.000000000 +0100 ++++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2012-09-03 00:00:13.988618277 +0100 +@@ -94,6 +94,44 @@ vboxvideo_drv_SOURCES = \ + objcopy --keep-global-symbol vboxvideoModuleData $(out) $(out)-objcopy$$(NLTAB) \ + $(MV) -f $(out)-objcopy $(out) +DLLS += vboxvideo_drv_17 +vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD @@ -118,18 +99,19 @@ +vboxvideo_drv_17_INCS += $(PATH_ROOT)/src/VBox/Runtime/include +vboxvideo_drv_17_SOURCES = $(vboxvideo_drv_SOURCES) edid.c vboxvideo_dri.c + -+ifdef NOT_FEDORA_VBOX_WITH_TESTCASES - ++ifdef NOT_FEDORA ++ ++ # # vboxvideo_drv_70 -@@ -354,7 +390,6 @@ vboxvideo_drv_111_SOURCES := $(vboxvideo + # +@@ -505,4 +543,6 @@ $$(vboxvideo_drv_112_0_OUTDIR)/tstvboxvi + # endif # ! VBOX_ONLY_ADDITIONS + endif # VBOX_WITH_TESTCASES - # 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 - # ifndef VBOX_ONLY_ADDITIONS - if1of ($(KBUILD_TARGET),linux solaris) - ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH)) ++endif # NOT_FEDORA ++ + include $(FILE_KBUILD_SUB_FOOTER) --- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 19:57:53.762613198 +0000 +++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk 2012-01-12 20:01:17.296596446 +0000 @@ -36,11 +36,11 @@ endif # !VBOX_ONLY_SDK Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- VirtualBox.spec 1 Sep 2012 20:00:39 -0000 1.15 +++ VirtualBox.spec 3 Sep 2012 01:28:08 -0000 1.16 @@ -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 beta3 +%global prerel RC3 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} Name: VirtualBox -Version: 4.1.20 -Release: 1%{?prerel:.%{prerel}}%{?dist} +Version: 4.2.0 +Release: 0.1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -37,12 +37,13 @@ Patch10: VirtualBox-OSE-4.0.0-32bit.patch #Patch11: VirtualBox-OSE-3.2.0-visibility.patch Patch15: VirtualBox-OSE-4.0.0-makeself.patch -Patch16: VirtualBox-OSE-4.1.2-usblib.patch +#Patch16: VirtualBox-OSE-4.1.2-usblib.patch Patch17: VirtualBox-OSE-4.0.0-beramono.patch Patch18: VirtualBox-OSE-4.0.2-aiobug.patch Patch20: VirtualBox-OSE-4.1.2-testmangle.patch Patch22: VirtualBox-OSE-4.1.12-gsoap.patch Patch23: VirtualBox-OSE-4.1.10-mesa.patch +#Patch24: VirtualBox-4.1.20-x113.patch %if 0%{?fedora} < 17 BuildRequires: kBuild >= 0.1.98 @@ -170,7 +171,7 @@ %prep -%setup -q +%setup -qn %{name}-%{version}%{prereltag} find -name '*.py[co]' -delete %patch1 -p1 -b .noupdates @@ -180,7 +181,7 @@ %patch10 -p1 -b .32bit #%patch11 -p1 -b .visibility %patch15 -p1 -b .makeself -%patch16 -p1 -b .usblib +#%patch16 -p1 -b .usblib %patch17 -p1 -b .beramono %patch18 -p1 -b .aiobug %patch20 -p1 -b .testmangle @@ -190,6 +191,9 @@ %if 0%{?fedora} > 16 %patch23 -p1 -b .mesa %endif +#%if 0%{?fedora} > 17 +#%patch24 -p1 -b .x113 +#%endif # Remove prebuilt binary tools %if 0%{?fedora} < 17 @@ -202,7 +206,8 @@ %build -./configure --disable-kmods --enable-webservice +./configure --disable-kmods --enable-webservice +#--disable-java . ./env.sh # VirtualBox build system installs and builds in the same step, @@ -550,6 +555,11 @@ %changelog +* Mon Sep 03 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.2.0-0.1.RC3 +- New major release, devel release of rpms . +- rebase patches VirtualBox-4.1.20-libcxx.patch, VirtualBox-OSE-4.1.4-xorg17.patch + and VirtualBox-OSE-4.0.0-32bit.patch + * Sat Sep 01 2012 Sérgio Basto <sergio(a)serjux.com&gt; - 4.1.20-1 - New upstream release. - Redo VirtualBox-4.1.20-libcxx.patch