rpms/VirtualBox-OSE/F-15 .cvsignore, 1.30, 1.31 VirtualBox-OSE-3.2.10-noansi.patch, 1.1, 1.2 VirtualBox-OSE-4.1.4-xorg17.patch, 1.1, 1.2 VirtualBox-OSE-4.1.6-strings.patch, 1.1, 1.2 VirtualBox-OSE.spec, 1.72, 1.73 sources, 1.30, 1.31

Sérgio M. Basto sergiomb at rpmfusion.org
Mon Feb 6 03:37:13 CET 2012 

Author: sergiomb

Update of /cvs/free/rpms/VirtualBox-OSE/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13297

Modified Files:
	.cvsignore VirtualBox-OSE-3.2.10-noansi.patch 
	VirtualBox-OSE-4.1.4-xorg17.patch 
	VirtualBox-OSE-4.1.6-strings.patch VirtualBox-OSE.spec sources 
Log Message:
* Mon Feb 6 2012 Sérgio Basto <sergio at serjux.com> - 4.1.8-1
- New release.
- Try fix usb/udev problem on updates without reboot computer.
- Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	24 Dec 2011 04:02:18 -0000	1.30
+++ .cvsignore	6 Feb 2012 02:37:12 -0000	1.31
@@ -1 +1 @@
-VirtualBox-4.1.6.tar.bz2
+VirtualBox-4.1.8.tar.bz2

VirtualBox-OSE-3.2.10-noansi.patch:
 b/Config.kmk                                           |    4 ++--
 src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Index: VirtualBox-OSE-3.2.10-noansi.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/VirtualBox-OSE-3.2.10-noansi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-3.2.10-noansi.patch	12 Nov 2010 12:47:55 -0000	1.1
+++ VirtualBox-OSE-3.2.10-noansi.patch	6 Feb 2012 02:37:12 -0000	1.2
@@ -5,6 +5,8 @@
 
 On Rawhide as of 01 Sep 2009 x86_64 /usr/include/bits/mathinline.h
 contains a non-iso/ansi c inline assembly construct.
+
+add by Sérgio M. B. file x11/vboxvideo/testcase/Makefile.kmk
 ---
  Config.kmk |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
@@ -31,6 +33,14 @@
  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
-
+--- a/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk	2012-01-12 20:46:24.695866363 +0000
++++ b/src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk	2012-01-12 20:46:38.202992949 +0000
+@@ -35,7 +35,7 @@ endif # !VBOX_ONLY_SDK
+ # tstSetModeXOrg
+ #
+ tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE
+-tstSetModeXOrg_CFLAGS += -std=c99
++tstSetModeXOrg_CFLAGS += -std=gnu99
+ tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE
+ tstSetModeXOrg_SOURCES  = \
+ 	tstSetModeXOrg.c \

VirtualBox-OSE-4.1.4-xorg17.patch:
 b/src/VBox/Additions/common/crOpenGL/Makefile.kmk      |   14 ++----
 b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk        |   18 +++++---
 src/VBox/Additions/x11/vboxvideo/Makefile.kmk          |   37 ++++++++++++++++-
 src/VBox/Additions/x11/vboxvideo/testcase/Makefile.kmk |    4 -
 4 files changed, 56 insertions(+), 17 deletions(-)

Index: VirtualBox-OSE-4.1.4-xorg17.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/VirtualBox-OSE-4.1.4-xorg17.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-4.1.4-xorg17.patch	24 Dec 2011 04:02:18 -0000	1.1
+++ VirtualBox-OSE-4.1.4-xorg17.patch	6 Feb 2012 02:37:12 -0000	1.2
@@ -27,37 +27,25 @@
   VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
  endif
  
-diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk
---- a/src/VBox/Additions/x11/Makefile.kmk
-+++ b/src/VBox/Additions/x11/Makefile.kmk
-@@ -17,6 +17,10 @@
- SUB_DEPTH = ../../../..
- include $(KBUILD_PATH)/subheader.kmk
- 
-+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110)
-+ XSERVER_VERSION := 17
-+endif
-+
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
-  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
 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
-@@ -56,6 +56,18 @@
- endif
- 
+@@ -53,9 +53,18 @@
+ 	mouse.c \
+ 	pnp.c \
+ 	VBoxUtils_68.c
+-endif
+-
  
-+ifeq ($(KBUILD_TARGET), linux)
-+DLLS += vboxmouse_drv_$(XSERVER_VERSION)
-+vboxmouse_drv_$(XSERVER_VERSION)_TEMPLATE = VBOXGUESTR3XORGMOD
-+vboxmouse_drv_$(XSERVER_VERSION)_DEFS = XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE \
++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
-+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \
++vboxmouse_drv_17_INCS := \
 +   /usr/include/x11 \
 +   /usr/include/xorg \
 +   /usr/include/pixman-1
-+vboxmouse_drv_$(XSERVER_VERSION) = \
++vboxmouse_drv_17 = \
 +	vboxmouse_15.c
 +else
  #
@@ -89,80 +77,18 @@
       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
