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=54360dae2c30fe6b734654080bc0d55b78c5e6c9;hb=6952f0528c4657547192652f02e82ce944b14ce7;hpb=94b0339450de83d416346e36827b312e8f37daca diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 54360da..79cfe68 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -22,24 +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 relcrap %{rel}%{?with_multigl:.mgl} +%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: %{relcrap} +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 @@ -52,9 +52,9 @@ BuildRequires: %{kgcc_package} BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia -Requires: %{pname}-libs = %{epoch}:%{version}-%{relcrap} +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 @@ -130,7 +130,7 @@ Summary: OpenGL (GL and GLX) header files Summary(hu.UTF-8): OpenGL (GL és GLX) fejléc fájlok Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX) Group: X11/Development/Libraries -Requires: %{pname}-libs = %{epoch}:%{version}-%{relcrap} +Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Provides: OpenGL-GLX-devel = 1.4 Provides: OpenGL-devel = 2.1 Obsoletes: X11-OpenGL-devel-base @@ -154,7 +154,7 @@ 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}-%{relcrap} +Requires: %{pname}-devel = %{epoch}:%{version}-%{rel} %description static Static XvMCNVIDIA library. @@ -178,7 +178,7 @@ Summary: Tools for advanced control of nVidia graphic cards 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}-%{relcrap} +Requires: %{pname} = %{epoch}:%{version}-%{rel} Suggests: pkgconfig Obsoletes: XFree86-driver-nvidia-progs @@ -196,12 +196,12 @@ Summary: nVidia kernel module for nVidia Architecture support Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung Summary(hu.UTF-8): nVidia Architektúra támogatás Linux kernelhez. Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia -Release: %{relcrap}@%{_kernel_ver_str} +Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod Requires: dev >= 2.7.7-10 %{?with_dist_kernel:%requires_releq_kernel} -Requires: %{pname} = %{epoch}:%{version}-%{relcrap} +Requires: %{pname} = %{epoch}:%{version}-%{rel} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel @@ -250,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} @@ -264,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} \ @@ -288,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 @@ -301,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 @@ -310,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 @@ -332,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} @@ -381,6 +382,9 @@ 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 @@ -395,6 +399,9 @@ 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 @@ -414,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