rpms/VirtualBox-OSE/devel VirtualBox-OSE-3.1.0-libcxx.patch, NONE, 1.1 VirtualBox-OSE-3.1.0-noupdate.patch, NONE, 1.1 VirtualBox-OSE-3.1.0-strings.patch, NONE, 1.1 VirtualBox-OSE-3.1.0-xorg17.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 VirtualBox-OSE.spec, 1.34, 1.35 sources, 1.10, 1.11 VirtualBox-OSE-2.2.0-noupdate.patch, 1.1, NONE VirtualBox-OSE-3.0.2-libcxx.patch, 1.1, NONE VirtualBox-OSE-3.0.6-strings.patch, 1.1, NONE VirtualBox-OSE-3.0.6-xorg17.patch, 1.1, NONE

Lubomir Rintel lkundrak at rpmfusion.org
Thu Nov 12 17:24:20 CET 2009 

Author: lkundrak

Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11148

Modified Files:
	.cvsignore VirtualBox-OSE.spec sources 
Added Files:
	VirtualBox-OSE-3.1.0-libcxx.patch 
	VirtualBox-OSE-3.1.0-noupdate.patch 
	VirtualBox-OSE-3.1.0-strings.patch 
	VirtualBox-OSE-3.1.0-xorg17.patch 
Removed Files:
	VirtualBox-OSE-2.2.0-noupdate.patch 
	VirtualBox-OSE-3.0.2-libcxx.patch 
	VirtualBox-OSE-3.0.6-strings.patch 
	VirtualBox-OSE-3.0.6-xorg17.patch 
Log Message:
* Thu Nov 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.1.0-0.1.beta1
- Upstream beta release


VirtualBox-OSE-3.1.0-libcxx.patch:

--- NEW FILE VirtualBox-OSE-3.1.0-libcxx.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.

Lubomir Rintel <lkundrak at v3.sk>

diff -up VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/VBoxClient/Makefile.kmk.libcxx VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
--- VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/VBoxClient/Makefile.kmk.libcxx	2009-11-05 17:54:28.000000000 +0100
+++ VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/VBoxClient/Makefile.kmk	2009-11-12 15:37:07.000000000 +0100
@@ -68,20 +68,20 @@ endif
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxClient_DEFS += VBOX_WITH_GUEST_PROPS
 endif
-#
-# Link aginst 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  += $(PATH_VBoxClient)
-VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
-VBoxClient_CLEAN     = $(PATH_VBoxClient)/libstdc++.a
-$$(PATH_VBoxClient)/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 aginst 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  += $(PATH_VBoxClient)
+#VBoxClient_ORDERDEPS = $(PATH_VBoxClient)/libstdc++.a
+#VBoxClient_CLEAN     = $(PATH_VBoxClient)/libstdc++.a
+#$$(PATH_VBoxClient)/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)

VirtualBox-OSE-3.1.0-noupdate.patch:

--- NEW FILE VirtualBox-OSE-3.1.0-noupdate.patch ---
Our OS provides superior way of dealing with updates (PackageKit).
Let's not bug the user with updates that are not yet packaged.

Lubomir Rintel <lkundrak at v3.sk>

diff -up VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp.noupdate VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
--- VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp.noupdate	2009-11-12 15:25:16.000000000 +0100
+++ VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp	2009-11-12 15:28:49.000000000 +0100
@@ -186,7 +186,11 @@ void VBoxUpdateData::decode()
         if (parser.size() > 1)
         {
             QDate date = QDate::fromString (parser [1], Qt::ISODate);
-            mDate = date.isValid() ? date : QDate::currentDate();
+            if (date.isValid()) {
+                mDate = date;
+            } else {
+                mPeriodIndex = PeriodNever;
+            }
         }
             
         /* Parse 'branch' value */

VirtualBox-OSE-3.1.0-strings.patch:

--- NEW FILE VirtualBox-OSE-3.1.0-strings.patch ---
Replace some strings which ones that (sometimes) make more sense.

Lubomir Rintel <lkundrak at v3.sk>

