Author: lkundrak Update of /cvs/free/rpms/VirtualBox-OSE/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv8093/devel Modified Files: .cvsignore VirtualBox-OSE.spec sources Added Files: VirtualBox-OSE-4.0.2-aiobug.patch VirtualBox-OSE-4.0.2-libcxx.patch VirtualBox-OSE-4.0.2-strings.patch VirtualBox-OSE-4.0.2-xorg17.patch Removed Files: VirtualBox-OSE-4.0.0-aiobug.patch VirtualBox-OSE-4.0.0-libcxx.patch VirtualBox-OSE-4.0.0-strings.patch VirtualBox-OSE-4.0.0-xorg17.patch Log Message: Import 4.0.2 VirtualBox-OSE-4.0.2-aiobug.patch: ConsoleImpl2.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- NEW FILE VirtualBox-OSE-4.0.2-aiobug.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk&gt; Date: Thu, 3 Feb 2011 23:31:01 +0100 Subject: [PATCH] Disable the aio bug detection --- src/VBox/Main/src-client/ConsoleImpl2.cpp | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-client/ConsoleImpl2.cpp index cfa0bd4..ef4aca4 100644 --- a/src/VBox/Main/src-client/ConsoleImpl2.cpp +++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp @@ -2870,6 +2870,8 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, mfSnapshotFolderSizeWarningShown = true; } +// In el6 we have a backported patch to address this +#if 0 #ifdef RT_OS_LINUX /* * Ext4 bug: Check if the host I/O cache is disabled and the disk image is located @@ -2925,6 +2927,7 @@ int Console::configMediumAttachment(PCFGMNODE pCtlInst, } } #endif +#endif } } -- 1.7.3.4 VirtualBox-OSE-4.0.2-libcxx.patch: Config.kmk | 2 - configure | 2 - src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 33 +++++++++++-------------- src/VBox/Storage/testcase/Makefile.kmk | 3 -- 4 files changed, 18 insertions(+), 22 deletions(-) --- NEW FILE VirtualBox-OSE-4.0.2-libcxx.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk&gt; Date: Fri, 18 Jun 2010 10:58:14 +0200 Subject: [PATCH] Do not include statically linked libstdc++ Not a good idea if we don't need to be binary-compatible across exotic distribution. Doesn't work with trunk glibc heading towards 2.11 anyways. Static linking is not really supported anyways. --- src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 33 +++++++++++------------- src/VBox/Storage/testcase/Makefile.kmk | 2 +- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk index dd764a4..ddcd494 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 \ Xt -# These are static replacements for gcc-specific parts of libstdc++ -VBoxClient_LIBS += \ - supc++ \ - gcc_eh +VBoxClient_LIBS += stdc++ ifdef VBOX_X11_SEAMLESS_GUEST VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE VBoxClient_SOURCES += \ @@ -69,20 +66,20 @@ endif ifdef VBOX_WITH_GUEST_PROPS VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS endif -# -# Link against libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/). -# (It would've been preferred to avoid features depending on libstdc++, of course...) -# -# Actually, this is darn annoying and will *NOT* be tolerated for any new code! -# -VBoxClient_LIBPATH += $(VBoxClient_0_OUTDIR) -VBoxClient_ORDERDEPS = $(VBoxClient_0_OUTDIR)/libstdc++.a -VBoxClient_CLEAN = $(VBoxClient_0_OUTDIR)/libstdc++.a -$$(VBoxClient_0_OUTDIR)/libstdc++.a: - $(call MSG_L1,Forcing static libstdc++) - $(QUIET)$(MKDIR) -p $(@D) - $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \ - || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ +## +## Link against libstdc++.a. (http://www.trilithium.com/johan/2005/06/static-libstdc/). +## (It would've been preferred to avoid features depending on libstdc++, of course...) +## +## Actually, this is darn annoying and will *NOT* be tolerated for any new code! +## +#VBoxClient_LIBPATH += $(VBoxClient_0_OUTDIR) +#VBoxClient_ORDERDEPS = $(VBoxClient_0_OUTDIR)/libstdc++.a +#VBoxClient_CLEAN = $(VBoxClient_0_OUTDIR)/libstdc++.a +#$$(VBoxClient_0_OUTDIR)/libstdc++.a: +# $(call MSG_L1,Forcing static libstdc++) +# $(QUIET)$(MKDIR) -p $(@D) +# $(QUIET)$(LN_EXT) -sf `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ \ +# || $(CP_EXT) -f `$(TOOL_$(VBOX_GCC_TOOL)_CXX) $(TEMPLATE_VBOXGUESTR3CPPEXE_CXXFLAGS.$(KBUILD_TARGET_ARCH)) -print-file-name=libstdc++.a` $@ ifdef VBOX_X11_SEAMLESS_GUEST if defined(VBOX_WITH_TESTCASES) && !defined(VBOX_ONLY_ADDITIONS) && !defined(VBOX_ONLY_SDK) diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk index 77075d9..b996e3d 100644 --- a/src/VBox/Storage/testcase/Makefile.kmk +++ b/src/VBox/Storage/testcase/Makefile.kmk @@ -40,7 +40,7 @@ ifdef VBOX_WITH_TESTCASES tstVDSnap_TEMPLATE = VBOXR3TSTEXE tstVDShareable_TEMPLATE = VBOXR3TSTEXE tstVDIo_TEMPLATE = VBOXR3TSTEXE - vbox-img_TEMPLATE = VBOXR3STATIC + vbox-img_TEMPLATE = VBOXR3EXE tstVD_LIBS = $(LIB_DDU) $(LIB_RUNTIME) tstVD-2_LIBS = $(LIB_DDU) $(LIB_RUNTIME) tstVDCopy_LIBS = $(LIB_DDU) $(LIB_RUNTIME) -- 1.7.3.4 diff --git a/Config.kmk b/Config.kmk index 1d5174f..c377dbd 100644 --- a/Config.kmk +++ b/Config.kmk @@ -2986,7 +2986,7 @@ TEMPLATE_VBOXR3EXE_LIBS = pthread m rt dl TEMPLATE_VBOXR3EXE_LIBS = \ $(L4_LIBDIR)/libvboxserver.s.so \ $(L4_LIBDIR)/libuc++.0.s.so \ - supc++ gcc_eh gcc \ + stdc++ \ $(L4_LIBDIR)/libdl.s.so \ $(L4_LIBDIR)/libuc.0.s.so else ifeq ($(KBUILD_TARGET),os2) diff --git a/configure b/configure index 87e6a29..d365e48 100755 --- a/configure +++ b/configure @@ -2507,7 +2507,7 @@ fi if [ "$OS" = "linux" ]; then # don't check for the static libstdc++ in the PUEL version as we build the # additions at a dedicated box - [ $OSE -ge 1 ] && check_staticlibstdcxx + #[ $OSE -ge 1 ] && check_staticlibstdcxx if [ $WITH_KMODS -eq 1 ]; then check_linux else VirtualBox-OSE-4.0.2-strings.patch: Frontends/VirtualBox/src/main.cpp | 20 ++++++++++---------- Installer/linux/VBox.sh | 11 ++++++----- VMM/VMMR3/VM.cpp | 9 ++++----- 3 files changed, 20 insertions(+), 20 deletions(-) --- NEW FILE VirtualBox-OSE-4.0.2-strings.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk&gt; Date: Mon, 10 May 2010 12:08:47 -0400 Subject: [PATCH] Replace some strings With ones that (sometimes) make more sense. --- src/VBox/Frontends/VirtualBox/src/main.cpp | 20 ++++++++++---------- src/VBox/Installer/linux/VBox.sh | 11 ++++++----- src/VBox/VMM/VMMR3/VM.cpp | 8 ++++---- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/VBox/Frontends/VirtualBox/src/main.cpp b/src/VBox/Frontends/VirtualBox/src/main.cpp index 9ec09e1..fc1ebe9 100644 --- a/src/VBox/Frontends/VirtualBox/src/main.cpp +++ b/src/VBox/Frontends/VirtualBox/src/main.cpp @@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QApplication::tr( ); QString g_QStrHintLinuxNoDriver = QApplication::tr( - "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " - "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " - "module by executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" - "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " - "package first. This package keeps track of Linux kernel changes and " - "recompiles the vboxdrv kernel module if necessary." + "The VirtualBox Linux kernel driver (vboxdrv) is probably not " + "loaded.<br/><br/>" + "If you installed or VirtualBox OSE package recently you need to restart " + "the computer for the driver to load.<br/><br/>" + "Alternatively, you may attempt to load the driver by issuing the " + "following command with system administrator (root) privileges:<br/><br/>" + " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>" ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( @@ -92,7 +92,7 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( "The VirtualBox kernel modules do not match this version of " "VirtualBox. The installation of VirtualBox was apparently not " "successful. Executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" + " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>" "may correct this. Make sure that you do not mix the " "OSE version and the PUEL version of VirtualBox." ); @@ -101,9 +101,9 @@ QString g_QStrHintOtherNoDriver = QApplication::tr( "Make sure the kernel module has been loaded successfully." ); -/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */ +/* We're going to try to give a helping hand */ QString g_QStrHintReinstall = QApplication::tr( - "Please try reinstalling VirtualBox." + "Please report the problem to the RPM Fusion Bugzilla." ); #if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX) diff --git a/src/VBox/Installer/linux/VBox.sh b/src/VBox/Installer/linux/VBox.sh index 9319696..0e782e0 100644 --- a/src/VBox/Installer/linux/VBox.sh +++ b/src/VBox/Installer/linux/VBox.sh @@ -32,19 +32,20 @@ elif ! lsmod|grep -q vboxdrv; then cat << EOF WARNING: The vboxdrv kernel module is not loaded. Either there is no module available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by + load. Reboot the computer, or insert the kernel module by executing - sudo /etc/init.d/vboxdrv setup + '/etc/sysconfig/modules/VirtualBox-OSE.modules' (as root) You will not be able to start VMs until this problem is fixed. EOF elif [ ! -c /dev/vboxdrv ]; then cat << EOF -WARNING: The character device /dev/vboxdrv does not exist. Try +WARNING: The character device /dev/vboxdrv does not exist. Try running - sudo /etc/init.d/vboxdrv restart + '/sbin/udevtrigger' (as root) - and if that is not successful, try to re-install the package. + and if that is not successful, then you're in situation that + can not possibly happen and there's nothing you can do about it. You will not be able to start VMs until this problem is fixed. EOF diff --git a/src/VBox/VMM/VMMR3/VM.cpp b/src/VBox/VMM/VMMR3/VM.cpp index d9e1bc1..c24f8dd 100644 --- a/src/VBox/VMM/VMMR3/VM.cpp +++ b/src/VBox/VMM/VMMR3/VM.cpp @@ -363,8 +363,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods, #ifdef RT_OS_LINUX pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module " "was either not loaded or /dev/vboxdrv is not set up properly. " - "Re-setup the kernel module by executing " - "'/etc/init.d/vboxdrv setup' as root"); + "Reboot the computer, or insert the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root"); #else pszError = N_("VirtualBox kernel driver not loaded"); #endif @@ -405,8 +405,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCpus, PCVMM2USERMETHODS pVmm2UserMethods, #ifdef RT_OS_LINUX pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module " "was either not loaded or /dev/vboxdrv was not created for some " - "reason. Re-setup the kernel module by executing " - "'/etc/init.d/vboxdrv setup' as root"); + "reason. Insert the kernel module by executing " + "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root"); #else pszError = N_("VirtualBox kernel driver not installed"); #endif -- 1.7.3.4 VirtualBox-OSE-4.0.2-xorg17.patch: vboxmouse/Makefile.kmk | 18 +++++++------- vboxvideo/Makefile.kmk | 59 +++++++++++++++++++++++++++++-------------------- 2 files changed, 44 insertions(+), 33 deletions(-) --- NEW FILE VirtualBox-OSE-4.0.2-xorg17.patch --- From: Lubomir Rintel <lkundrak(a)v3.sk&gt; 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 | 18 ++++---- src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 58 +++++++++++++++---------- 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk index 283efdc..9fb1f36 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 IN_XF86_MODULE @@ -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 := \ @@ -97,7 +97,7 @@ vboxmouse_drv_71_SOURCES = \ # # vboxmouse_drv_13 # -DLLS += 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 := \ @@ -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 := \ @@ -126,7 +126,7 @@ vboxmouse_drv_14_SOURCES = \ # # 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 := \ @@ -141,7 +141,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 := \ @@ -177,7 +177,7 @@ vboxmouse_drv_17_SOURCES = \ # # vboxmouse_drv_18 # -DLLS += 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 @@ -197,7 +197,7 @@ vboxmouse_drv_18_SOURCES = \ # # vboxmouse_drv_19 # -DLLS += 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 @@ -216,7 +216,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 1c55d2b..72ac0e2 100644 --- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -89,7 +89,7 @@ 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 +#DLLS += vboxvideo_drv_70 vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD if1of ($(KBUILD_TARGET), linux) vboxvideo_drv_70_CFLAGS += \ @@ -112,7 +112,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) @@ -127,7 +127,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 @@ -146,7 +146,7 @@ vboxvideo_drv_13_SOURCES = $(vboxvideo_drv_SOURCES) # # vboxvideo_drv_14 # -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) @@ -165,7 +165,7 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_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 \ @@ -192,7 +192,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) @@ -218,20 +218,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_INCS += $(PATH_ROOT)/src/VBox/Runtime/include vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) @@ -239,7 +251,7 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) # # vboxvideo_drv_18 # -DLLS += 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_drv_15_DEFS) @@ -266,7 +278,7 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES) # # vboxvideo_drv_19 # -DLLS += 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_drv_15_DEFS) @@ -292,7 +304,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.4 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- .cvsignore 3 Feb 2011 23:25:21 -0000 1.26 +++ .cvsignore 4 Feb 2011 17:14:54 -0000 1.27 @@ -1 +1 @@ -VirtualBox-4.0.0.tar.bz2 +VirtualBox-4.0.2.tar.bz2 Index: VirtualBox-OSE.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- VirtualBox-OSE.spec 3 Feb 2011 23:25:21 -0000 1.64 +++ VirtualBox-OSE.spec 4 Feb 2011 17:14:54 -0000 1.65 @@ -14,7 +14,7 @@ %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} Name: VirtualBox-OSE -Version: 4.0.0 +Version: 4.0.2 Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware @@ -29,9 +29,9 @@ Source8: VirtualBox-OSE-vboxresize.desktop Source9: VirtualBox-OSE-00-vboxvideo.conf Patch1: VirtualBox-OSE-3.2.0-noupdate.patch -Patch2: VirtualBox-OSE-4.0.0-strings.patch -Patch3: VirtualBox-OSE-4.0.0-libcxx.patch -Patch5: VirtualBox-OSE-4.0.0-xorg17.patch +Patch2: VirtualBox-OSE-4.0.2-strings.patch +Patch3: VirtualBox-OSE-4.0.2-libcxx.patch +Patch5: VirtualBox-OSE-4.0.2-xorg17.patch Patch9: VirtualBox-OSE-3.2.4-optflags.patch Patch10: VirtualBox-OSE-4.0.0-32bit.patch Patch11: VirtualBox-OSE-3.2.0-visibility.patch @@ -40,7 +40,7 @@ Patch15: VirtualBox-OSE-4.0.0-makeself.patch Patch16: VirtualBox-OSE-4.0.0-usblib.patch Patch17: VirtualBox-OSE-4.0.0-beramono.patch -Patch18: VirtualBox-OSE-4.0.0-aiobug.patch +Patch18: VirtualBox-OSE-4.0.2-aiobug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -152,6 +152,7 @@ %patch15 -p1 -b .makeself %patch16 -p1 -b .usblib %patch17 -p1 -b .beramono +%patch18 -p1 -b .aiobug # Remove prebuilt binary tools rm -rf kBuild @@ -458,6 +459,12 @@ %changelog +* Fri Feb 04 2011 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 4.0.2-1 +- New release + +* Thu Feb 03 2011 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 4.0.0-1 +- New release + * Fri Nov 12 2010 Lubomir Rintel <lkundrak(a)v3.sk&gt; - 3.2.10-1 - New release Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 3 Feb 2011 23:25:21 -0000 1.26 +++ sources 4 Feb 2011 17:14:54 -0000 1.27 @@ -1 +1 @@ -0d8c3d2cb4924140b602bfc115c5801f VirtualBox-4.0.0.tar.bz2 +4957fa3826bb1273c4d748692d896c8b VirtualBox-4.0.2.tar.bz2 --- VirtualBox-OSE-4.0.0-aiobug.patch DELETED --- --- VirtualBox-OSE-4.0.0-libcxx.patch DELETED --- --- VirtualBox-OSE-4.0.0-strings.patch DELETED --- --- VirtualBox-OSE-4.0.0-xorg17.patch DELETED ---