5:04 p.m.
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv16739
Modified Files:
.cvsignore VirtualBox-4.3.0-VBoxGuestLib.patch
VirtualBox-4.3.0-libcxx.patch VirtualBox-4.3.6-mesa.patch
VirtualBox.spec sources
Removed Files:
VirtualBox-00-vboxvideo.conf VirtualBox-4.3.0-mesa.patch
Log Message:
* Mon Mar 31 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.10-1
- In vboxvideo guest drive, don't patch the source code of Mesa part that use glapi
and use bundled
x11include/mesa-7.2 headers of Mesa, which btw rawhide doesn't have it, F20 have
glapi in xorg-x11-server-source, but by what
I saw, seems is not correct use it.
- New upstream release
- Drop upstream patch "39-fix-wrong-vboxvideo_drv-source.patch"
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/.cvsignore,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- .cvsignore 19 Dec 2013 00:40:45 -0000 1.52
+++ .cvsignore 11 Apr 2014 17:04:34 -0000 1.53
@@ -1 +1 @@
-VirtualBox-4.3.6.tar.bz2
+VirtualBox-4.3.10.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/F-19/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 29 Oct 2013 04:10:28 -0000 1.1
+++ VirtualBox-4.3.0-VBoxGuestLib.patch 11 Apr 2014 17:04:34 -0000 1.2
@@ -1,5 +1,7 @@
---- ./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
+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>
+--- ./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 +10,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/F-19/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 12:01:57 -0000 1.2
+++ VirtualBox-4.3.0-libcxx.patch 11 Apr 2014 17:04:34 -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 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
Index: VirtualBox-4.3.6-mesa.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/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 26 Dec 2013 17:27:43 -0000 1.1
+++ VirtualBox-4.3.6-mesa.patch 11 Apr 2014 17:04:34 -0000 1.2
@@ -1,25 +1,5 @@
-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
@@ -72,127 +52,3 @@
ifdef VBoxOGL_FAKEDRI
ifeq ($(KBUILD_TARGET), freebsd)
VBoxOGL_LIBS += \
---- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h.mesa 2013-12-18 16:06:06.000000000
+0000
-+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2013-12-24 17:01:55.086948605
+0000
-@@ -20,13 +20,6 @@
- #ifndef ___CROPENGL_FAKEDRIDRV_H
- #define ___CROPENGL_FAKEDRIDRV_H
-
--#include "src/mesa/main/mtypes.h"
--#include "src/mesa/main/dd.h"
--#include "src/mesa/glapi/dispatch.h"
--#include "src/mesa/glapi/glapi.h"
--#include "src/mesa/glapi/glapitable.h"
--#include "src/mesa/glapi/glapioffsets.h"
--#include "src/mesa/drivers/dri/common/dri_util.h"
- #include "GL/internal/dri_interface.h"
-
- #include "glx_proto.h"
---- ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c.mesa 2013-12-18 16:06:06.000000000
+0000
-+++ ./src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2013-12-24 19:56:30.880070340
+0000
-@@ -17,7 +17,12 @@
- */
-
- #define _GNU_SOURCE 1
-+#define HAVE_STRNDUP 1
-
-+#include <xf86.h>
-+#include <xf86drm.h>
-+#include <GL/gl.h>
-+#include <GL/glext.h>
- #include "cr_error.h"
- #include "cr_gl.h"
- #include "cr_mem.h"
-@@ -38,20 +42,6 @@
- #include <string.h>
- #endif
-
--/** X server message type definitions. */
--typedef enum {
-- X_PROBED, /* Value was probed */
-- X_CONFIG, /* Value was given in the config file */
-- X_DEFAULT, /* Value is a default */
-- X_CMDLINE, /* Value was given on the command line */
-- X_NOTICE, /* Notice */
-- X_ERROR, /* Error message */
-- X_WARNING, /* Warning message */
-- X_INFO, /* Informational message */
-- X_NONE, /* No prefix */
-- X_NOT_IMPLEMENTED, /* Not implemented */
-- X_UNKNOWN = -1 /* unknown -- this must always be last */
--} MessageType;
-
- #define VBOX_NO_MESA_PATCH_REPORTS
-
-@@ -127,7 +117,6 @@ typedef struct _FAKEDRI_PatchNode
- static FAKEDRI_PatchNode *g_pFreeList=NULL, *g_pRepatchList=NULL;
- #endif
-
--static struct _glapi_table* vbox_glapi_table = NULL;
- fakedri_glxapi_table glxim;
-
- static const __DRIextension **gppSwDriExternsion = NULL;
-@@ -136,54 +125,6 @@ static const __DRIswrastExtension *gpSwD
-
- extern const __DRIextension * __driDriverExtensions[];
-
--#define VBOX_SET_MESA_FUNC(table, name, func) \
-- if (_glapi_get_proc_offset(name)>=0) SET_by_offset(table,
_glapi_get_proc_offset(name), func); \
-- else crWarning("%s not found in mesa table", name)
--
--#define GLAPI_ENTRY(Func) VBOX_SET_MESA_FUNC(vbox_glapi_table, "gl"#Func,
cr_gl##Func);
--
--static void
--vboxPatchMesaExport(const char* psFuncName, const void *pStart, const void *pEnd);
--
--static void
--vboxPatchMesaGLAPITable()
--{
-- void *pGLTable;
--
-- pGLTable = (void *)_glapi_get_dispatch();
-- vbox_glapi_table = crAlloc(_glapi_get_dispatch_table_size() * sizeof (void *));
-- if (!vbox_glapi_table)
-- {
-- crError("Not enough memory to allocate dispatch table");
-- }
-- crMemcpy(vbox_glapi_table, pGLTable, _glapi_get_dispatch_table_size() * sizeof (void
*));
--
-- #include "fakedri_glfuncsList.h"
--
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glBlendEquationSeparateEXT",
cr_glBlendEquationSeparate);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glSampleMaskSGIS",
cr_glSampleMaskEXT);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glSamplePatternSGIS",
cr_glSamplePatternEXT);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2dMESA",
cr_glWindowPos2d);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2dvMESA",
cr_glWindowPos2dv);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2fMESA",
cr_glWindowPos2f);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2fvMESA",
cr_glWindowPos2fv);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2iMESA",
cr_glWindowPos2i);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2ivMESA",
cr_glWindowPos2iv);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2sMESA",
cr_glWindowPos2s);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos2svMESA",
cr_glWindowPos2sv);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3dMESA",
cr_glWindowPos3d);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3dvMESA",
cr_glWindowPos3dv);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3fMESA",
cr_glWindowPos3f);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3fvMESA",
cr_glWindowPos3fv);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3iMESA",
cr_glWindowPos3i);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3ivMESA",
cr_glWindowPos3iv);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3sMESA",
cr_glWindowPos3s);
-- VBOX_SET_MESA_FUNC(vbox_glapi_table, "glWindowPos3svMESA",
cr_glWindowPos3sv);
--
-- _glapi_set_dispatch(vbox_glapi_table);
--};
--#undef GLAPI_ENTRY
--
- #define GLXAPI_ENTRY(Func) pGLXTable->Func = VBOXGLXTAG(glX##Func);
- static void
- vboxFillGLXAPITable(fakedri_glxapi_table *pGLXTable)
-@@ -686,7 +627,7 @@ void __attribute__ ((constructor)) vbox_
- * Note, we don't need to install extension functions via _glapi_add_dispatch,
because we'd override glXGetProcAddress.
- */
- /* Mesa's dispatch table is different across library versions, have to modify
mesa's table using offset info functions*/
-- vboxPatchMesaGLAPITable();
-+ //vboxPatchMesaGLAPITable();
-
- /* Handle glx api.
- * In the end application call would look like this:
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- VirtualBox.spec 26 Dec 2013 17:27:43 -0000 1.54
+++ VirtualBox.spec 11 Apr 2014 17:04:34 -0000 1.55
@@ -26,8 +26,8 @@
#endif
Name: VirtualBox
-Version: 4.3.6
-Release: 4%{?prerel:.%{prerel}}%{?dist}
+Version: 4.3.10
+Release: 1%{?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
@@ -207,8 +206,12 @@
%endif
rm -rf tools
# Remove bundle X11 sources and some lib sources, before patching.
-rm -rf src/VBox/Additions/x11/x11include
+mv src/VBox/Additions/x11/x11include/mesa-7.2 .
+rm -rf src/VBox/Additions/x11/x11include/*
+mv mesa-7.2 src/VBox/Additions/x11/x11include/
+
rm -rf src/VBox/Additions/x11/x11stubs
+rm -rf src/VBox/GuestHost/OpenGL/include/GL
rm -rf src/libs/boost-1.37.0/
#rm -rf src/libs/liblzf-3.4/
rm -rf src/libs/libxml2-2.6.31/
@@ -401,11 +404,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
@@ -607,7 +605,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
@@ -622,6 +619,22 @@
%changelog
+* Mon Mar 31 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.10-1
+- In vboxvideo guest drive, don't patch the source code of Mesa part that use glapi
and use bundled
+ x11include/mesa-7.2 headers of Mesa, which btw rawhide doesn't have it, F20 have
glapi in xorg-x11-server-source, but by what
+ I saw, seems is not correct use it.
+- New upstream release
+- Drop upstream patch "39-fix-wrong-vboxvideo_drv-source.patch"
+
+* Sun Mar 16 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.8-2
+- some cleanups and improvements.
+
+* Thu Mar 13 2014 Sérgio Basto <sergio(a)serjux.com> - 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> - 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/F-19/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources 19 Dec 2013 00:40:45 -0000 1.52
+++ sources 11 Apr 2014 17:04:34 -0000 1.53
@@ -1 +1 @@
-4bc874039f169215152fb40ca5062784 VirtualBox-4.3.6.tar.bz2
+c3e9e61d5ed7c672bfc747fb8df4367b VirtualBox-4.3.10.tar.bz2
--- VirtualBox-00-vboxvideo.conf DELETED ---
--- VirtualBox-4.3.0-mesa.patch DELETED ---