X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=066e8c8603e589c4aa12dac6c6025ccaacfe369e;hp=2bd155342cc98fa9f81b9fcf28913504d6f66ee0;hb=054fcee3dc1e230317505fac58f922b1de96caee;hpb=728b85557131730f66fecf2b73b7f188edba4a9b diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 2bd1553..066e8c8 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 1%{?with_multigl:.mgl} +%define rel 6%{?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: 260.19.29 +Version: 270.30 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: e982a05a85c68130acfe1d48086250e3 -Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 0583668d86f7318d99def3ed3e1cc4bc +Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run +# Source0-md5: ff319212b9ac52d645df31027c31ee45 +Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run +# Source1-md5: 2fa08295aa0d0ea21646bdc9630c5116 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Patch0: X11-driver-nvidia-GL.patch @@ -54,7 +54,7 @@ BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 8.0 +Requires: xorg-xserver-server(videodrv-abi) <= 10.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia @@ -251,7 +251,9 @@ rm -rf $RPM_BUILD_ROOT %if %{with userspace} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ - $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} + $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \ + $RPM_BUILD_ROOT/etc/OpenCL/vendors + %if %{with multigl} install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d} %endif @@ -261,13 +263,16 @@ cp -a nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 cp -a nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} 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 for f in \ libGL.so.%{version} \ + libOpenCL.so.1.0.0 \ libXvMCNVIDIA.so.%{version} \ libcuda.so.%{version} \ libnvidia-cfg.so.%{version} \ libnvidia-glcore.so.%{version} \ + libnvidia-ml.so.%{version} \ tls/libnvidia-tls.so.%{version} \ ; do %if %{without multigl} @@ -277,6 +282,8 @@ for f in \ %endif done +/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} + cp -a libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau @@ -287,7 +294,7 @@ install -p nvidia_drv.so \ install -p libnvidia-wfb.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules -cp -a gl*.h $RPM_BUILD_ROOT%{_includedir}/GL +cp -p gl*.h $RPM_BUILD_ROOT%{_includedir}/GL ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so ln -sf nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so @@ -300,19 +307,27 @@ echo %{_libdir}/nvidia >$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 nvidia/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so -ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.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 -ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so +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 + ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1 +ln -sf libXvMCNVIDIA_dynamic.so.1 $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so -ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.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 %endif @@ -321,7 +336,11 @@ ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so %endif install -d $RPM_BUILD_ROOT%{_pkgconfigdir} -sed -e 's|@@prefix@@|%{_prefix}|g;s|@@libdir@@|%{_libdir}|g;s|@@includedir@@|%{_includedir}|g;s|@@version@@|%{version}|g' < %{SOURCE3} \ +sed -e ' + s|@@prefix@@|%{_prefix}|g; + s|@@libdir@@|%{_libdir}|g; + s|@@includedir@@|%{_includedir}|g; + s|@@version@@|%{version}|g' < %{SOURCE3} \ > $RPM_BUILD_ROOT%{_pkgconfigdir}/gl.pc %clean @@ -370,18 +389,27 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so %files libs %defattr(644,root,root,755) +%dir /etc/OpenCL +%dir /etc/OpenCL/vendors +/etc/OpenCL/vendors/nvidia.icd %if %{with multigl} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf %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.*.* @@ -389,13 +417,20 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so # 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 +%attr(755,root,root) %{_libdir}/libOpenCL.so +%attr(755,root,root) %{_libdir}/libOpenCL.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libOpenCL.so.1 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.* %attr(755,root,root) %ghost %{_libdir}/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}/libcuda.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-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.*.*