diff -up VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings	2009-11-05 17:53:04.000000000 +0100
+++ VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2009-11-12 15:34:13.000000000 +0100
@@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli
   );
 
 QString g_QStrHintLinuxNoDriver = QApplication::tr(
-  "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-  "there is a permission problem with /dev/vboxdrv. Re-setup 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(
@@ -101,9 +101,9 @@ QString g_QStrHintOtherNoDriver = QAppli
   "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(
-  "It may help to reinstall VirtualBox."
+  "Please report the problem to the RPM Fusion Bugzilla."
   );
 
 #if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff -up VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh.strings VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh.strings	2009-11-05 17:54:06.000000000 +0100
+++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh	2009-11-12 15:34:13.000000000 +0100
@@ -36,19 +36,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 -up VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop
--- VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings	2009-09-01 13:22:55.000000000 +0200
+++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop	2009-11-12 15:34:13.000000000 +0100
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Version=1.0
-Name=Sun VirtualBox
+Name=VirtualBox OSE
 GenericName=Virtual Machine
 Type=Application
 Exec=VirtualBox
diff -up VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp.strings VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp
--- VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp.strings	2009-11-10 16:47:29.000000000 +0100
+++ VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp	2009-11-12 15:34:13.000000000 +0100
@@ -336,8 +336,8 @@ VMMR3DECL(int)   VMR3Create(uint32_t cCp
 #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
@@ -378,8 +378,8 @@ VMMR3DECL(int)   VMR3Create(uint32_t cCp
 #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

VirtualBox-OSE-3.1.0-xorg17.patch:

--- NEW FILE VirtualBox-OSE-3.1.0-xorg17.patch ---
Build drivers for XOrg 1.7 ABI

And only them.

diff -up VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
--- VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17	2009-11-05 17:54:27.000000000 +0100
+++ VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2009-11-12 14:27:16.000000000 +0100
@@ -61,7 +61,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
@@ -82,7 +82,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 := \
@@ -99,7 +99,7 @@ vboxmouse_drv_71_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 := \
@@ -116,7 +116,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 := \
@@ -131,7 +131,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 := \
@@ -150,15 +150,13 @@ vboxmouse_drv_16_SOURCES = \
 DLLS += vboxmouse_drv_17
 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
 vboxmouse_drv_17_INCS := \
-	$(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
-	$(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
-	$(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
-	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
-	$(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.15 \
+	/usr/include/pixman-1 \
+	/usr/share/xorg-x11-server-source/hw/xfree86/common \
+	/usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+	/usr/share/xorg-x11-server-source/include \
+	/usr/share/xorg-x11-server-source/mi \
+	/usr/share/xorg-x11-server-source/Xext \
 	$(PATH_SUB_CURRENT)
 vboxmouse_drv_17_SOURCES = \
 	vboxmouse_15.c
@@ -166,7 +164,7 @@ vboxmouse_drv_17_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 -up VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17 VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
--- VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.xorg17	2009-11-10 16:47:42.000000000 +0100
+++ VirtualBox-3.1.0_OSE/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2009-11-12 14:29:08.000000000 +0100
@@ -113,7 +113,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 += \
@@ -136,7 +136,7 @@ vboxvideo_drv_70_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)
@@ -152,7 +152,7 @@ vboxvideo_drv_71_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)
@@ -174,7 +174,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_70_DEFS)
@@ -193,7 +193,7 @@ vboxvideo_drv_14_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_70_DEFS) NO_ANSIC PCIACCESS \
@@ -220,7 +220,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)
@@ -244,25 +244,38 @@ vboxvideo_drv_17_CFLAGS := $(vboxvideo_d
 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)/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.15
+	/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)
 
 
 # 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))


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	1 Nov 2009 13:27:02 -0000	1.10
+++ .cvsignore	12 Nov 2009 16:24:20 -0000	1.11
@@ -1,2 +1 @@
-VirtualBox-3.0.10-OSE.tar.bz2
-UserManual.pdf
+VirtualBox-3.1.0_BETA1_OSE.tar.bz2


Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- VirtualBox-OSE.spec	1 Nov 2009 13:27:02 -0000	1.34
+++ VirtualBox-OSE.spec	12 Nov 2009 16:24:20 -0000	1.35
@@ -16,14 +16,14 @@
 %endif
 
 Name:           VirtualBox-OSE
-Version:        3.0.10
-Release:        1%{?dist}
+Version:        3.1.0
+Release:        0.1.beta1%{?dist}
 Summary:        A general-purpose full virtualizer for PC hardware
 
 Group:          Development/Tools
 License:        GPLv2 or (GPLv2 and CDDL)
 URL:            http://www.virtualbox.org/wiki/VirtualBox
-Source0:        http://dlc.sun.com/virtualbox/%{version}/VirtualBox-%{version}-OSE.tar.bz2
+Source0:        http://download.virtualbox.org/virtualbox/%{version}_BETA1/VirtualBox-%{version}_BETA1_OSE.tar.bz2
 Source1:        http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
 Source3:        VirtualBox-OSE-90-vboxdrv.rules
 Source4:        VirtualBox-OSE-90-vboxdrv.rules.hardening
@@ -32,10 +32,10 @@
 Source7:        VirtualBox-OSE-guest.modules
 Source8:        VirtualBox-OSE-vboxresize.desktop
 Source9:        VirtualBox-OSE.blacklist-kvm
-Patch1:         VirtualBox-OSE-2.2.0-noupdate.patch
-Patch2:         VirtualBox-OSE-3.0.6-strings.patch
-Patch3:         VirtualBox-OSE-3.0.2-libcxx.patch
-Patch5:         VirtualBox-OSE-3.0.6-xorg17.patch
+Patch1:         VirtualBox-OSE-3.1.0-noupdate.patch
+Patch2:         VirtualBox-OSE-3.1.0-strings.patch
+Patch3:         VirtualBox-OSE-3.1.0-libcxx.patch
+Patch5:         VirtualBox-OSE-3.1.0-xorg17.patch
 Patch9:         VirtualBox-OSE-3.0.4-optflags.patch
 Patch10:        VirtualBox-OSE-2.2.0-32bit.patch
 Patch11:        VirtualBox-OSE-3.0.4-visibility.patch
@@ -162,9 +162,6 @@
 # the installation paths, but install the tree with the default
 # layout under 'obj' and shuffle files around in %%install.
 
-# FIXME: Utilize optflags. This will probably involve patching of makefiles
-# Setting VBOX_GCC_OPT to optflags doesn't use the flags for large part of
-# the tree, while preventing required symbols to be generated in .r0 files
 echo %{optflags}
 kmk KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj"              \
         VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST=       \
@@ -216,6 +213,7 @@
 
 # Executabes
 install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
+        obj/bin/EfiThunk        \
         obj/bin/VBoxHeadless    \
         obj/bin/VBoxSDL         \
         obj/bin/VBoxNetDHCP     \
@@ -261,7 +259,7 @@
 
 # Guest tools
 install -m 0755 -t $RPM_BUILD_ROOT%{_bindir}    \
-        obj/bin/additions/mountvboxsf           \
+        obj/bin/additions/mount.vboxsf          \
         obj/bin/additions/VBoxService           \
         obj/bin/additions/VBoxClient            \
         obj/bin/additions/VBoxControl
@@ -385,6 +383,7 @@
 %{_libdir}/virtualbox/VBoxXPCOMIPCD
 %{_libdir}/virtualbox/vboxwebsrv
 %{_libdir}/virtualbox/webtest
+%{_libdir}/virtualbox/EfiThunk
 %{priv_mode} %{_libdir}/virtualbox/VBoxHeadless
 %{priv_mode} %{_libdir}/virtualbox/VBoxSDL
 %{priv_mode} %{_libdir}/virtualbox/VBoxNetDHCP
@@ -411,7 +410,7 @@
 
 %files guest
 %defattr(-,root,root,-)
-%{_bindir}/mountvboxsf
+%{_bindir}/mount.vboxsf
 %{_bindir}/VBoxClient
 %{_bindir}/VBoxControl
 %{_bindir}/VBoxService
@@ -435,6 +434,9 @@
 
 
 %changelog
+* Thu Nov 12 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.1.0-0.1.beta1
+- Upstream beta release
+
 * Sun Nov 01 2009 Lubomir Rintel <lkundrak at v3.sk> - 3.0.10-1
 - Update to newer upstream release
 - Fix mixed up source files (Tony Nelson, #881)


Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	1 Nov 2009 13:27:02 -0000	1.10
+++ sources	12 Nov 2009 16:24:20 -0000	1.11
@@ -1,2 +1 @@
-54a3fc2af8420c6463ecb73bef2eeb2e  VirtualBox-3.0.10-OSE.tar.bz2
-4abaa23db5d8e22c36cd8f808c2c6975  UserManual.pdf
+851986a826c1ef2ec71bd82a59e79a21  VirtualBox-3.1.0_BETA1_OSE.tar.bz2


--- VirtualBox-OSE-2.2.0-noupdate.patch DELETED ---


--- VirtualBox-OSE-3.0.2-libcxx.patch DELETED ---


--- VirtualBox-OSE-3.0.6-strings.patch DELETED ---


--- VirtualBox-OSE-3.0.6-xorg17.patch DELETED ---

More information about the rpmfusion-commits mailing list