Author: kwizart Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv30457 Modified Files: .cvsignore sources xorg-x11-drv-nvidia.spec Log Message: - Update to 195.36.08 Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 30 Dec 2009 13:13:53 -0000 1.16 +++ .cvsignore 27 Feb 2010 17:37:16 -0000 1.17 @@ -1,2 +1,2 @@ -NVIDIA-Linux-x86_64-190.53-pkg0.run -NVIDIA-Linux-x86-190.53-pkg0.run +NVIDIA-Linux-x86-195.36.08-pkg0.run +NVIDIA-Linux-x86_64-195.36.08-pkg0.run Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 30 Dec 2009 13:13:53 -0000 1.16 +++ sources 27 Feb 2010 17:37:16 -0000 1.17 @@ -1,2 +1,2 @@ -3d3e956366f9df0e4c64d2e0299d1029 NVIDIA-Linux-x86_64-190.53-pkg0.run -2e80419f6f9ac16beecd839874d0c5ab NVIDIA-Linux-x86-190.53-pkg0.run +7b78eed78b5f345af6dd1b2a83f5d44b NVIDIA-Linux-x86-195.36.08-pkg0.run +854852a02595eda776e7a67573304eeb NVIDIA-Linux-x86_64-195.36.08-pkg0.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.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- xorg-x11-drv-nvidia.spec 30 Dec 2009 13:13:53 -0000 1.35 +++ xorg-x11-drv-nvidia.spec 27 Feb 2010 17:37:16 -0000 1.36 @@ -7,7 +7,7 @@ %endif Name: xorg-x11-drv-nvidia -Version: 190.53 +Version: 195.36.08 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -155,6 +155,9 @@ if [[ ! "/${file##./usr/lib/vdpau}" = "/${file}" ]] then install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/vdpau/${file##./usr/lib/vdpau} + elif [[ ! "/${file##./etc/OpenCL/vendors}" = "/${file}" ]] + then + install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_sysconfdir}/OpenCL/vendors/${file##./etc/OpenCL/vendors/} elif [[ ! "/${file##./usr/lib/}" = "/${file}" ]] then install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/lib/} @@ -227,6 +230,12 @@ # This is 180.xx adds - vdpau libs and headers ln -s libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1 +# This is 195.xx adds - OpenCL support +ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so.1 +ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{nvidialibdir}/libOpenCL.so +ln -s libnvidia-compiler.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-compiler.so.1 +ln -s libnvidia-compiler.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-compiler.so + # X configuration script install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display @@ -287,6 +296,9 @@ %files %defattr(-,root,root,-) %doc nvidiapkg/usr/share/doc/* +%dir %{_sysconfdir}/OpenCL +%dir %{_sysconfdir}/OpenCL/vendors +%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd %config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf %{_initrddir}/nvidia %exclude %{_bindir}/nvidia-settings @@ -321,19 +333,26 @@ %files devel %defattr(-,root,root,-) %dir %{_includedir}/nvidia +%dir %{_includedir}/nvidia/CL %dir %{_includedir}/nvidia/GL %dir %{_includedir}/nvidia/cuda %exclude %dir %{_includedir}/nvidia/vdpau +%{_includedir}/nvidia/CL/*.h %{_includedir}/nvidia/GL/*.h %{_includedir}/nvidia/cuda/*.h %exclude %{_includedir}/nvidia/vdpau/*.h %exclude %{nvidialibdir}/libXvMCNVIDIA.a %exclude %{nvidialibdir}/libcuda.so +%{nvidialibdir}/libOpenCL.so +%{nvidialibdir}/libnvidia-compiler.so %{nvidialibdir}/libGL.so %{nvidialibdir}/libXvMCNVIDIA.so %changelog +* Sat Feb 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 195.36.08-1 +- Update to 195.36.08 + * Wed Dec 30 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 190.53-1 - Update to 190.53 - Switch to new libvdpau location in %%{_libdir}/vdpau