|
@@ -7,11 +7,12 @@
|
|
|
Summary: Proprietary NVIDIA hardware accelerated display driver
|
|
|
Summary(ja): プロプライエタリな NVIDIA ハードウエアアクセラレーションディスプレイドライバ
|
|
|
Name: xorg-x11-drv-nvidia
|
|
|
-Version: 185.18.36
|
|
|
-Release: 1%{?_dist_release}
|
|
|
+Version: 195.36.08
|
|
|
+Release: 2%{?_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
|
|
|
# x86_64
|
|
@@ -21,6 +22,8 @@ Source3: nvidia.csh
|
|
|
Source4: nvidia-config-display
|
|
|
Source5: nvidia.modprobe
|
|
|
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
|
|
|
|
|
@@ -31,11 +34,13 @@ Requires(post): dkms, /sbin/ldconfig
|
|
|
Requires(preun): dkms
|
|
|
# Required by the nvidia-config-display utility/script
|
|
|
Requires: pyxf86config
|
|
|
+Requires: libvdpau >= 0.4
|
|
|
+
|
|
|
# Required by the NVIDIA run file
|
|
|
Buildrequires: tar
|
|
|
# Required for our build
|
|
|
BuildRequires: desktop-file-utils
|
|
|
-ExclusiveArch: i386 x86_64
|
|
|
+ExclusiveArch: i686 x86_64
|
|
|
|
|
|
Provides: dkms-nvidia = %{version}-%{release}
|
|
|
Provides: nvidia-x11-drv = %{version}-%{release}
|
|
@@ -80,7 +85,7 @@ Compatibility 32bit files for the 64bit Proprietary NVIDIA driver.
|
|
|
%setup -q -T -c
|
|
|
# Extract the proper "sources" for the current architecture
|
|
|
# We need to extract to a "not yet existing" directory first, so no "."
|
|
|
-%ifarch i386
|
|
|
+%ifarch i686
|
|
|
sh %{SOURCE0} --extract-only --target tmp/
|
|
|
%endif
|
|
|
%ifarch x86_64
|
|
@@ -145,14 +150,28 @@ EOF
|
|
|
%{buildroot}%{nvidialibdir}/
|
|
|
%{__install} -p -m 0755 usr/lib/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/
|
|
|
+%{__ln_s} -f libvdpau_nvidia.so.%{version} \
|
|
|
+ %{buildroot}%{_libdir}/vdpau/libvdpau_nvidia.so.1
|
|
|
|
|
|
%ifarch x86_64
|
|
|
-# Install 32bit compat GL and tls libs
|
|
|
+# 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} \
|
|
|
%{buildroot}%{nvidialib32dir}/tls/
|
|
|
+%{__mkdir_p} %{buildroot}%{_prefix}/lib/vdpau/
|
|
|
+%{__install} -p -m 0755 usr/lib32/vdpau/libvdpau_nvidia.* \
|
|
|
+ %{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}
|
|
|
%endif
|
|
|
|
|
|
# Create .so symlinks
|
|
@@ -179,18 +198,11 @@ done
|
|
|
# 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
|
|
|
-# vdpau
|
|
|
-%{__ln_s} libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libvdpau_nvidia.so
|
|
|
-%{__ln_s} libvdpau.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libvdpau.so.1
|
|
|
-%{__ln_s} libvdpau.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libvdpau.so
|
|
|
-%{__ln_s} libvdpau_trace.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libvdpau_trace.so
|
|
|
-
|
|
|
-# Install cuda and vdpau headers
|
|
|
-%{__mkdir_p} %{buildroot}%{_includedir}/{cuda,vdpau}
|
|
|
+
|
|
|
+# Install cuda headers
|
|
|
+%{__mkdir_p} %{buildroot}%{_includedir}/cuda
|
|
|
%{__install} -p -m 0755 usr/include/cuda/* \
|
|
|
%{buildroot}%{_includedir}/cuda
|
|
|
-%{__install} -p -m 0755 usr/include/vdpau/* \
|
|
|
- %{buildroot}%{_includedir}/vdpau
|
|
|
|
|
|
# Install useful nvidia tools
|
|
|
%{__mkdir_p} %{buildroot}%{_bindir}/
|
|
@@ -229,6 +241,10 @@ desktop-file-install --vendor %{desktop_vendor} \
|
|
|
%{__install} -D -p -m 0644 %{SOURCE5} \
|
|
|
%{buildroot}%{_sysconfdir}/modprobe.d/nvidia.conf
|
|
|
|
|
|
+# Install blacklist-nouveau.conf
|
|
|
+%{__install} -D -p -m 0644 %{SOURCE7} \
|
|
|
+ %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
|
|
|
+
|
|
|
# Install ld.so.conf.d file
|
|
|
%{__mkdir_p} %{buildroot}%{_sysconfdir}/ld.so.conf.d/
|
|
|
echo %{nvidialibdir} > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia.conf
|
|
@@ -250,6 +266,10 @@ echo %{nvidialib32dir} >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia.conf
|
|
|
%{__install} -D -p -m 0644 %{SOURCE6} \
|
|
|
%{buildroot}%{_sysconfdir}/udev/makedev.d/60-nvidia.nodes
|
|
|
|
|
|
+# Install udev rules
|
|
|
+%{__install} -D -p -m 0644 %{SOURCE8} \
|
|
|
+ %{buildroot}%{_sysconfdir}/udev/rules.d/50-nvidia.rules
|
|
|
+
|
|
|
|
|
|
%clean
|
|
|
%{__rm} -rf %{buildroot}
|
|
@@ -290,9 +310,12 @@ fi
|
|
|
%doc LICENSE usr/share/doc/*
|
|
|
# Kernel and dkms related bits
|
|
|
%config %{_sysconfdir}/modprobe.d/nvidia.conf
|
|
|
+%config %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
|
|
|
%{_usrsrc}/%{dkms_name}-%{dkms_vers}/
|
|
|
# udev "configuration"
|
|
|
%config %{_sysconfdir}/udev/makedev.d/60-nvidia.nodes
|
|
|
+# udev rules
|
|
|
+%config %{_sysconfdir}/udev/rules.d/50-nvidia.rules
|
|
|
# Libraries and X modules
|
|
|
%config %{_sysconfdir}/ld.so.conf.d/nvidia.conf
|
|
|
%dir %{nvidialibdir}/
|
|
@@ -316,8 +339,7 @@ fi
|
|
|
%{nvidialibdir}/*.so
|
|
|
%dir %{_includedir}/cuda/
|
|
|
%{_includedir}/cuda/*
|
|
|
-%dir %{_includedir}/vdpau/
|
|
|
-%{_includedir}/vdpau/*
|
|
|
+%{_libdir}/vdpau/*
|
|
|
|
|
|
%ifarch x86_64
|
|
|
%files 32bit
|
|
@@ -325,6 +347,7 @@ fi
|
|
|
%dir %{nvidialib32dir}/
|
|
|
%{nvidialib32dir}/*.so.*
|
|
|
%{nvidialib32dir}/tls/
|
|
|
+%{_prefix}/lib/vdpau/*
|
|
|
# Not needed devel but would violate the license not to include them
|
|
|
#files 32bit-devel
|
|
|
#defattr(-,root,root,-)
|
|
@@ -333,6 +356,29 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Mar 28 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 195.36.08-2
|
|
|
+- rebuild with xserver-1.8rc
|
|
|
+
|
|
|
+* Thu Mar 04 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 195.36.08-1
|
|
|
+- update to 195.36.08
|
|
|
+- add blacklist-nouveau.conf to avoid loading nouveau drm driver.
|
|
|
+- add udev rules to set permission of nvidia/nvidiactl device nodes
|
|
|
+ - VDPAU needs to access nvidia/nvidiactl device
|
|
|
+
|
|
|
+* Mon Feb 08 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 195.30-2
|
|
|
+- use libvdpau external library
|
|
|
+ - add R: libvdpau >= 0.4
|
|
|
+ - remove vdpau headers and libraries
|
|
|
+
|
|
|
+* Tue Jan 26 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 195.30-1
|
|
|
+- update to new beta driver
|
|
|
+
|
|
|
+* Thu Nov 05 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 190.42-1
|
|
|
+- new upstream release
|
|
|
+
|
|
|
+* Mon Sep 21 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 190.32-1
|
|
|
+- update to new beta driver to work with 2.6.31+ kernel
|
|
|
+
|
|
|
* Tue Aug 25 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 185.18.36-1
|
|
|
- new upstream release
|
|
|
|