xorg-x11-drv-nvidia: update to 256.53

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2054 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/xorg-x11-drv-nvidia/xorg-x11-drv-nvidia-vl.spec

@@ -7,16 +7,16 @@
 Summary: Proprietary NVIDIA hardware accelerated display driver
 Summary(ja): プロプライエタリな NVIDIA ハードウエアアクセラレーションディスプレイドライバ
 Name: xorg-x11-drv-nvidia
-Version: 195.36.24
+Version: 256.53
 Release: 1%{?_dist_release}
 License: Redistributable, no modification permitted
 Group: User Interface/X Hardware Support
 URL: http://www.nvidia.com/object/unix.html
 
 # i386
-Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
+Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
 # x86_64
-Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
+Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run
 Source2: nvidia.sh
 Source3: nvidia.csh
 Source4: nvidia-config-display
@@ -25,7 +25,7 @@ Source6: nvidia.nodes
 Source7: blacklist-nouveau.conf
 Source8: 50-nvidia.rules
 # http://www.nvnews.net/vbulletin/attachment.php?attachmentid=20486&d=1158955681
-Patch0: NVIDIA_kernel-1.0-9625-NOSMBUS.diff.txt
+#Patch0: NVIDIA_kernel-1.0-9625-NOSMBUS.diff.txt
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Required for proper dkms operation
@@ -94,7 +94,7 @@ sh %{SOURCE1} --extract-only --target tmp/
 # Move all the files back from tmp/ to the main directory
 %{__mv} tmp/* .
 %{__rm} -rf tmp/
-%patch0 -p0
+#%patch0 -p0
 
 
 %build
@@ -103,9 +103,6 @@ sh %{SOURCE1} --extract-only --target tmp/
 %install
 %{__rm} -rf %{buildroot}
 
-# Fix for FC6 kernels
-#{__perl} -pi -e 's|#include <linux/config.h>||g' usr/src/nv/nv-linux.h
-
 %define dkms_name nvidia
 %define dkms_vers %{version}-%{release}
 %define quiet -q
@@ -122,56 +119,62 @@ AUTOINSTALL=YES
 EOF
 
 # Install all the files, even the binary ones. Ick.
-%{__install} -p -m 0644 usr/src/nv/{*.c,*.h,*.o,makefile,Makefile.kbuild} \
+%{__install} -p -m 0644 kernel/{*.c,*.h,*.o,makefile,Makefile.kbuild} \
     %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
-%{__install} -p -m 0755 usr/src/nv/*.sh \
+%{__install} -p -m 0755 kernel/*.sh \
     %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 # Install libXvMCNVIDIA.*
 %{__mkdir_p} %{buildroot}%{nvidialibdir}/
-%{__install} -p -m 0755 usr/X11R6/lib/libXvMCNVIDIA.so.* \
+%{__install} -p -m 0755 libXvMCNVIDIA.so.* \
     %{buildroot}%{nvidialibdir}/
-%{__install} -p -m 0644 usr/X11R6/lib/libXvMCNVIDIA.a \
+%{__install} -p -m 0644 libXvMCNVIDIA.a \
     %{buildroot}%{nvidialibdir}/
 
-# Install X driver and extension (is the nvidia_drv.o useful?)
+# Install X driver and extension
 %{__mkdir_p} %{buildroot}%{_libdir}/xorg/modules/drivers/
-%{__install} -p -m 0755 usr/X11R6/lib/modules/drivers/nvidia_drv.so \
+%{__install} -p -m 0755 nvidia_drv.so \
     %{buildroot}%{_libdir}/xorg/modules/drivers/
 %{__mkdir_p} %{buildroot}%{_libdir}/xorg/modules/extensions/nvidia/
-%{__install} -p -m 0755 usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
+%{__install} -p -m 0755 libglx.so.%{version} \
     %{buildroot}%{_libdir}/xorg/modules/extensions/nvidia/libglx.so
-#{__install} -p -m 0755 usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \
+#{__install} -p -m 0755 libnvidia-wfb.so.%{version} \
 #   %{buildroot}%{_libdir}/xorg/modules/libwfb.so
 
 # Install GL and tls libs
 %{__mkdir_p} %{buildroot}%{nvidialibdir}/tls/
-%{__install} -p -m 0755 usr/lib/*.so.%{version} \
-    %{buildroot}%{nvidialibdir}/
-%{__install} -p -m 0755 usr/lib/tls/*.so.%{version} \
+for l in libGL libOpenCL libXvMCNVIDIA libcuda libnvidia-cfg libnvidia-compiler libnvidia-glcore libnvidia-tls
+do
+  %{__install} -p -m 0755 $l.so.* %{buildroot}%{nvidialibdir}/
+done
+%{__install} -p -m 0755 tls/*.so.%{version} \
     %{buildroot}%{nvidialibdir}/tls/
-%{__rm} -f %{buildroot}%{nvidialibdir}/libvdpau.so.%{version}
 
 # Install vdpau_nvidia
 %{__mkdir_p} %{buildroot}%{_libdir}/vdpau/
-%{__install} -p -m 0755 usr/lib/vdpau/libvdpau_nvidia.* \
-    %{buildroot}%{_libdir}/vdpau/
+%{__install} -p -m 0755 libvdpau_*.so.* \
+    %{buildroot}%{_libdir}/vdpau
 %{__ln_s} -f libvdpau_nvidia.so.%{version} \
     %{buildroot}%{_libdir}/vdpau/libvdpau_nvidia.so.1
+%{__ln_s} -f libvdpau_nvidia.so.%{version} \
+    %{buildroot}%{_libdir}/vdpau/libvdpau_nvidia.so
 
 %ifarch x86_64
 # Install 32bit compat GL, vdpau and tls libs
 %{__mkdir_p} %{buildroot}%{nvidialib32dir}/tls/
-%{__install} -p -m 0755 usr/lib32/*.so.%{version} \
-    %{buildroot}%{nvidialib32dir}/
-%{__install} -p -m 0755 usr/lib32/tls/*.so.%{version} \
+for l in libGL libOpenCL libcuda libnvidia-compiler libnvidia-glcore libnvidia-tls
+do
+  %{__install} -p -m 0755 32/$l.so.* %{buildroot}%{nvidialib32dir}/
+done
+%{__install} -p -m 0755 32/tls/*.so.%{version} \
     %{buildroot}%{nvidialib32dir}/tls/
 %{__mkdir_p} %{buildroot}%{_prefix}/lib/vdpau/
-%{__install} -p -m 0755 usr/lib32/vdpau/libvdpau_nvidia.* \
+%{__install} -p -m 0755 32/libvdpau_*.so.* \
     %{buildroot}%{_prefix}/lib/vdpau/
 %{__ln_s} -f libvdpau_nvidia.so.%{version} \
-    %{buildroot}%{_libdir}/vdpau/libvdpau_nvidia.so.1
-%{__rm} -f %{buildroot}{nvidialib32dir}/libvdpau.so.%{version}
+    %{buildroot}%{_prefix}/lib/vdpau/libvdpau_nvidia.so.1
+%{__ln_s} -f libvdpau_nvidia.so.%{version} \
+    %{buildroot}%{_prefix}/lib/vdpau/libvdpau_nvidia.so
 %endif
 
 # Create .so symlinks
@@ -181,6 +184,13 @@ for libname in libGLcore libGL libnvidia-cfg libnvidia-tls tls/libnvidia-tls; do
     %{__ln_s} `basename ${libname}`.so.%{version} \
         %{buildroot}%{nvidialibdir}/${libname}.so
 done
+# OpenCL
+%{__ln_s} libOpenCL.so.1.0.0 %{buildroot}%{nvidialibdir}/libOpenCL.so.1
+%{__ln_s} libOpenCL.so.1.0.0 %{buildroot}%{nvidialibdir}/libOpenCL.so
+# cuda libs
+%{__ln_s} libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so.1
+%{__ln_s} libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so
+
 %ifarch x86_64
 for libname in libGLcore libGL libnvidia-cfg libnvidia-tls tls/libnvidia-tls; do
     %{__ln_s} `basename ${libname}`.so.%{version} \
@@ -188,6 +198,12 @@ for libname in libGLcore libGL libnvidia-cfg libnvidia-tls tls/libnvidia-tls; do
     %{__ln_s} `basename ${libname}`.so.%{version} \
         %{buildroot}%{nvidialib32dir}/${libname}.so
 done
+# OpenCL
+%{__ln_s} libOpenCL.so.1.0.0 %{buildroot}%{nvidialib32dir}/libOpenCL.so.1
+%{__ln_s} libOpenCL.so.1.0.0 %{buildroot}%{nvidialib32dir}/libOpenCL.so
+# cuda libs
+%{__ln_s} libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialib32dir}/libcuda.so.1
+%{__ln_s} libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialib32dir}/libcuda.so
 %endif
 
 # libXvMCNVIDIA
@@ -195,38 +211,40 @@ done
     $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA.so
 %{__ln_s} libXvMCNVIDIA.so.%{version} \
     $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA_dynamic.so.1
-# cuda libs
-%{__ln_s} libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so.1
-%{__ln_s} libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so
 
 # Install cuda headers
 %{__mkdir_p} %{buildroot}%{_includedir}/cuda
-%{__install} -p -m 0755 usr/include/cuda/* \
+%{__install} -p -m 0755 cuda*.h \
     %{buildroot}%{_includedir}/cuda
 
+# Install OpenCL headers
+%{__mkdir_p} %{buildroot}%{_includedir}/CL
+%{__install} -p -m 0755 cl*.h \
+    %{buildroot}%{_includedir}/CL
+
 # Install useful nvidia tools
 %{__mkdir_p} %{buildroot}%{_bindir}/
-%{__install} -p -m 0755 usr/bin/{nvidia-bug-report.sh,nvidia-settings} \
+%{__install} -p -m 0755 {nvidia-bug-report.sh,nvidia-settings,nvidia-smi} \
     %{buildroot}%{_bindir}/
 %{__mkdir_p} %{buildroot}%{_sbindir}/
-%{__install} -p -m 0755 usr/bin/nvidia-xconfig \
+%{__install} -p -m 0755 nvidia-xconfig \
     %{buildroot}%{_sbindir}/
 
 # Install man pages (the other, nvidia-installer, isn't relevant)
 %{__mkdir_p} %{buildroot}%{_mandir}/man1/
-%{__install} -p -m 0644 usr/share/man/man1/nvidia-{settings,xconfig}* \
+%{__install} -p -m 0644 nvidia-{settings,xconfig,smi}* \
     %{buildroot}%{_mandir}/man1/
 
 # Install pixmap for the desktop entry
 %{__mkdir_p} %{buildroot}%{_datadir}/pixmaps/
-%{__install} -p -m 0644 usr/share/pixmaps/nvidia-settings.png \
+%{__install} -p -m 0644 nvidia-settings.png \
     %{buildroot}%{_datadir}/pixmaps/
 
 # Remove "__UTILS_PATH__/" before the Exec command name
 # Replace "__PIXMAP_PATH__/" with the proper pixmaps path
 %{__perl} -pi -e 's|(Exec=).*/(.*)|$1$2|g;
                   s|(Icon=).*/(.*)|$1%{_datadir}/pixmaps/$2|g' \
-    usr/share/applications/nvidia-settings.desktop
+    nvidia-settings.desktop
 
 # Desktop entry for nvidia-settings
 %{__mkdir_p} %{buildroot}%{_datadir}/applications/
@@ -235,7 +253,7 @@ desktop-file-install --vendor %{desktop_vendor} \
     --add-category System \
     --add-category Application \
     --add-category GNOME \
-    usr/share/applications/nvidia-settings.desktop
+    nvidia-settings.desktop
 
 # Install modprobe.d file
 %{__install} -D -p -m 0644 %{SOURCE5} \
@@ -307,7 +325,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE usr/share/doc/*
+%doc LICENSE NVIDIA_Changelog README.txt html/
 # Kernel and dkms related bits
 %config %{_sysconfdir}/modprobe.d/nvidia.conf
 %config %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
@@ -339,6 +357,8 @@ fi
 %{nvidialibdir}/*.so
 %dir %{_includedir}/cuda/
 %{_includedir}/cuda/*
+%dir %{_includedir}/CL/
+%{_includedir}/CL/*
 %{_libdir}/vdpau/*
 
 %ifarch x86_64
@@ -356,6 +376,13 @@ fi
 
 
 %changelog
+* Tue Oct 12 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 256.53-1
+- update to 256.53
+
+* Thu Aug 19 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 256.44-1
+- update to 256.44
+- add OpenCL libs and headers
+
 * Wed Apr 28 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 195.36.24-1
 - update to 195.36.24