-+++ 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
+--- 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
+ 
++DLLS += vboxvideo_drv_17
++vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
++vboxvideo_drv_17_CFLAGS += -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?
++vboxvideo_drv_17_DEFS := XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 \
++	IN_XF86_MODULE IN_RT_STATIC VBOXVIDEO_13 NO_ANSIC PCIACCESS VBOX_NO_LOW_COLOUR VBOX_DRI
++vboxvideo_drv_17_INCS = \
 +	/usr/include/drm \
 +	/usr/include/X11/dri \
 +	/usr/include/pixman-1 \
@@ -189,36 +115,34 @@
 +	/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)
++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
  
-@@ -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)
+ # vboxvideo_drv_70
+@@ -354,7 +390,6 @@ vboxvideo_drv_111_SOURCES := $(vboxvideo
  
  # 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
-
+--- 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
+ #
+ tstSetModeXOrg_TEMPLATE = VBOXR3TSTEXE
+ tstSetModeXOrg_CFLAGS += -std=c99
+-tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_15_DEFS)) TESTCASE
++tstSetModeXOrg_DEFS = $(filter-out IN_RT_STATIC,$(vboxvideo_drv_17_DEFS)) TESTCASE
+ tstSetModeXOrg_SOURCES  = \
+ 	tstSetModeXOrg.c \
+ 	../setmode.c
+-tstSetModeXOrg_INCS = $(vboxvideo_drv_15_INCS)
++tstSetModeXOrg_INCS = $(vboxvideo_drv_17_INCS)
+ 
+ 
+ # generate rules.

VirtualBox-OSE-4.1.6-strings.patch:
 b/src/VBox/Installer/linux/VBox.sh         |   11 ++++++-----
 b/src/VBox/VMM/VMMR3/VM.cpp                |    9 ++++-----
 src/VBox/Frontends/VirtualBox/src/main.cpp |   20 ++++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

Index: VirtualBox-OSE-4.1.6-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/VirtualBox-OSE-4.1.6-strings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-4.1.6-strings.patch	24 Dec 2011 04:02:18 -0000	1.1
+++ VirtualBox-OSE-4.1.6-strings.patch	6 Feb 2012 02:37:12 -0000	1.2
@@ -76,7 +76,7 @@
 +WARNING: The character device /dev/vboxdrv does not exist. Try running
  
 -           sudo /etc/init.d/vboxdrv restart
-+           '/sbin/udevtrigger' (as root)
++           'systemctl restart udev-trigger.service' (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


Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/VirtualBox-OSE.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- VirtualBox-OSE.spec	2 Jan 2012 23:22:52 -0000	1.72
+++ VirtualBox-OSE.spec	6 Feb 2012 02:37:12 -0000	1.73
@@ -14,8 +14,8 @@
 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
 
 Name:		VirtualBox-OSE
-Version:	4.1.6
-Release:	2%{?prerel:.%{prerel}}%{?dist}
+Version:	4.1.8
+Release:	1%{?prerel:.%{prerel}}%{?dist}
 Summary:	A general-purpose full virtualizer for PC hardware
 
 Group:		Development/Tools
@@ -387,8 +387,10 @@
 # Assign USB devices
 if /sbin/udevadm control --reload-rules >/dev/null 2>&1
 then
-	/sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
-	/sbin/udevadm settle >/dev/null 2>&1 || :
+#	/sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
+#	/sbin/udevadm settle >/dev/null 2>&1 || :
+    systemctl restart udev-trigger.service
+    systemctl restart udev-settle.service
 fi
 
 
@@ -496,21 +498,26 @@
 
 
 %changelog
+* Mon Feb 6 2012 Sérgio Basto <sergio at serjux.com> - 4.1.8-1
+- New release.
+- Try fix usb/udev problem on updates without reboot computer.
+- Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.
+
 * Sun Jan 01 2012 Nicolas Chauvet <kwizart at gmail.com> - 4.1.6-2
 - Fix vboxweb-service installation
 
 * Sat Dec 24 2011 Sérgio Basto <sergio at serjux.com> - 4.1.6-1
 - New release
-- drop up streamed patch VirtualBox-OSE-4.1.2-vboxpci.patch 
+- drop up streamed patch VirtualBox-OSE-4.1.2-vboxpci.patch
 - fix strings patch
 - add VirtualBox-OSE-add-VBoxExtPackHelperApp.patch bz #1656
-- redo xorg17 patch (still need some improvements, I will wait for a new change that break the patch) 
+- redo xorg17 patch (still need some improvements, I will wait for a new change that break the patch)
 - redo noupdate patch.
-- disable java binding seems non maintained. 
+- disable java binding seems unmaintained.
 - some cleanups.
 - bug #2052, drop requirement of HAL in Fedora >= 16.
 - bug #2040, is also fixed (update to 4.1.6).
-- Now rawhide needs explicit BuildRequires libpng-devel
+- Now rawhide needs explicit BuildRequires libpng-devel.
 - complete list of commands of VBox command line based on
   src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec, revert some cleanups.
 - add source vboxweb-service to package.


Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	24 Dec 2011 04:02:18 -0000	1.30
+++ sources	6 Feb 2012 02:37:12 -0000	1.31
@@ -1 +1 @@
-89b979d1b817242c7cdcb489898f166a  VirtualBox-4.1.6.tar.bz2
+2092bba46baa62fab5520d67dee2ece8  VirtualBox-4.1.8.tar.bz2

More information about the rpmfusion-commits mailing list