%endif
%define no_install_post_check_so 1
-%define rel 9
+%define rel 8
%define pname xorg-driver-video-nvidia
Summary: Linux Drivers for nVidia GeForce/Quadro Chips
Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez
Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro
-Name: %{pname}
-Version: 290.10
+Name: %{pname}%{_alt_kernel}
+Version: 310.32
Release: %{rel}
Epoch: 1
License: nVidia Binary
Group: X11
-Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
-# Source0-md5: 50319a4b3818c12c9c7243525e0e6316
-Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5: cebfba9a7e91716a06c66bb5b38d9661
+Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
+# Source0-md5: 219608da023a318e2c023497e5ba9296
+Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
+# Source1-md5: 2e9a8aeb74c17df70376fd59ff1c4125
Source2: %{pname}-xinitrc.sh
Source3: gl.pc.in
Source4: 10-nvidia.conf
BuildConflicts: XFree86-nvidia
Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
Requires: xorg-xserver-server
-Requires: xorg-xserver-server(videodrv-abi) <= 11.0
+Requires: xorg-xserver-server(videodrv-abi) <= 13.1
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
Provides: xorg-driver-video
Provides: xorg-xserver-module(glx)
Obsoletes: XFree86-nvidia
Conflicts: XFree86-OpenGL-devel <= 4.2.0-3
ExclusiveArch: %{ix86} %{x8664}
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
-%define _noautoreqdep libGL.so.1
+%define _noautoreqdep libGL.so.1 libnvcuvid.so
+# libnvidia-encode.so.*.* links with libnvcuvid.so instead of libnvcuvid.so.1
+%define _noautoreq libnvcuvid.so
%description
This driver set adds improved 2D functionality to the Xorg X server as
Pliki nagłówkowe OpenGL (tylko GL i GLX) dla implementacji OpenGL
firmy NVIDIA.
-%package static
-Summary: Static XvMCNVIDIA library
-Summary(hu.UTF-8): Statikus XwMCNVIDIA könyvtár
-Summary(pl.UTF-8): Statyczna biblioteka XvMCNVIDIA
-Group: X11/Development/Libraries
-Requires: %{pname}-devel = %{epoch}:%{version}-%{rel}
-
-%description static
-Static XvMCNVIDIA library.
-
-%description static -l hu.UTF-8
-Statikus XwMCNVIDIA könyvtár.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka XvMCNVIDIA.
-
%package doc
Summary: Documentation for NVIDIA Graphics Driver
Group: Documentation
Summary(hu.UTF-8): Eszközök az nVidia grafikus kártyák beállításához
Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia
Group: Applications/System
-Requires: %{pname} = %{epoch}:%{version}-%{rel}
+Requires: %{pname} = %{epoch}:%{version}
Suggests: pkgconfig
Obsoletes: XFree86-driver-nvidia-progs
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
%{?with_dist_kernel:%requires_releq_kernel}
-Requires: %{pname} = %{epoch}:%{version}-%{rel}
+Requires: %{pname} = %{epoch}:%{version}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
$RPM_BUILD_ROOT%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d}
install -p nvidia-{settings,smi,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir}
-cp -p nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1
+install -p nvidia-cuda-proxy-{control,server} $RPM_BUILD_ROOT%{_bindir}
+cp -p nvidia-{settings,smi,xconfig,cuda-proxy-control}.* $RPM_BUILD_ROOT%{_mandir}/man1
cp -p nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir}
cp -p nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
for f in \
libGL.so.%{version} \
libOpenCL.so.1.0.0 \
- libXvMCNVIDIA.so.%{version} \
libcuda.so.%{version} \
libnvcuvid.so.%{version} \
libnvidia-cfg.so.%{version} \
libnvidia-compiler.so.%{version} \
+ libnvidia-encode.so.%{version} \
libnvidia-glcore.so.%{version} \
libnvidia-ml.so.%{version} \
+ libnvidia-opencl.so.%{version} \
tls/libnvidia-tls.so.%{version} \
; do
install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia
done
-cp -a libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}/nvidia
install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
install -p libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia
ln -s libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so
-install -p nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers
+install -p nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version}
+ln -s nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
install -p libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia
ln -s libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so
ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1
ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so
ln -sf libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenCL.so
-ln -sf libXvMCNVIDIA_dynamic.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA.so
ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libcuda.so
ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvcuvid.so
%endif
%files
%defattr(644,root,root,755)
%doc LICENSE NVIDIA_Changelog README.txt
+%dir %{_libdir}/xorg/modules/extensions/nvidia
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.1
-%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so.1
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglx.so.*
-%attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/nvidia/libglx.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglx.so
+%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.*
%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so
%{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf
%{_sysconfdir}/X11/xorg.conf.d/10-nvidia-modules.conf
%attr(755,root,root) %{_libdir}/nvidia/libOpenCL.so.*.*
%attr(755,root,root) %ghost %{_libdir}/nvidia/libOpenCL.so.1
%attr(755,root,root) %{_libdir}/nvidia/libOpenCL.so
-%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.*
-%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so
-%attr(755,root,root) %ghost %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
%attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.*
%attr(755,root,root) %ghost %{_libdir}/nvidia/libcuda.so.1
%attr(755,root,root) %{_libdir}/nvidia/libcuda.so
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-cfg.so.1
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-compiler.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-encode.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-encode.so.1
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-glcore.so.*.*
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ml.so.*.*
%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ml.so.1
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-opencl.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-opencl.so.1
%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
%attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.*
%attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1
%attr(755,root,root) %{_libdir}/nvidia/libGL.so
%{_pkgconfigdir}/gl.pc
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/nvidia/libXvMCNVIDIA.a
-
%files doc
%defattr(644,root,root,755)
%doc html/*
%files progs
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh
+%attr(755,root,root) %{_bindir}/nvidia-cuda-proxy-control
+%attr(755,root,root) %{_bindir}/nvidia-cuda-proxy-server
%attr(755,root,root) %{_bindir}/nvidia-settings
%attr(755,root,root) %{_bindir}/nvidia-smi
%attr(755,root,root) %{_bindir}/nvidia-xconfig
projects / packages / xorg-driver-video-nvidia.git / blobdiff