xorg-x11-drv-nvidia: update to 310.19

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

nonfree/xorg-x11-drv-nvidia/nvidia-config-display

@@ -16,6 +16,7 @@
 #
 # Copyright 2003, 2004 Peter Backlund
 
+import xf86config
 import ixf86config
 import string
 import os

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

@@ -7,7 +7,7 @@
 Summary: Proprietary NVIDIA hardware accelerated display driver
 Summary(ja): プロプライエタリな NVIDIA ハードウエアアクセラレーションディスプレイドライバ
 Name: xorg-x11-drv-nvidia
-Version: 304.64
+Version: 310.19
 Release: 1%{?_dist_release}
 License: Redistributable, no modification permitted
 Group: User Interface/X Hardware Support
@@ -46,6 +46,11 @@ Provides: dkms-nvidia = %{version}-%{release}
 Provides: nvidia-x11-drv = %{version}-%{release}
 Obsoletes: nvidia-x11-drv <= 180.51-2vl5
 
+%ifarch x86_64
+%define mark64  ()(64bit)
+%endif
+Provides: libnvcuvid.so%{?mark64}
+
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke
@@ -78,6 +83,7 @@ Summary(ja): 64bit プロプライエタリ NVIDIA ドライバ用の 32bit 互
 Group: User Interface/X Hardware Support
 Requires: %{name} = %{version}-%{release}
 Obsoletes: nvidia-x11-drv-32bit <= 180.51-2vl5
+Provides: libnvcuvid.so
 
 %description 32bit
 Compatibility 32bit files for the 64bit Proprietary NVIDIA driver.
