rpms/xorg-x11-drv-nvidia/devel .cvsignore, 1.51, 1.52 00-nvidia.conf, 1.1, 1.2 sources, 1.52, 1.53 xorg-x11-drv-nvidia.spec, 1.91, 1.92

[Leigh Scott]

Author: leigh123linux

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

Modified Files:
	.cvsignore 00-nvidia.conf sources xorg-x11-drv-nvidia.spec 
Log Message:
update to 310.19


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- .cvsignore	16 Oct 2012 21:35:14 -0000	1.51
+++ .cvsignore	16 Nov 2012 13:38:29 -0000	1.52
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-310.14.run
-NVIDIA-Linux-x86_64-310.14.run
+NVIDIA-Linux-x86_64-310.19.run
+NVIDIA-Linux-x86-310.19.run


Index: 00-nvidia.conf
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/00-nvidia.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 00-nvidia.conf	2 Nov 2010 12:02:45 -0000	1.1
+++ 00-nvidia.conf	16 Nov 2012 13:38:29 -0000	1.2
@@ -2,6 +2,6 @@
 #Do not edit
 
 Section "Files"
-	ModulePath   "@LIBDIR@/xorg/modules/extensions/nvidia"
+	ModulePath   "@LIBDIR@/nvidia/xorg"
 	ModulePath   "@LIBDIR@/xorg/modules"
 EndSection


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources	16 Oct 2012 21:35:14 -0000	1.52
+++ sources	16 Nov 2012 13:38:29 -0000	1.53
@@ -1,2 +1,2 @@
-93b6fcf100a94e4e5fafc4ccd740a590  NVIDIA-Linux-x86-310.14.run
-347ffd1c88e57476d26dfd0e36584acc  NVIDIA-Linux-x86_64-310.14.run
+0b498d3b2dfd123032cb93196e0f475c  NVIDIA-Linux-x86_64-310.19.run
+2adbdd38540b3a8955714760e05f575d  NVIDIA-Linux-x86-310.19.run


Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- xorg-x11-drv-nvidia.spec	9 Nov 2012 09:53:37 -0000	1.91
+++ xorg-x11-drv-nvidia.spec	16 Nov 2012 13:38:29 -0000	1.92
@@ -7,7 +7,7 @@
 
 Name:            xorg-x11-drv-nvidia
 Epoch:           1
-Version:         304.64
+Version:         310.19
 Release:         1%{?dist}
 Summary:         NVIDIA's proprietary display driver for NVIDIA graphic cards
 
@@ -79,13 +79,12 @@
 %filter_from_provides /^libGLCore\.so/d;
 %filter_from_provides /^libGL\.so/d;
 %filter_from_provides /^libvdpau_nvidia\.so\.1/d;
-%filter_from_provides /^libXvMCNVIDIA_dynamic\.so\.1/d;
 %filter_from_provides /^libglx\.so/d;
 %filter_from_requires /^libnvidia/d;
 %filter_from_requires /^libGLCore\.so/d;
 %filter_from_requires /^libGL\.so/d;
+%filter_from_requires /^libnvcuvid/d;
 %filter_from_requires /^libvdpau_nvidia\.so\.1/d;
-%filter_from_requires /^libXvMCNVIDIA_dynamic\.so\.1/d;
 %filter_from_requires /^libglx\.so/d;
 %filter_setup
 }
@@ -205,7 +204,6 @@
 install -p -m 0755 libglx.so.%{version}        $RPM_BUILD_ROOT%{nvidiaxorgdir}
 install -p -m 0755 nvidia_drv.so               $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
 install -p -m 0755 libvdpau*.so.%{version}     $RPM_BUILD_ROOT%{_libdir}/vdpau/
-install -p -m 0644 libXvMCNVIDIA.a             $RPM_BUILD_ROOT%{nvidialibdir}/
 
 # Install binaries
 install -p -m 0755 nvidia-{bug-report.sh,smi,cuda-proxy-control,cuda-proxy-server} $RPM_BUILD_ROOT%{_bindir}
@@ -348,6 +346,7 @@
 %config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
 %{nvidialibdir}/*.so.*
 %{nvidialibdir}/libcuda.so
+%{nvidialibdir}/libnvcuvid.so
 %{nvidialibdir}/libnvidia-glcore.so
 %{nvidialibdir}/tls/*.so*
 %exclude %{_libdir}/vdpau/libvdpau.*
@@ -356,19 +355,20 @@
 
 %files devel
 %defattr(-,root,root,-)
-%exclude %{nvidialibdir}/libXvMCNVIDIA.a
 %exclude %{nvidialibdir}/libcuda.so
 %{_includedir}/nvidia/
 %{nvidialibdir}/libOpenCL.so
 %{nvidialibdir}/libnvidia-compiler.so
 %{nvidialibdir}/libGL.so
-%{nvidialibdir}/libXvMCNVIDIA.so
-%{nvidialibdir}/libnvcuvid.so
 %{nvidialibdir}/libnvidia-ml.so
 %{nvidialibdir}/libnvidia-opencl.so
+%{nvidialibdir}/libnvidia-encode.so
 
 
 %changelog
+* Fri Nov 16 2012 Leigh Scott <leigh123linux at googlemail.com> - 1:310.19-1
+- Update to 310.19
+
 * Thu Nov 08 2012 Nicolas Chauvet <kwizart at gmail.com> - 1:304.64-1
 - Update to 304.64
 - Move nvidia xorg libraries to _libdir/nvidia/xorg - rfbz#2264