xorg-x11-drv-nvidia: update to 331.20

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

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

@@ -129,6 +129,7 @@ if arg != "enable" and arg != "disable":
 # Backup original X config file to .backup-nvidia
 backup_file = None
 output_file = xconfigpath
+driver_dir = TOP_MOD_DIR + "/drivers/"
 if output_file != None and os.access(output_file, os.F_OK):
     backup_file = output_file + ".backup-nvidia"
     try:
@@ -145,11 +146,17 @@ try:
         # Add nvidia module path and change driver to 'nvidia'
         addModulePath(xconfig.files, "/extensions/nvidia")
         toggleDriver(xconfig.device, "nv", "nvidia")
+        toggleDriver(xconfig.device, "nouveau", "nvidia")
     elif (arg == "disable"):
         # Disable nvidia driver:
         # Remove nvidia module path and change driver to 'nv'
         removeModulePath(xconfig.files, "/extensions/nvidia")
-        toggleDriver(xconfig.device, "nvidia", "nv")
+        if os.access(driver_dir+"nouveau_drv.so", os.F_OK):
+            toggleDriver(xconfig.device, "nvidia", "nouveau")
+        elif os.access(driver_dir+"nv_drv.so", os.F_OK):
+            toggleDriver(xconfig.device, "nvidia", "nv")
+        else:
+            toggleDriver(xconfig.device, "nvidia", "vesa")
     else:
         # This shouldn't happen, but we handle it anyway
         raise

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: 319.60
+Version: 331.20
 Release: 1%{?_dist_release}
 License: Redistributable, no modification permitted
 Group: User Interface/X Hardware Support
@@ -25,9 +25,6 @@ Source6: nvidia.nodes
 Source7: blacklist-nouveau.conf
 Source8: 50-nvidia.rules
 
-# fix to build for kernel > 3.7.5
-Patch0: nvidia-310.32-support-newer-kernel.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 # Required for proper dkms operation
 Requires: gcc, make
@@ -108,8 +105,6 @@ sh %{SOURCE1} --extract-only --target tmp/
 %{__mv} tmp/* .
 %{__rm} -rf tmp/
 
-%patch0 -p0
-
 
 %build
 
@@ -124,19 +119,16 @@ sh %{SOURCE1} --extract-only --target tmp/
 # Copy dkms conf file
 %{__mkdir_p} %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 %{__cat} > %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/dkms.conf << 'EOF'
-PACKAGE_NAME=%{dkms_name}
-PACKAGE_VERSION=%{dkms_vers}
-MAKE[0]="make module KERNDIR=/lib/modules/$kernelver IGNORE_CC_MISMATCH=1 SYSSRC=$kernel_source_dir"
-BUILT_MODULE_NAME[0]=nvidia
-DEST_MODULE_LOCATION[0]=/kernel/drivers/video/nvidia
+PACKAGE_NAME="nvidia"
+PACKAGE_VERSION="%{dkms_vers}"
+MAKE[0]="make module KERNEL_UNAME=${kernelver} KERNDIR=/lib/modules/${kernelver} IGNORE_CC_MISMATCH=1 SYSSRC=$kernel_source_dir"
+BUILT_MODULE_NAME[0]="nvidia"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video/nvidia"
 AUTOINSTALL=YES
 EOF
 
 # Install all the files, even the binary ones. Ick.
-%{__install} -p -m 0644 kernel/{*.c,*.h,*.o,makefile,Makefile.kbuild} \
-    %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
-%{__install} -p -m 0755 kernel/*.sh \
-    %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
+cp -a kernel/* %{buildroot}%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
 
 # Install X driver and extension
 %{__mkdir_p} %{buildroot}%{_libdir}/xorg/modules/drivers/
@@ -152,7 +144,8 @@ EOF
 %{__mkdir_p} %{buildroot}%{nvidialibdir}/tls/
 for l in libGL libOpenCL libcuda libnvcuvid \
          libnvidia-cfg libnvidia-compiler libnvidia-encode \
-	 libnvidia-glcore libnvidia-ml libnvidia-opencl \
+	 libnvidia-fbc libnvidia-glcore libnvidia-ifr \
+	 libnvidia-ml libnvidia-opencl \
 	 libnvidia-tls libnvidia-wfb libvdpau
 do
   %{__install} -p -m 0755 $l.so.* %{buildroot}%{nvidialibdir}/
@@ -180,9 +173,11 @@ done
 %ifarch x86_64
 # Install 32bit compat GL, vdpau and tls libs
 %{__mkdir_p} %{buildroot}%{nvidialib32dir}/tls/
-for l in libGL libOpenCL libcuda libnvcuvid \
-         libnvidia-compiler libnvidia-encode \
-	 libnvidia-glcore libnvidia-ml libnvidia-opencl \
+for l in libEGL libGL libGLESv1_CM libGLESv2 \
+         libOpenCL libcuda libnvcuvid \
+         libnvidia-compiler libnvidia-eglcore libnvidia-encode \
+	 libnvidia-glcore libnvidia-glsi libnvidia-ifr \
+	 libnvidia-ml libnvidia-opencl \
 	 libnvidia-tls libvdpau
 do
   %{__install} -p -m 0755 32/$l.so.* %{buildroot}%{nvidialib32dir}/
@@ -214,9 +209,11 @@ done
 %{__ln_s} libOpenCL.so.1.0.0 %{buildroot}%{nvidialibdir}/libOpenCL.so
 
 %ifarch x86_64
-for libname in libGL libcuda libnvcuvid \
-         libnvidia-compiler libnvidia-encode \
-	 libnvidia-glcore libnvidia-ml libnvidia-opencl \
+for libname in libEGL libGL libGLESv1_CM libGLESv2 \
+         libcuda libnvcuvid \
+         libnvidia-compiler libnvidia-eglcore libnvidia-encode \
+	 libnvidia-glcore libnvidia-glsi libnvidia-ifr \
+	 libnvidia-ml libnvidia-opencl \
 	 libnvidia-tls libvdpau tls/libnvidia-tls
 do
     %{__ln_s} `basename ${libname}`.so.%{version} \
@@ -236,7 +233,7 @@ done
 %{__install} -p -m 0755 nvidia-cuda-{mps-control,mps-server} \
     %{buildroot}%{_bindir}/
 %{__mkdir_p} %{buildroot}%{_sbindir}/
-%{__install} -p -m 0755 nvidia-xconfig \
+%{__install} -p -m 0755 nvidia-xconfig nvidia-modprobe \
     %{buildroot}%{_sbindir}/
 
 # Install nvidia-persistenced
@@ -251,7 +248,7 @@ sed -e 's/__USER__/nvidia-persistenced/g' \
 
 # Install man pages (the other, nvidia-installer, isn't relevant)
 %{__mkdir_p} %{buildroot}%{_mandir}/man1/
-%{__install} -p -m 0644 nvidia-{cuda-mps-control,settings,xconfig,smi}.1* \
+%{__install} -p -m 0644 nvidia-{cuda-mps-control,settings,xconfig,modprobe,smi}.1* \
     %{buildroot}%{_mandir}/man1/
 %{__install} -p -m 0644 nvidia-persistenced.1* \
     %{buildroot}%{_mandir}/man1/
@@ -437,6 +434,9 @@ fi
 
 
 %changelog
+* Mon Nov 18 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 331.20-1
+- update to 331.20
+
 * Fri Oct 04 2013 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 319.60-1
 - updated to 319.60