Browse Source

* xorg-x11-drv-nvidia
- new upstream release


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

shaolin 10 years ago
parent
commit
57ab2df1ac
1 changed files with 48 additions and 4 deletions
  1. 48 4
      nonfree/xorg-x11-drv-nvidia/xorg-x11-drv-nvidia-vl.spec

+ 48 - 4
nonfree/xorg-x11-drv-nvidia/xorg-x11-drv-nvidia-vl.spec

@@ -7,8 +7,8 @@
 Summary: Proprietary NVIDIA hardware accelerated display driver
 Summary(ja): プロプライエタリな NVIDIA ハードウエアアクセラレーションディスプレイドライバ
 Name: xorg-x11-drv-nvidia
-Version: 310.32
-Release: 2%{?_dist_release}
+Version: 319.49
+Release: 1%{?_dist_release}
 License: Redistributable, no modification permitted
 Group: User Interface/X Hardware Support
 URL: http://www.nvidia.com/object/unix.html
@@ -47,6 +47,8 @@ Provides: dkms-nvidia = %{version}-%{release}
 Provides: nvidia-x11-drv = %{version}-%{release}
 Obsoletes: nvidia-x11-drv <= 180.51-2vl5
 
+Requires(post): system-config-display
+
 %ifarch x86_64
 %define mark64  ()(64bit)
 %endif
@@ -166,6 +168,14 @@ done
     %{buildroot}%{_libdir}/vdpau/libvdpau_nvidia.so.1
 %{__ln_s} -f libvdpau_nvidia.so.%{version} \
     %{buildroot}%{_libdir}/vdpau/libvdpau_nvidia.so
+# compat links
+%{__ln_s} -f %{_libdir}/vdpau/libvdpau_nvidia.so.%{version} \
+    %{buildroot}%{_libdir}/nvidia/libvdpau_nvidia.so.%{version}
+%{__ln_s} -f %{_libdir}/vdpau/libvdpau_nvidia.so.1 \
+    %{buildroot}%{_libdir}/nvidia/libvdpau_nvidia.so.1
+%{__ln_s} -f %{_libdir}/vdpau/libvdpau_nvidia.so \
+    %{buildroot}%{_libdir}/nvidia/libvdpau_nvidia.so
+
 
 %ifarch x86_64
 # Install 32bit compat GL, vdpau and tls libs
@@ -223,15 +233,27 @@ done
 %{__mkdir_p} %{buildroot}%{_bindir}/
 %{__install} -p -m 0755 nvidia-{bug-report.sh,debugdump,settings,smi} \
     %{buildroot}%{_bindir}/
-%{__install} -p -m 0755 nvidia-cuda-{proxy-control,proxy-server} \
+%{__install} -p -m 0755 nvidia-cuda-{mps-control,mps-server} \
     %{buildroot}%{_bindir}/
 %{__mkdir_p} %{buildroot}%{_sbindir}/
 %{__install} -p -m 0755 nvidia-xconfig \
     %{buildroot}%{_sbindir}/
 
+# Install nvidia-persistenced
+%{__install} -p -m 0755 nvidia-persistenced \
+    %{buildroot}%{_bindir}/
+tar xzvf nvidia-persistenced-init.tar.bz2
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/init
+sed -e 's/__USER__/nvidia-persistenced/g' \
+    nvidia-persistenced-init/upstart/nvidia-persistenced.conf.template \
+    > %{buildroot}%{_sysconfdir}/init/nvidia-persistenced.conf
+%{__mkdir_p} %{buildroot}/var/run/nvidia-persistenced
+
 # Install man pages (the other, nvidia-installer, isn't relevant)
 %{__mkdir_p} %{buildroot}%{_mandir}/man1/
-%{__install} -p -m 0644 nvidia-{cuda-proxy-control,settings,xconfig,smi}.1* \
+%{__install} -p -m 0644 nvidia-{cuda-mps-control,settings,xconfig,smi}.1* \
+    %{buildroot}%{_mandir}/man1/
+%{__install} -p -m 0644 nvidia-persistenced.1* \
     %{buildroot}%{_mandir}/man1/
 
 # Install pixmap for the desktop entry
@@ -292,6 +314,13 @@ echo %{nvidialib32dir} >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia.conf
 %{__rm} -rf %{buildroot}
 
 
+%pre
+# create nvidia-persistenced user
+/usr/sbin/useradd -c "nvidia-persistenced" \
+		  -s /sbin/nologin -r -M \
+                  -d /var/run/nvidia-persistenced \
+		  nvidia-persistenced 2> /dev/null || :
+
 %post
 /sbin/ldconfig
 # Make sure we have a Files section in xorg.conf, otherwise create an empty one
@@ -390,6 +419,8 @@ fi
 #%dir %{_includedir}/CL/
 #%{_includedir}/CL/*
 %{_libdir}/vdpau/*
+%{_sysconfdir}/init/nvidia-persistenced.conf
+%dir /var/run/nvidia-persistenced
 
 %ifarch x86_64
 %files 32bit
@@ -406,6 +437,19 @@ fi
 
 
 %changelog
+* Sun Sep 22 2013 MATSUBAYASHI Kohji <shaolin@vinelinux.org> 319.49-1
+- updated to 319.49
+
+* Sun May 26 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 319.23-2
+- add vdpau driver symlink to _libdir/nvidia
+
+* Sat May 25 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 319.23-1
+- update to 319.23
+
+* Mon May 13 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 319.17-1
+- update to 319.17
+- "nvidia-config-display disable" use nouveau driver if available
+
 * Fri Feb 15 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 310.32-2
 - add patch0 to build for kernel > 3.7.5