rpms/xorg-x11-drv-nvidia-304xx/F-20 99-nvidia.conf, NONE, 1.1 00-nvidia.conf, 1.3, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6474
Added Files:
99-nvidia.conf
Removed Files:
00-nvidia.conf
Log Message:
rename 00-nvidia.conf
--- NEW FILE 99-nvidia.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit
Section "Files"
ModulePath "@LIBDIR@/nvidia/xorg"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
--- 00-nvidia.conf DELETED ---
10 years, 4 months
rpms/xorg-x11-drv-nvidia-304xx/devel 99-nvidia.conf, 1.2, 1.3 00-nvidia.conf, 1.3, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6294
Added Files:
99-nvidia.conf
Removed Files:
00-nvidia.conf
Log Message:
rename 00-nvidia.conf
Index: 99-nvidia.conf
===================================================================
RCS file: 99-nvidia.conf
diff -N 99-nvidia.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 99-nvidia.conf 27 Dec 2013 09:42:32 -0000 1.3
@@ -0,0 +1,7 @@
+#This file is provided by xorg-x11-drv-nvidia
+#Do not edit
+
+Section "Files"
+ ModulePath "@LIBDIR@/nvidia/xorg"
+ ModulePath "@LIBDIR@/xorg/modules"
+EndSection
--- 00-nvidia.conf DELETED ---
10 years, 4 months
rpms/xorg-x11-drv-nvidia-304xx/devel 00-nvidia.conf, 1.2, 1.3 99-nvidia.conf, 1.1, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5600
Added Files:
00-nvidia.conf
Removed Files:
99-nvidia.conf
Log Message:
revert my last commit
Index: 00-nvidia.conf
===================================================================
RCS file: 00-nvidia.conf
diff -N 00-nvidia.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ 00-nvidia.conf 27 Dec 2013 09:31:58 -0000 1.3
@@ -0,0 +1,7 @@
+#This file is provided by xorg-x11-drv-nvidia
+#Do not edit
+
+Section "Files"
+ ModulePath "@LIBDIR@/nvidia/xorg"
+ ModulePath "@LIBDIR@/xorg/modules"
+EndSection
--- 99-nvidia.conf DELETED ---
10 years, 4 months
rpms/xorg-x11-drv-nvidia-304xx/F-20 xorg-x11-drv-nvidia-304xx.spec, 1.8, 1.9 00-nvidia.conf, 1.1, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4574
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Removed Files:
00-nvidia.conf
Log Message:
* Fri Dec 27 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-3
- fix module path issue with alien msttcore-fonts package
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/F-20/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-nvidia-304xx.spec 16 Dec 2013 23:19:00 -0000 1.8
+++ xorg-x11-drv-nvidia-304xx.spec 27 Dec 2013 09:08:33 -0000 1.9
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia-304xx
Version: 304.117
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -15,7 +15,7 @@
URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-Source2: 00-nvidia.conf
+Source2: 99-nvidia.conf
Source3: nvidia-xorg.conf
Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
@@ -232,9 +232,9 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
-sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
-sed -i -e 's|nvidia|%{_nvidia_serie}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
-touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+sed -i -e 's|nvidia|%{_nvidia_serie}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
# Desktop entry for nvidia-settings
@@ -348,7 +348,7 @@
%dir %{_sysconfdir}/OpenCL/vendors
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
%dir %{_sysconfdir}/nvidia
-%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
@@ -397,6 +397,9 @@
%changelog
+* Fri Dec 27 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-3
+- fix module path issue with alien msttcore-fonts package
+
* Mon Dec 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.117-2
- Use nvidia symlink for the glx.so
--- 00-nvidia.conf DELETED ---
10 years, 4 months
rpms/xorg-x11-drv-nvidia-304xx/devel 99-nvidia.conf, NONE, 1.1 xorg-x11-drv-nvidia-304xx.spec, 1.8, 1.9 00-nvidia.conf, 1.1, NONE
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4156
Modified Files:
xorg-x11-drv-nvidia-304xx.spec
Added Files:
99-nvidia.conf
Removed Files:
00-nvidia.conf
Log Message:
* Fri Dec 27 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-3
- fix module path issue with alien msttcore-fonts package
--- NEW FILE 99-nvidia.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit
Section "Files"
ModulePath "@LIBDIR@/nvidia/xorg"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
Index: xorg-x11-drv-nvidia-304xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/devel/xorg-x11-drv-nvidia-304xx.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xorg-x11-drv-nvidia-304xx.spec 16 Dec 2013 23:19:00 -0000 1.8
+++ xorg-x11-drv-nvidia-304xx.spec 27 Dec 2013 08:59:45 -0000 1.9
@@ -7,7 +7,7 @@
Name: xorg-x11-drv-nvidia-304xx
Version: 304.117
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -15,7 +15,7 @@
URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-Source2: 00-nvidia.conf
+Source2: 99-nvidia.conf
Source3: nvidia-xorg.conf
Source5: 00-avoid-glamor.conf
Source6: blacklist-nouveau.conf
@@ -232,9 +232,9 @@
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
-sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
-sed -i -e 's|nvidia|%{_nvidia_serie}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
-touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+sed -i -e 's|nvidia|%{_nvidia_serie}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
# Desktop entry for nvidia-settings
@@ -348,7 +348,7 @@
%dir %{_sysconfdir}/OpenCL/vendors
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
%dir %{_sysconfdir}/nvidia
-%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
%config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
%config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf
%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
@@ -397,6 +397,9 @@
%changelog
+* Fri Dec 27 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 304.117-3
+- fix module path issue with alien msttcore-fonts package
+
* Mon Dec 16 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 304.117-2
- Use nvidia symlink for the glx.so
--- 00-nvidia.conf DELETED ---
10 years, 4 months
rpms/VirtualBox-kmod/F-19 VirtualBox-kmod.spec,1.54,1.55
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8271
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Thu Dec 26 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6-2
- Rebuild for newer VirtualBox-kmodsrc and build akmods.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-19/VirtualBox-kmod.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- VirtualBox-kmod.spec 25 Dec 2013 13:13:56 -0000 1.54
+++ VirtualBox-kmod.spec 26 Dec 2013 19:53:55 -0000 1.55
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -12,7 +12,7 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 1
+%global vboxrel 4
%global vboxreltag %{?vboxrel:-%{vboxrel}}
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.3.6
-Release: 1%{?prerel:.%{prerel}}%{?dist}.2
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Thu Dec 26 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6-2
+- Rebuild for newer VirtualBox-kmodsrc and build akmods.
+
* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.6-1.2
- Rebuilt for kernel
10 years, 4 months
rpms/VirtualBox/F-19 VirtualBox-4.3.6-mesa.patch, NONE, 1.1 VirtualBox.spec, 1.53, 1.54 VirtualBox-4.2.0-xorg111.patch, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32716
Modified Files:
VirtualBox.spec
Added Files:
VirtualBox-4.3.6-mesa.patch
Removed Files:
VirtualBox-4.2.0-xorg111.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/F-19/VirtualBox.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- VirtualBox.spec 19 Dec 2013 00:40:45 -0000 1.53
+++ VirtualBox.spec 26 Dec 2013 17:27:43 -0000 1.54
@@ -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: 1%{?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,17 @@
%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
+
+* Sat Dec 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.6-2
+- Rebuilt after branching
+
* Wed Dec 18 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6-1
- New upstream release, a maintenance release of
VirtualBox 4.3 which improves stability and fixes regressions.
--- VirtualBox-4.2.0-xorg111.patch DELETED ---
10 years, 4 months
rpms/dosemu/F-20 .cvsignore, 1.2, 1.3 dosemu.spec, 1.1, 1.2 sources, 1.2, 1.3
by Justin Zygmont
Author: solarflow99
Update of /cvs/free/rpms/dosemu/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13242/F-20
Modified Files:
.cvsignore dosemu.spec sources
Log Message:
updating the version to get it to build in F-20
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/dosemu/F-20/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 12 Nov 2010 09:25:46 -0000 1.2
+++ .cvsignore 25 Dec 2013 23:25:15 -0000 1.3
@@ -1,3 +1,3 @@
-dosemu-1.4.0.tgz
-dosemu-freedos-bin.tgz
freedos-source.tar.gz
+dosemu-1.4.0.8.tgz
+dosemu-freedos-bin.tgz
Index: dosemu.spec
===================================================================
RCS file: /cvs/free/rpms/dosemu/F-20/dosemu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dosemu.spec 12 Nov 2010 09:25:46 -0000 1.1
+++ dosemu.spec 25 Dec 2013 23:25:15 -0000 1.2
@@ -1,6 +1,6 @@
Name: dosemu
-Version: 1.4.0
-Release: 8.1999svn%{?dist}
+Version: 1.4.0.8
+Release: 18.20131022git%{?dist}
Summary: DOS Emulator for Linux
URL: http://dosemu.sf.net
License: GPLv2+
@@ -28,6 +28,7 @@
Source3: freedos-source.tar.gz
Group: Applications/Emulators
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Requires: hicolor-icon-theme
BuildRequires: bison
BuildRequires: flex
BuildRequires: slang-devel
@@ -38,7 +39,7 @@
BuildRequires: libsndfile
BuildRequires: desktop-file-utils
BuildRequires: xorg-x11-font-utils
-Requires: hicolor-icon-theme
+BuildRequires: git
# At this time, Dosemu only works with Linux on x86, other ports are welcome.
# ExclusiveArch: %{ix86} can also be used, but some build clients such as
@@ -88,6 +89,7 @@
$RPM_BUILD_ROOT%{_sysconfdir}/dosemu
mv -f $RPM_BUILD_ROOT%{_sysconfdir}/drives/* \
$RPM_BUILD_ROOT%{_sysconfdir}/dosemu/drives
+ln -s /etc/dosemu/dosemu.conf $RPM_BUILD_ROOT%{_sysconfdir}/dosemu.conf
%clean
@@ -141,6 +143,7 @@
%doc %{_docdir}/%{name}-%{version}/THANKS
%dir %{_sysconfdir}/dosemu
%dir %{_sysconfdir}/dosemu/drives
+%config(noreplace) %{_sysconfdir}/dosemu.conf
%config(noreplace) %{_sysconfdir}/dosemu/dosemu.conf
%config(noreplace) %{_sysconfdir}/dosemu/drives/c
%config(noreplace) %{_sysconfdir}/dosemu/drives/d
@@ -151,6 +154,28 @@
%changelog
+* Thu Nov 22 2013 Justin Zygmont <solarflow99[AT]gmail.com>
+- 1.4.0.8-18.20131022git
+- updated to the latest build, fixes many bugs
+- Added a symlink for /etc/dosemu, other minor fixes
+
+* Mon Feb 05 2013 Justin Zygmont <solarflow99[AT]gmail.com>
+- 1.4.0.8-15.20130205git
+- updated to the latest build, including improvements for easier package builds
+
+* Mon Jun 16 2012 Justin Zygmont <solarflow99[AT]gmail.com>
+- 1.4.0.6-14.20120623git
+- updated to the latest build, and changed the release tag for GIT since svn is no longer used
+- updated GNU license URL in freedos dosemu-freedos-bin.tgz
+
+* Mon Oct 03 2011 Justin Zygmont <solarflow99[AT]gmail.com>
+- 1.4.0-12.2058svn
+- updated the svn build to fix a problem with dosemu hanging on startup
+
+* Thu Sep 01 2011 Justin Zygmont <solarflow99[AT]gmail.com>
+- 1.4.0-9.2053svn
+- updated the svn build
+
* Tue Aug 10 2010 Justin Zygmont <solarflow99[AT]gmail.com>
- 1.4.0-8.1999svn
- updated the svn build, added Arch x86_64
Index: sources
===================================================================
RCS file: /cvs/free/rpms/dosemu/F-20/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 12 Nov 2010 09:25:46 -0000 1.2
+++ sources 25 Dec 2013 23:25:15 -0000 1.3
@@ -1,3 +1,3 @@
-e0651504635f361995c2bad89f74d97a dosemu-1.4.0.tgz
-2e09774fe91cff4372cb4a393eb467f5 dosemu-freedos-bin.tgz
f11612ca714dec9245a37263a82721dc freedos-source.tar.gz
+5dfd280442a37a5267bcc593a78b8059 dosemu-1.4.0.8.tgz
+ed17a7e91e2010c04f6807eff9fb812d dosemu-freedos-bin.tgz
10 years, 4 months
rpms/VirtualBox-kmod/devel VirtualBox-kmod.spec,1.28,1.29
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26520
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Wed Dec 25 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6-2
- Rebuild for newest VirtualBox-kmodsrc and just build akmods for rawhide.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/devel/VirtualBox-kmod.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- VirtualBox-kmod.spec 19 Dec 2013 00:16:52 -0000 1.28
+++ VirtualBox-kmod.spec 25 Dec 2013 19:18:22 -0000 1.29
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels current
+%global buildforkernels akmod
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -12,7 +12,7 @@
#global prerel RC4
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-%global vboxrel 1
+%global vboxrel 4
%global vboxreltag %{?vboxrel:-%{vboxrel}}
# Allow only root to access vboxdrv regardless of the file mode
# use only for debugging!
@@ -20,7 +20,7 @@
Name: VirtualBox-kmod
Version: 4.3.6
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Wed Dec 25 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6-2
+- Rebuild for newest VirtualBox-kmodsrc and just build akmods for rawhide.
+
* Thu Dec 19 2013 Sérgio Basto <sergio(a)serjux.com> - 4.3.6-1
- New upstream release.
10 years, 4 months