rpms/wl-kmod/F-20 wl-kmod.spec,1.81,1.82
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13024
Modified Files:
wl-kmod.spec
Log Message:
* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.2
- Rebuilt for kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-20/wl-kmod.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- wl-kmod.spec 20 Dec 2013 18:39:02 -0000 1.81
+++ wl-kmod.spec 25 Dec 2013 13:13:01 -0000 1.82
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 6.30.223.141
-Release: 5%{?dist}.1
+Release: 5%{?dist}.2
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -90,6 +90,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.2
+- Rebuilt for kernel
+
* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 6.30.223.141-5.1
- Rebuilt for kernel
10 years, 4 months
rpms/nvidia-kmod/F-20 nvidia-kmod.spec,1.148,1.149
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12904
Modified Files:
nvidia-kmod.spec
Log Message:
* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-10.2
- Rebuilt for kernel
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/F-20/nvidia-kmod.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- nvidia-kmod.spec 20 Dec 2013 18:38:53 -0000 1.148
+++ nvidia-kmod.spec 25 Dec 2013 13:12:53 -0000 1.149
@@ -9,7 +9,7 @@
Epoch: 1
Version: 331.20
# Taken over by kmodtool
-Release: 10%{?dist}.1
+Release: 10%{?dist}.2
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -96,6 +96,9 @@
%changelog
+* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-10.2
+- Rebuilt for kernel
+
* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1:331.20-10.1
- Rebuilt for kernel
10 years, 4 months
rpms/nvidia-304xx-kmod/F-20 nvidia-304xx-kmod.spec,1.11,1.12
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-304xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12693
Modified Files:
nvidia-304xx-kmod.spec
Log Message:
* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.117-1.2
- Rebuilt for kernel
Index: nvidia-304xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-304xx-kmod/F-20/nvidia-304xx-kmod.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nvidia-304xx-kmod.spec 20 Dec 2013 18:38:42 -0000 1.11
+++ nvidia-304xx-kmod.spec 25 Dec 2013 13:12:17 -0000 1.12
@@ -8,7 +8,7 @@
Name: nvidia-304xx-kmod
Version: 304.117
# Taken over by kmodtool
-Release: 1%{?dist}.1
+Release: 1%{?dist}.2
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -80,6 +80,9 @@
%changelog
+* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.117-1.2
+- Rebuilt for kernel
+
* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.117-1.1
- Rebuilt for kernel
10 years, 4 months
rpms/nvidia-173xx-kmod/F-20 nvidia-173xx-kmod.spec,1.53,1.54
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-173xx-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12561
Modified Files:
nvidia-173xx-kmod.spec
Log Message:
* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-4.2
- Rebuilt for kernel
Index: nvidia-173xx-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-173xx-kmod/F-20/nvidia-173xx-kmod.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- nvidia-173xx-kmod.spec 20 Dec 2013 18:38:32 -0000 1.53
+++ nvidia-173xx-kmod.spec 25 Dec 2013 13:12:09 -0000 1.54
@@ -8,7 +8,7 @@
Name: nvidia-173xx-kmod
Version: 173.14.38
# Taken over by kmodtool
-Release: 4%{?dist}.1
+Release: 4%{?dist}.2
Summary: NVIDIA 173xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -89,6 +89,9 @@
%changelog
+* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-4.2
+- Rebuilt for kernel
+
* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 173.14.38-4.1
- Rebuilt for kernel
10 years, 4 months
rpms/xtables-addons-kmod/F-20 xtables-addons-kmod.spec,1.34,1.35
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xtables-addons-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12386
Modified Files:
xtables-addons-kmod.spec
Log Message:
* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.3
- Rebuilt for kernel
Index: xtables-addons-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/xtables-addons-kmod/F-20/xtables-addons-kmod.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xtables-addons-kmod.spec 20 Dec 2013 18:38:25 -0000 1.34
+++ xtables-addons-kmod.spec 25 Dec 2013 13:12:01 -0000 1.35
@@ -8,7 +8,7 @@
Name: xtables-addons-kmod
Summary: Kernel module (kmod) for xtables-addons
Version: 2.3
-Release: 4%{?dist}.2
+Release: 4%{?dist}.3
License: GPLv2
Group: System Environment/Kernel
URL: http://xtables-addons.sourceforge.net
@@ -66,6 +66,9 @@
rm -rf %{buildroot}
%changelog
+* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.3
+- Rebuilt for kernel
+
* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3-4.2
- Rebuilt for kernel
10 years, 4 months
rpms/VirtualBox-kmod/F-20 VirtualBox-kmod.spec,1.29,1.30
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/VirtualBox-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12240
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.6-1.2
- Rebuilt for kernel
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-20/VirtualBox-kmod.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- VirtualBox-kmod.spec 20 Dec 2013 18:38:18 -0000 1.29
+++ VirtualBox-kmod.spec 25 Dec 2013 13:11:54 -0000 1.30
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.3.6
-Release: 1%{?prerel:.%{prerel}}%{?dist}.1
+Release: 1%{?prerel:.%{prerel}}%{?dist}.2
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.6-1.2
+- Rebuilt for kernel
+
* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.6-1.1
- Rebuilt for kernel
10 years, 4 months
rpms/staging-kmod/F-20 staging-kmod.spec,1.28,1.29
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12116
Modified Files:
staging-kmod.spec
Log Message:
* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.12.6-1.2
- Rebuilt for kernel
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-20/staging-kmod.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- staging-kmod.spec 20 Dec 2013 21:08:45 -0000 1.28
+++ staging-kmod.spec 25 Dec 2013 13:11:48 -0000 1.29
@@ -22,7 +22,7 @@
Name: staging-kmod
Version: 3.12.6
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.1
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.2
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -142,6 +142,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 3.12.6-1.2
+- Rebuilt for kernel
+
* Fri Dec 20 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.12.6-1
- Update to 3.12.6
- drop ASUS_OLED, dropped upstream
10 years, 4 months
rpms/openafs-kmod/F-20 openafs-kmod.spec,1.40,1.41
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openafs-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11950
Modified Files:
openafs-kmod.spec
Log Message:
* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.6-0.pre1.6
- Rebuilt for kernel
Index: openafs-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/openafs-kmod/F-20/openafs-kmod.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- openafs-kmod.spec 20 Dec 2013 18:38:11 -0000 1.40
+++ openafs-kmod.spec 25 Dec 2013 13:11:42 -0000 1.41
@@ -23,7 +23,7 @@
Name: %{kmod_name}-kmod
Version: 1.6.6
-Release: 0.%{pre}%{?dist}.5
+Release: 0.%{pre}%{?dist}.6
Summary: Kernel module(s)
Group: System Environment/Kernel
@@ -99,6 +99,9 @@
%changelog
+* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.6-0.pre1.6
+- Rebuilt for kernel
+
* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.6.6-0.pre1.5
- Rebuilt for kernel
10 years, 4 months
rpms/ndiswrapper-kmod/F-20 ndiswrapper-kmod.spec,1.65,1.66
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ndiswrapper-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11781
Modified Files:
ndiswrapper-kmod.spec
Log Message:
* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.59-5.2
- Rebuilt for kernel
Index: ndiswrapper-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-20/ndiswrapper-kmod.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- ndiswrapper-kmod.spec 20 Dec 2013 18:38:04 -0000 1.65
+++ ndiswrapper-kmod.spec 25 Dec 2013 13:11:36 -0000 1.66
@@ -10,7 +10,7 @@
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.59
-Release: 5%{?pre}%{?dist}.1
+Release: 5%{?pre}%{?dist}.2
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
@@ -75,6 +75,9 @@
%changelog
+* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.59-5.2
+- Rebuilt for kernel
+
* Fri Dec 20 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 1.59-5.1
- Rebuilt for kernel
10 years, 4 months
rpms/VirtualBox/devel VirtualBox-4.3.6-mesa.patch, NONE, 1.1 VirtualBox.spec, 1.56, 1.57
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29799
Modified Files:
VirtualBox.spec
Added Files:
VirtualBox-4.3.6-mesa.patch
Log Message:
* 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.
- Disable webservice for rawhide, problems reported upstream with new gsoap version.
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(-)
--- NEW FILE VirtualBox-4.3.6-mesa.patch ---
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
VBoxOGL_INCS = .
if1of ($(KBUILD_TARGET), linux solaris freebsd)
VBoxOGL_INCS += \
- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
- $(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+ /usr/include/x11 \
+ /usr/include/xorg \
+ /usr/include/pixman-1 \
$(VBOX_MESA_INCS) \
- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
+ /usr/include/drm \
+ /usr/include/libdrm
VBoxOGL_DEFS += VBOX_NO_NATIVEGL
endif
@@ -222,11 +216,20 @@ VBoxOGL_LIBS = \
$(VBOX_LIB_OGL_CRUTIL) \
$(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
if1of ($(KBUILD_TARGET), linux solaris freebsd)
- VBoxOGL_LIBS += \
- $(PATH_STAGE_LIB)/libXcomposite.so \
- $(PATH_STAGE_LIB)/libXdamage.so \
- $(PATH_STAGE_LIB)/libXfixes.so \
- $(PATH_STAGE_LIB)/libXext.so
+ if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86 )
+ VBoxOGL_LIBS += \
+ /usr/lib/libXcomposite.so \
+ /usr/lib/libXdamage.so \
+ /usr/lib/libXfixes.so \
+ /usr/lib/libXext.so
+ endif
+ if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64 )
+ VBoxOGL_LIBS += \
+ /usr/lib64/libXcomposite.so \
+ /usr/lib64/libXdamage.so \
+ /usr/lib64/libXfixes.so \
+ /usr/lib64/libXext.so
+ endif
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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- VirtualBox.spec 21 Dec 2013 18:17:13 -0000 1.56
+++ VirtualBox.spec 25 Dec 2013 06:03:17 -0000 1.57
@@ -13,11 +13,11 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-#if 0%{?fedora} < 20
+%if 0%{?fedora} < 21
%global enable_webservice 1
-#else
-#global enable_webservice 0
-#endif
+%else
+%global enable_webservice 0
+%endif
#if 0%{?fedora} < 18
%global enable_docs 1
@@ -27,7 +27,7 @@
Name: VirtualBox
Version: 4.3.6
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Release: 4%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -50,9 +50,8 @@
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
-Patch23: VirtualBox-4.3.0-mesa.patch
+Patch23: VirtualBox-4.3.6-mesa.patch
Patch24: VirtualBox-4.3.0-VBoxGuestLib.patch
-Patch25: VirtualBox-4.2.0-xorg111.patch
Patch26: VirtualBox-4.3.0-no-bundles.patch
%if 0%{?fedora} < 16
@@ -102,7 +101,6 @@
BuildRequires: mesa-libOSMesa-devel
BuildRequires: pixman-devel
BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-server-source
BuildRequires: xorg-x11-server-devel
BuildRequires: libXcursor-devel
BuildRequires: libXcomposite-devel
@@ -231,9 +229,6 @@
%endif
%patch23 -p1 -b .mesa
%patch24 -p1 -b .guestlib
-%if 0%{?fedora} < 17
-%patch25 -p1 -b .xorg111
-%endif
%patch26 -p1 -b .nobundles
# CRLF->LF
@@ -627,6 +622,11 @@
%changelog
+* 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.
+- Disable webservice for rawhide, problems reported upstream with new gsoap version.
+
* Sat Dec 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.6-3
- Rebuilt after branching
10 years, 4 months