Author: sergiomb Update of /cvs/free/rpms/VirtualBox/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27807 Modified Files: .cvsignore VirtualBox-4.3.6-mesa.patch VirtualBox.spec sources Removed Files: 39-fix-wrong-vboxvideo_drv-source.patch Log Message: * Mon Mar 31 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 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/devel/.cvsignore,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- .cvsignore 12 Mar 2014 21:16:22 -0000 1.53 +++ .cvsignore 31 Mar 2014 01:13:25 -0000 1.54 @@ -1 +1 @@ -VirtualBox-4.3.8.tar.bz2 +VirtualBox-4.3.10.tar.bz2 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/devel/VirtualBox-4.3.6-mesa.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- VirtualBox-4.3.6-mesa.patch 16 Mar 2014 18:09:33 -0000 1.3 +++ VirtualBox-4.3.6-mesa.patch 31 Mar 2014 01:13:25 -0000 1.4 @@ -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 = - 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/devel/VirtualBox.spec,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- VirtualBox.spec 16 Mar 2014 18:09:33 -0000 1.59 +++ VirtualBox.spec 31 Mar 2014 01:13:25 -0000 1.60 @@ -26,8 +26,8 @@ #endif Name: VirtualBox -Version: 4.3.8 -Release: 2%{?prerel:.%{prerel}}%{?dist} +Version: 4.3.10 +Release: 1%{?prerel:.%{prerel}}%{?dist} Summary: A general-purpose full virtualizer for PC hardware Group: Development/Tools @@ -52,7 +52,6 @@ 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 @@ -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/ @@ -230,7 +233,6 @@ %patch23 -p1 -b .mesa %patch24 -p1 -b .guestlib %patch26 -p1 -b .nobundles -%patch27 -p1 -b .fix_vboxvideo # CRLF->LF sed -i 's/\r//' COPYING @@ -617,6 +619,13 @@ %changelog +* Mon Mar 31 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 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&gt; - 4.3.8-2 - some cleanups and improvements. Index: sources =================================================================== RCS file: /cvs/free/rpms/VirtualBox/devel/sources,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- sources 12 Mar 2014 21:16:22 -0000 1.53 +++ sources 31 Mar 2014 01:13:25 -0000 1.54 @@ -1 +1 @@ -422ab09b7eb9c0564b55a6a0a6e6678f VirtualBox-4.3.8.tar.bz2 +c3e9e61d5ed7c672bfc747fb8df4367b VirtualBox-4.3.10.tar.bz2 --- 39-fix-wrong-vboxvideo_drv-source.patch DELETED ---