@@ -128,13 +134,6 @@ EOF
 %{__install} -p -m 0755 kernel/*.sh \
     %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
-# Install libXvMCNVIDIA.*
-%{__mkdir_p} %{buildroot}%{nvidialibdir}/
-%{__install} -p -m 0755 libXvMCNVIDIA.so.* \
-    %{buildroot}%{nvidialibdir}/
-%{__install} -p -m 0644 libXvMCNVIDIA.a \
-    %{buildroot}%{nvidialibdir}/
-
 # Install X driver and extension
 %{__mkdir_p} %{buildroot}%{_libdir}/xorg/modules/drivers/
 %{__install} -p -m 0755 nvidia_drv.so \
@@ -147,8 +146,10 @@ EOF
 
 # Install GL and tls libs
 %{__mkdir_p} %{buildroot}%{nvidialibdir}/tls/
-for l in libGL libOpenCL libXvMCNVIDIA libcuda libnvcuvid \
-         libnvidia-cfg libnvidia-compiler libnvidia-glcore libnvidia-ml libnvidia-tls libnvidia-wfb
+for l in libGL libOpenCL libcuda libnvcuvid \
+         libnvidia-cfg libnvidia-compiler libnvidia-encode \
+	 libnvidia-glcore libnvidia-ml libnvidia-opencl \
+	 libnvidia-tls libnvidia-wfb libvdpau
 do
   %{__install} -p -m 0755 $l.so.* %{buildroot}%{nvidialibdir}/
 done
@@ -167,8 +168,10 @@ done
 %ifarch x86_64
 # Install 32bit compat GL, vdpau and tls libs
 %{__mkdir_p} %{buildroot}%{nvidialib32dir}/tls/
-for l in libGL libOpenCL libcuda \
-         libnvidia-compiler libnvidia-glcore libnvidia-tls
+for l in libGL libOpenCL libcuda libnvcuvid \
+         libnvidia-compiler libnvidia-encode \
+	 libnvidia-glcore libnvidia-ml libnvidia-opencl \
+	 libnvidia-tls libvdpau
 do
   %{__install} -p -m 0755 32/$l.so.* %{buildroot}%{nvidialib32dir}/
 done
@@ -184,8 +187,11 @@ done
 %endif
 
 # Create .so symlinks
-for libname in libGL libXvMCNVIDIA libcuda libnvcuvid \
-               libnvidia-cfg libnvidia-compiler libnvidia-glcore libnvidia-ml libnvidia-tls libnvidia-wfb tls/libnvidia-tls; do
+for libname in libGL libcuda libnvcuvid \
+         libnvidia-cfg libnvidia-compiler libnvidia-encode \
+	 libnvidia-glcore libnvidia-ml libnvidia-opencl \
+	 libnvidia-tls libnvidia-wfb libvdpau tls/libnvidia-tls
+do
     %{__ln_s} `basename ${libname}`.so.%{version} \
         %{buildroot}%{nvidialibdir}/${libname}.so.1
     %{__ln_s} `basename ${libname}`.so.%{version} \
@@ -196,8 +202,11 @@ done
 %{__ln_s} libOpenCL.so.1.0.0 %{buildroot}%{nvidialibdir}/libOpenCL.so
 
 %ifarch x86_64
-for libname in libGL libcuda \
-               libnvidia-compiler libnvidia-glcore libnvidia-tls tls/libnvidia-tls; do
+for libname in libGL libcuda libnvcuvid \
+         libnvidia-compiler libnvidia-encode \
+	 libnvidia-glcore libnvidia-ml libnvidia-opencl \
+	 libnvidia-tls libvdpau tls/libnvidia-tls
+do
     %{__ln_s} `basename ${libname}`.so.%{version} \
         %{buildroot}%{nvidialib32dir}/${libname}.so.1
     %{__ln_s} `basename ${libname}`.so.%{version} \
@@ -208,19 +217,11 @@ done
 %{__ln_s} libOpenCL.so.1.0.0 %{buildroot}%{nvidialib32dir}/libOpenCL.so
 %endif
 
-# Install cuda headers
-#%{__mkdir_p} %{buildroot}%{_includedir}/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 {nvidia-bug-report.sh,nvidia-settings,nvidia-smi} \
+%{__install} -p -m 0755 nvidia-{bug-report.sh,debugdump,settings,smi} \
+    %{buildroot}%{_bindir}/
+%{__install} -p -m 0755 nvidia-cuda-{proxy-control,proxy-server} \
     %{buildroot}%{_bindir}/
 %{__mkdir_p} %{buildroot}%{_sbindir}/
 %{__install} -p -m 0755 nvidia-xconfig \
@@ -228,7 +229,7 @@ done
 
 # Install man pages (the other, nvidia-installer, isn't relevant)
 %{__mkdir_p} %{buildroot}%{_mandir}/man1/
-%{__install} -p -m 0644 nvidia-{settings,xconfig,smi}* \
+%{__install} -p -m 0644 nvidia-{cuda-proxy-control,settings,xconfig,smi}.1* \
     %{buildroot}%{_mandir}/man1/
 
 # Install pixmap for the desktop entry
@@ -293,15 +294,21 @@ echo %{nvidialib32dir} >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia.conf
 /sbin/ldconfig
 # Make sure we have a Files section in xorg.conf, otherwise create an empty one
 XORGCONF=/etc/X11/xorg.conf
-for x in ${XORGCONF} ${XORGCONF}.dist ;do
-  if [ -f "$i" ]; then
-    [ -w $i ] && ! grep -q 'Section "Files"' $i && \
-        echo -e 'Section "Files"\nEndSection' >> $i
-    # Enable the proprietary driver
-    if (egrep -q "\"(nv|nvidia|nouveau)\"" $i); then
-      %{_sbindir}/nvidia-config-display enable || :
+if [ ! -f ${XORGCONF} ]; then
+  /usr/bin/system-config-display --reconfig --noui --set-driver=nvidia ||:
+fi
+for conf in ${XORGCONF} ${XORGCONF}.dist ;do
+  if [ -f $conf ]; then
+    if [ -w $conf ]; then
+      if (! grep -q 'Section "Files"' $conf); then
+        echo -e 'Section "Files"\nEndSection' >> $conf
+      fi
+      # Enable the proprietary driver
+      if (egrep -q "\"(nv|nvidia)\"" $conf); then
+        %{_sbindir}/nvidia-config-display enable || :
+      fi
+      break
     fi
-    break
   fi
 done
 # add nokmsboot to boot cmdline
@@ -339,6 +346,9 @@ fi
 %triggerin -- xorg-x11-server-Xorg
 # Enable the proprietary driver
 # Required since xorg-x11-server-Xorg empties the "Files" section
+if (! grep -q 'Section "Files"' /etc/X11/xorg.conf); then
+  echo -e 'Section "Files"\nEndSection' >> /etc/X11/xorg.conf
+fi
 %{_sbindir}/nvidia-config-display enable || :
 
 
@@ -372,7 +382,6 @@ fi
 # Not needed devel but would violate the license not to include them
 #files devel
 #defattr(-,root,root,-)
-%{nvidialibdir}/*.a
 %{nvidialibdir}/*.so
 #%dir %{_includedir}/cuda/
 #%{_includedir}/cuda/*
@@ -395,6 +404,9 @@ fi
 
 
 %changelog
+* Wed Nov 21 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 310.19-1
+- update to 310.19
+
 * Thu Nov 08 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 304.64-1
 - update to 304.64