Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4776 Modified Files: .cvsignore VirtualBox-4.3.0-VBoxGuestLib.patch VirtualBox-4.3.0-libcxx.patch VirtualBox-4.3.6-mesa.patch VirtualBox.spec sources Added Files: 39-fix-wrong-vboxvideo_drv-source.patch Log Message: * 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 - No need patch Config.kmk in VirtualBox-4.3.6-mesa.patch - small adjustments in others patches. 39-fix-wrong-vboxvideo_drv-source.patch: Makefile.kmk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE 39-fix-wrong-vboxvideo_drv-source.patch --- Description: Fixed wrong vboxvideo_drv_system_SOURCES reference. Even the comment says we need at least 17 "Build using local X.Org headers. We assume X.Org Server 1.7 or later." Author: Felix Geyer <fgeyer(a)debian.org&gt; --- Origin: debian Forwarded: <> Last-Update: <2014-03-10> --- virtualbox-4.3.8-dfsg.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +++ virtualbox-4.3.8-dfsg/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -376,7 +376,7 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS /usr/include/libdrm \ /usr/include/xorg \ /usr/include/pixman-1 - vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_15_SOURCES) + vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_17_SOURCES) endif Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/.cvsignore,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- .cvsignore 18 Dec 2013 22:52:17 -0000 1.52 +++ .cvsignore 12 Mar 2014 21:16:22 -0000 1.53 @@ -1 +1 @@ -VirtualBox-4.3.6.tar.bz2 +VirtualBox-4.3.8.tar.bz2 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-4.3.0-VBoxGuestLib.patch 28 Oct 2013 06:29:38 -0000 1.1 +++ VirtualBox-4.3.0-VBoxGuestLib.patch 12 Mar 2014 21:16:22 -0000 1.2 @@ -1,5 +1,5 @@ ---- ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk.guestlib 2013-10-27 20:50:38.091380572 +0000 -+++ ./src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-10-27 20:53:54.380791350 +0000 +--- ./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 LIBRARIES += \ VBoxGuestR3Lib \ @@ -8,4 +8,4 @@ +ifndef VBOX_USE_SYSTEM_XORG_HEADERS if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) LIBRARIES += \ - VBoxGuestR3LibXFree86 + VBoxGuestR3LibXFree86 VirtualBox-4.3.0-libcxx.patch: ./src/VBox/Runtime/Makefile.kmk | 2 +- ./src/VBox/Storage/testcase/Makefile.kmk | 4 ++-- ./src/libs/kStuff/Makefile.kmk | 2 +- Config.kmk | 4 ++-- b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +- b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 4 +--- b/src/VBox/HostDrivers/Support/Makefile.kmk | 2 +- b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------ b/src/VBox/HostDrivers/win/Makefile.kmk | 2 +- b/src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +- b/src/VBox/Installer/win/Resources/Makefile.kmk | 2 +- configure | 2 +- src/VBox/Installer/win/Stub/Makefile.kmk | 2 +- src/libs/liblzf-3.4/Makefile.kmk | 2 +- 14 files changed, 21 insertions(+), 23 deletions(-) Index: VirtualBox-4.3.0-libcxx.patch =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.3.0-libcxx.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- VirtualBox-4.3.0-libcxx.patch 2 Nov 2013 11:32:26 -0000 1.2 +++ VirtualBox-4.3.0-libcxx.patch 12 Mar 2014 21:16:22 -0000 1.3 @@ -196,7 +196,7 @@ - vbox-img_LIBS += crypt + vbox-img_LIBS += crypto ifdef SDK_VBOX_LIBXML2_LIBS - vbox-img_LIBS += xml2 lzma + vbox-img_LIBS += xml2 endif --- a/src/libs/liblzf-3.4/Makefile.kmk +++ b/src/libs/liblzf-3.4/Makefile.kmk VirtualBox-4.3.6-mesa.patch: Makefile.kmk | 35 +++++++++++++++-------------- fakedri_drv.c | 70 ++++------------------------------------------------------ fakedri_drv.h | 7 ----- 3 files changed, 25 insertions(+), 87 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- VirtualBox-4.3.6-mesa.patch 25 Dec 2013 06:03:17 -0000 1.1 +++ VirtualBox-4.3.6-mesa.patch 12 Mar 2014 21:16:22 -0000 1.2 @@ -1,25 +1,6 @@ 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 = /usr/include/GL /usr/include/xorg /usr/include/pixman-1 - 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.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- VirtualBox.spec 25 Dec 2013 06:03:17 -0000 1.57 +++ VirtualBox.spec 12 Mar 2014 21:16:22 -0000 1.58 @@ -26,8 +26,8 @@ #endif Name: VirtualBox -Version: 4.3.6 -Release: 4%{?prerel:.%{prerel}}%{?dist} +Version: 4.3.8 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -53,6 +53,7 @@ Patch23: VirtualBox-4.3.6-mesa.patch Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch Patch26: VirtualBox-4.3.0-no-bundles.patch +Patch27: 39-fix-wrong-vboxvideo_drv-source.patch %if 0%{?fedora} < 16 BuildRequires: kBuild >= 0.1.98 @@ -230,6 +231,7 @@ %patch23 -p1 -b .mesa %patch24 -p1 -b .guestlib %patch26 -p1 -b .nobundles +%patch27 -p1 -b .fix_vboxvideo # CRLF->LF sed -i 's/\r//' COPYING @@ -622,6 +624,12 @@ %changelog +* 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 +- No need patch Config.kmk in VirtualBox-4.3.6-mesa.patch +- small adjustments in others patches. + * Wed Dec 25 2013 Sérgio Basto <sergio(a)serjux.com&gt; - 4.3.6-4 - Update VirtualBox-4.3-mesa.patch, for guest drives and for Xorg-x11-server-1.14.99 in rawhide, glx internals "fixes" completely removed, eliminating BuildRequires of xorg-x11-server-source. Also add to VBoxOGL_LIBS libXcomposite, libXdamage etc of the system. Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 18 Dec 2013 22:52:17 -0000 1.52 +++ sources 12 Mar 2014 21:16:22 -0000 1.53 @@ -1 +1 @@ -4bc874039f169215152fb40ca5062784 VirtualBox-4.3.6.tar.bz2 +422ab09b7eb9c0564b55a6a0a6e6678f VirtualBox-4.3.8.tar.bz2