X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=4cd54639fb1b49edc364f1e40c7b476f2d943f23;hp=2cd57e9047f89756ca73864339ea34a7cbabf678;hb=60ac3a7b31c054867b9f76add4190394e02e9bdf;hpb=14b704ec071198f63f793c6c18d028b24845ce71 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 2cd57e9..4cd5463 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -20,21 +20,21 @@ %endif %define no_install_post_check_so 1 -%define rel 3 +%define rel 6 %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}%{_alt_kernel} -Version: 304.64 +Version: 310.19 Release: %{rel} Epoch: 1 License: nVidia Binary Group: X11 Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run -# Source0-md5: 6964415cf648a5f4f38117b168369de2 +# Source0-md5: 2adbdd38540b3a8955714760e05f575d Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 76007ed4b72afd334e26377b646f5f7e +# Source1-md5: 0ba08d32852e442ebba5ba22c7abed36 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf @@ -51,7 +51,7 @@ BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 13.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) @@ -61,7 +61,9 @@ Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 ExclusiveArch: %{ix86} %{x8664} 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 @@ -141,22 +143,6 @@ OpenGL fejléc fájlok (csak GL és GLX) NVIDIA OpenGL implementációhoz. 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 @@ -247,7 +233,8 @@ install -d $RPM_BUILD_ROOT%{_libdir}/{nvidia,xorg/modules/{drivers,extensions/nv $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 @@ -260,19 +247,19 @@ sed -i -e 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-nvi 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 @@ -301,7 +288,6 @@ echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf 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 @@ -364,9 +350,6 @@ EOF %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 @@ -376,9 +359,13 @@ EOF %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 @@ -393,10 +380,6 @@ EOF %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/* @@ -404,6 +387,8 @@ EOF %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