X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=xorg-driver-video-nvidia.spec;h=131824e4574f39009ab67e9a4e89907d2ef98566;hb=650ea027e913e6ff2cde34a90958b3be9df9e6ff;hp=066e8c8603e589c4aa12dac6c6025ccaacfe369e;hpb=054fcee3dc1e230317505fac58f922b1de96caee;p=packages%2Fxorg-driver-video-nvidia.git diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 066e8c8..131824e 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -25,21 +25,21 @@ %define no_install_post_check_so 1 %define pname xorg-driver-video-nvidia -%define rel 6%{?with_multigl:.mgl} +%define rel 1%{?with_multigl:.mgl} 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: 270.30 +Version: 275.09.07 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: ff319212b9ac52d645df31027c31ee45 +# Source0-md5: d779057af3a2f96a05ddda201606618b Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 2fa08295aa0d0ea21646bdc9630c5116 +# Source1-md5: f75df248f7bf32199ed88db2f080cbfa Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Patch0: X11-driver-nvidia-GL.patch @@ -265,21 +265,24 @@ cp -a nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh install -p nvidia.icd $RPM_BUILD_ROOT/etc/OpenCL/vendors +%if %{without multigl} +install -p libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir} +%else +install -p libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia +%endif + 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-glcore.so.%{version} \ libnvidia-ml.so.%{version} \ tls/libnvidia-tls.so.%{version} \ ; do -%if %{without multigl} install -p $f $RPM_BUILD_ROOT%{_libdir} -%else - install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia -%endif done /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} @@ -306,19 +309,11 @@ echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf # OpenGL ABI for Linux compatibility ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1 ln -sf nvidia/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so - -ln -sf libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenCL.so.1 -ln -sf nvidia/libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so - -ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1 -ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so - -ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so -ln -sf nvidia/libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so.%{version} %else # OpenGL ABI for Linux compatibility ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so +%endif ln -sf libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so.1 ln -sf libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so @@ -328,7 +323,9 @@ ln -sf libXvMCNVIDIA_dynamic.so.1 $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1 ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so -%endif + +ln -sf libnvcuvid.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libnvcuvid.so.1 +ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/libnvcuvid.so %endif %if %{with kernel} @@ -397,26 +394,13 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so %dir %{_libdir}/nvidia %attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 -%attr(755,root,root) %{_libdir}/libOpenCL.so -%attr(755,root,root) %{_libdir}/nvidia/libOpenCL.so.*.* -%attr(755,root,root) %ghost %{_libdir}/nvidia/libOpenCL.so.1 -%attr(755,root,root) %{_libdir}/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}/libcuda.so -%attr(755,root,root) %ghost %{_libdir}/libcuda.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-glcore.so.*.* -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ml.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libnvidia-ml.so.1 -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.* %else %attr(755,root,root) %{_libdir}/libGL.so.*.* %attr(755,root,root) %ghost %{_libdir}/libGL.so.1 # symlink for binary apps which fail to conform Linux OpenGL ABI # (and dlopen libGL.so instead of libGL.so.1) %attr(755,root,root) %{_libdir}/libGL.so +%endif %attr(755,root,root) %{_libdir}/libOpenCL.so %attr(755,root,root) %{_libdir}/libOpenCL.so.*.* %attr(755,root,root) %ghost %{_libdir}/libOpenCL.so.1 @@ -426,13 +410,16 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so %attr(755,root,root) %{_libdir}/libcuda.so %attr(755,root,root) %ghost %{_libdir}/libcuda.so.1 %attr(755,root,root) %{_libdir}/libcuda.so.*.* +%attr(755,root,root) %{_libdir}/libnvcuvid.so +%attr(755,root,root) %ghost %{_libdir}/libnvcuvid.so.1 +%attr(755,root,root) %{_libdir}/libnvcuvid.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.* %attr(755,root,root) %ghost %{_libdir}/libnvidia-cfg.so.1 +%attr(755,root,root) %{_libdir}/libnvidia-compiler.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-glcore.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-ml.so.*.* %attr(755,root,root) %ghost %{_libdir}/libnvidia-ml.so.1 %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.* -%endif %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.* %attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1