Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4397 Modified Files: VirtualBox-4.3.0-VBoxGuestLib.patch VirtualBox-4.3.6-mesa.patch VirtualBox.spec Removed Files: VirtualBox-00-vboxvideo.conf Log Message: * Sun Mar 16 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.8-2 - some cleanups and improvements. VirtualBox-4.3.0-VBoxGuestLib.patch: Makefile.kmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: VirtualBox-4.3.0-VBoxGuestLib.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.3.0-VBoxGuestLib.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VirtualBox-4.3.0-VBoxGuestLib.patch 12 Mar 2014 21:16:22 -0000 1.2 +++ VirtualBox-4.3.0-VBoxGuestLib.patch 16 Mar 2014 18:09:33 -0000 1.3 @@ -1,3 +1,5 @@ +when we use VBOX_USE_SYSTEM_XORG_HEADERS , we don't need compile the very old libXFree86 (from xfree86.org) +Sérgio Basto <sergio(a)serjux.com&gt; --- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.guestlib 2014-03-01 03:57:34.446124468 +0000 +++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2014-03-01 04:00:47.863997911 +0000 @@ -38,7 +38,7 @@ endif VirtualBox-4.3.6-mesa.patch: Config.kmk | 10 --- src/VBox/Additions/common/crOpenGL/Makefile.kmk | 35 ++++++----- src/VBox/Additions/common/crOpenGL/fakedri_drv.c | 70 +---------------------- src/VBox/Additions/common/crOpenGL/fakedri_drv.h | 7 -- 4 files changed, 26 insertions(+), 96 deletions(-) Index: VirtualBox-4.3.6-mesa.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.3.6-mesa.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VirtualBox-4.3.6-mesa.patch 12 Mar 2014 21:16:22 -0000 1.2 +++ VirtualBox-4.3.6-mesa.patch 16 Mar 2014 18:09:33 -0000 1.3 @@ -1,6 +1,25 @@ fakedri_drv.c,h: Just compile with X11 system source and we may remove bundle X11 source code. +--- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000 ++++ ./Config.kmk 2012-03-27 23:55:28.070630137 +0100 +@@ -2003,15 +2003,7 @@ ifdef VBOX_WITH_CROGL + endif + + if1of ($(KBUILD_TARGET), freebsd linux solaris) +- # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2 +- VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2 +- VBOX_MESA_INCS = \ +- $(VBOX_PATH_MESA_SOURCE) \ +- $(VBOX_PATH_MESA_SOURCE)/include \ +- $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \ +- $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \ +- $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \ +- $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common ++ VBOX_MESA_INCS = + endif + + VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/ --- ./src/VBox/Additions/common/crOpenGL/Makefile.kmk.mesa 2012-09-13 09:26:18.000000000 +0100 +++ ./src/VBox/Additions/common/crOpenGL/Makefile.kmk 2012-09-23 01:08:36.032101751 +0100 @@ -82,18 +82,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUES Index: VirtualBox.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- VirtualBox.spec 12 Mar 2014 21:16:22 -0000 1.58 +++ VirtualBox.spec 16 Mar 2014 18:09:33 -0000 1.59 @@ -27,7 +27,7 @@ Name: VirtualBox Version: 4.3.8 -Release: 1%{?prerel:.%{prerel}}%{?dist} +Release: 2%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -39,7 +39,6 @@ Source6: VirtualBox.modules Source7: VirtualBox-guest.modules Source8: VirtualBox-vboxresize.desktop -Source9: VirtualBox-00-vboxvideo.conf Source10: vboxweb.service Source11: vboxservice.service Patch1: VirtualBox-OSE-4.1.4-noupdate.patch @@ -403,11 +402,6 @@ obj/bin/additions/VBoxClient \ obj/bin/additions/VBoxControl -# this is fix a long time -# Ideally, Xorg should autodetect this, but for some reason it no longer does -#install -m 0644 -D %{SOURCE9} \ -# $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf - %if %{enable_webservice} install -m 0644 -D %{SOURCE10} \ $RPM_BUILD_ROOT%{_unitdir}/vboxweb.service @@ -609,7 +603,6 @@ %{_libdir}/xorg/modules/drivers/* %{_libdir}/dri/* %{_libdir}/VBoxOGL*.so -#{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf %{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh #%{_sysconfdir}/xdg/autostart/vboxclient.desktop %exclude %{_datadir}/gdm @@ -624,6 +617,9 @@ %changelog +* Sun Mar 16 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.8-2 +- some cleanups and improvements. + * Thu Mar 13 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.8-1 - Update to 4.3.8, need an upstream patch 39-fix-wrong-vboxvideo_drv-source.patch --- VirtualBox-00-vboxvideo.conf DELETED ---