rpms/xorg-x11-drv-nvidia-304xx/devel 00-avoid-glamor.conf, NONE, 1.1 xorg-x11-drv-nvidia-304xx.spec, 1.2, 1.3

[Leigh Scott]

Author: leigh123linux

Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-304xx/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1562

Modified Files:
	xorg-x11-drv-nvidia-304xx.spec 
Added Files:
	00-avoid-glamor.conf 
Log Message:
* Sun Dec 01 2013 Leigh Scott <leigh123linux at googlemail.com> - 304.116-2
- disable glamor module



--- NEW FILE 00-avoid-glamor.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit

Section "Module"
Disable "glamoregl"
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xorg-x11-drv-nvidia-304xx.spec	1 Dec 2013 11:54:38 -0000	1.2
+++ xorg-x11-drv-nvidia-304xx.spec	1 Dec 2013 17:14:07 -0000	1.3
@@ -7,7 +7,7 @@
 
 Name:            xorg-x11-drv-nvidia-304xx
 Version:         304.116
-Release:         1%{?dist}
+Release:         2%{?dist}
 Summary:         NVIDIA's 304xx serie proprietary display driver for NVIDIA graphic cards
 
 Group:           User Interface/X Hardware Support
@@ -17,6 +17,7 @@
 Source1:         ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
 Source2:         00-nvidia.conf
 Source3:         nvidia-xorg.conf
+Source5:         00-avoid-glamor.conf
 Source6:         blacklist-nouveau.conf
 
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -226,6 +227,7 @@
 #Install static driver dependant configuration files
 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
@@ -339,6 +341,7 @@
 %dir %{_sysconfdir}/OpenCL/vendors
 %config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
 %config %{_sysconfdir}/X11/xorg.conf.d/00-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
 %{_bindir}/nvidia-bug-report.sh
@@ -388,6 +391,9 @@
 
 
 %changelog
+* Sun Dec 01 2013 Leigh Scott <leigh123linux at googlemail.com> - 304.116-2
+- disable glamor module
+
 * Sun Dec 01 2013 Leigh Scott <leigh123linux at googlemail.com> - 304.116-1
 - Update to 304.116