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=79cfe68d06bc1f0f60b5fd2531bc0b9675632c69;hp=2cf513f69c82ef11269ab0fe35e6c9752bc1554e;hb=6952f0528c4657547192652f02e82ce944b14ce7;hpb=2d78523c04bc88758d0135f40f15f64089e670d5 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 2cf513f..79cfe68 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -22,23 +22,24 @@ # nothing to be placed to debuginfo package %define _enable_debug_packages 0 %endif +%define no_install_post_check_so 1 %define pname xorg-driver-video-nvidia -%define rel 4 +%define rel 5%{?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: 256.35 -Release: %{rel}%{?with_multigl:.mgl} +Version: 260.19.36 +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: f6af8917a500de28396a438f3f548c88 -Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 7b5924f14a4d2326b4d916efdb7852ff +Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run +# Source0-md5: 2826484d87827351774449382e45c4a9 +Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run +# Source1-md5: 6ebc5db9066e920b0b0e48377ce5eeb5 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Patch0: X11-driver-nvidia-GL.patch @@ -53,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) <= 7.0 +Requires: xorg-xserver-server(videodrv-abi) <= 8.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia @@ -249,7 +250,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with userspace} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ - $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda},%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ + $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir}/vdpau,%{_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} @@ -263,6 +264,7 @@ 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} \ libnvidia-cfg.so.%{version} \ @@ -287,7 +289,6 @@ install -p libnvidia-wfb.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules cp -a gl*.h $RPM_BUILD_ROOT%{_includedir}/GL -cp -a cuda*.h $RPM_BUILD_ROOT%{_includedir}/cuda 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,6 +301,9 @@ 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 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 nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1 @@ -309,6 +313,9 @@ ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so 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 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.so ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1 @@ -331,11 +338,6 @@ rm -rf $RPM_BUILD_ROOT cat << 'EOF' NOTE: You must also install kernel module for this driver to work kernel-video-nvidia-%{version} - kernel-desktop-video-nvidia-%{version} - kernel-laptop-video-nvidia-%{version} - kernel-vanilla-video-nvidia-%{version} - -Depending on which kernel brand you use. EOF %if %{with multigl} @@ -380,12 +382,16 @@ 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) %{_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-tls.so.*.* %else %attr(755,root,root) %{_libdir}/libGL.so.*.* @@ -393,13 +399,16 @@ 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}/libnvidia-glcore.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) %{_libdir}/libcuda.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.* +%attr(755,root,root) %{_libdir}/libnvidia-glcore.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.* %endif %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.* @@ -412,7 +421,6 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so %{_includedir}/GL/glext.h %{_includedir}/GL/glx.h %{_includedir}/GL/glxext.h -%{_includedir}/cuda %if %{with multigl} %attr(755,root,root) %{_libdir}/libGL.so %endif