%endif
%define pname xorg-driver-video-nvidia
-%define rel 3
+%define rel 2
Summary: Linux Drivers for nVidia GeForce/Quadro Chips
Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro
Name: %{pname}%{_alt_kernel}
-Version: 177.80
+Version: 180.22
Release: %{rel}%{?with_multigl:.mgl}
License: nVidia Binary
Group: X11
Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run
-# Source0-md5: 8fb8ba17b3a67683a7d05bce3f1d6d71
+# Source0-md5: bf6c44f82123a315244e04a5aede11ab
Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run
-# Source1-md5: d88720c6c4c8f1d1155b33e5c39bdbc4
+# Source1-md5: 6839441e92c2605327073d586c3077d9
Source2: %{pname}-xinitrc.sh
Patch0: X11-driver-nvidia-GL.patch
Patch1: X11-driver-nvidia-desktop.patch
Requires: xorg-xserver-server(videodrv-abi) <= 4.1
Provides: OpenGL = 2.1
Provides: OpenGL-GLX = 1.4
-Provides: xorg-xserver-libglx
+Provides: xorg-xserver-module(glx)
%if %{without multigl}
Obsoletes: Mesa
%endif
%if %{with userspace}
install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \
- $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir},%{_mandir}/man1} \
+ $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda,vdpau},%{_libdir},%{_bindir},%{_mandir}/man1} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d}
%if %{with multigl}
install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d}
usr/lib/tls/libnvidia-tls.so.%{version} \
usr/lib/libnvidia-cfg.so.%{version} \
usr/lib/libGL{,core}.so.%{version} \
+ usr/lib/libcuda.so.%{version} \
+ usr/lib/libvdpau{,_nvidia,_trace}.so.%{version} \
usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \
%if %{without multigl}
usr/X11R6/lib/libXvMCNVIDIA.a \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules
install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
+install usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda
+install usr/include/vdpau/*.h $RPM_BUILD_ROOT%{_includedir}/vdpau
ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
+
+ln -sf nvidia/libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so
+ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
%else
# OpenGL ABI for Linux compatibility
ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1
+
+ln -sf libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so
+ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
%endif
%endif
%attr(755,root,root) %{_libdir}/nvidia/libGLcore.so.*.*
%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.*
%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.*
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libvdpau.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libvdpau_nvidia.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libvdpau_trace.so.*.*
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.*
%ghost %{_libdir}/xorg/modules/extensions/libglx.so
%else
%attr(755,root,root) %{_libdir}/libGLcore.so.*.*
%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
%attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1
+%attr(755,root,root) %{_libdir}/libcuda.so.*.*
%attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*
%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*
+%attr(755,root,root) %{_libdir}/libvdpau.so.*.*
+%attr(755,root,root) %{_libdir}/libvdpau_nvidia.so.*.*
+%attr(755,root,root) %{_libdir}/libvdpau_trace.so.*.*
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so*
%endif
%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.*
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
+%attr(755,root,root) %{_libdir}/libcuda.so
+%attr(755,root,root) %{_libdir}/libvdpau.so
%dir %{_includedir}/GL
%{_includedir}/GL/gl.h
%{_includedir}/GL/glext.h
%{_includedir}/GL/glx.h
%{_includedir}/GL/glxext.h
+%{_includedir}/cuda
+%{_includedir}/vdpau
%if %{with multigl}
%attr(755,root,root) %{_libdir}/libGL.so
%endif