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=f184eb78319102a51f0dc940ab4c24532d576423;hp=8d28b228afa706e950f96f889eb972a152ffa074;hb=192705e50bfa3a6527cbacbeacb919ddacedc495;hpb=9b761b7c0c338949388a6b58a35176678621edbf diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 8d28b22..f184eb7 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -19,19 +19,19 @@ %endif %define pname xorg-driver-video-nvidia -%define rel 6 +%define rel 2 Summary: Linux Drivers for nVidia GeForce/Quadro Chips Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro Name: %{pname}%{_alt_kernel} -Version: 173.14.09 +Version: 180.22 Release: %{rel}%{?with_multigl:.mgl} License: nVidia Binary Group: X11 Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run -# Source0-md5: 02bc9536ad2800855c66684f4c981a74 +# Source0-md5: bf6c44f82123a315244e04a5aede11ab Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run -# Source1-md5: 5f174d4fa50d774df8667c1c063adfb2 +# Source1-md5: 6839441e92c2605327073d586c3077d9 Source2: %{pname}-xinitrc.sh Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch @@ -44,10 +44,11 @@ BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) = 2.0 +Requires: xorg-xserver-server(videodrv-abi) >= 2.0 +Requires: xorg-xserver-server(videodrv-abi) <= 4.1 Provides: OpenGL = 2.1 Provides: OpenGL-GLX = 1.4 -Provides: xorg-xserver-libglx +Provides: xorg-xserver-module(glx) %if %{without multigl} Obsoletes: Mesa %endif @@ -140,12 +141,12 @@ Narzędzia do zarządzania kartami graficznymi nVidia. Summary: nVidia kernel module for nVidia Architecture support Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia -Version: %{version} 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} = %{version}-%{rel} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel @@ -175,7 +176,7 @@ echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/s %build %if %{with kernel} -cd usr/src/nv/ +cd usr/src/nv ln -sf Makefile.kbuild Makefile cat >> Makefile <<'EOF' @@ -191,7 +192,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with userspace} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ - $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir},%{_mandir}/man1} \ + $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda,vdpau},%{_libdir},%{_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} @@ -207,6 +208,8 @@ for f in \ usr/lib/tls/libnvidia-tls.so.%{version} \ usr/lib/libnvidia-cfg.so.%{version} \ usr/lib/libGL{,core}.so.%{version} \ + usr/lib/libcuda.so.%{version} \ + usr/lib/libvdpau{,_nvidia,_trace}.so.%{version} \ usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ %if %{without multigl} usr/X11R6/lib/libXvMCNVIDIA.a \ @@ -228,9 +231,10 @@ install usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL +install usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda +install usr/include/vdpau/*.h $RPM_BUILD_ROOT%{_includedir}/vdpau ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so -ln -sf libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/wfb.so %if %{with multigl} echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf @@ -241,6 +245,9 @@ 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 libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1 + +ln -sf nvidia/libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so +ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so %else # OpenGL ABI for Linux compatibility ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1 @@ -248,6 +255,9 @@ ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.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 + +ln -sf libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so +ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so %endif %endif @@ -263,8 +273,9 @@ rm -rf $RPM_BUILD_ROOT cat << 'EOF' NOTE: You must also install kernel module for this driver to work kernel-video-nvidia-%{version} - kernel-laptop-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. @@ -296,8 +307,12 @@ fi %attr(755,root,root) %{_libdir}/nvidia/libGLcore.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.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-tls.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libvdpau.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libvdpau_nvidia.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libvdpau_trace.so.*.* %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.* %ghost %{_libdir}/xorg/modules/extensions/libglx.so %else @@ -309,22 +324,29 @@ fi %attr(755,root,root) %{_libdir}/libGLcore.so.*.* %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.* %attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1 +%attr(755,root,root) %{_libdir}/libcuda.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.* +%attr(755,root,root) %{_libdir}/libvdpau.so.*.* +%attr(755,root,root) %{_libdir}/libvdpau_nvidia.so.*.* +%attr(755,root,root) %{_libdir}/libvdpau_trace.so.*.* %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so* %endif %attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.* -%attr(755,root,root) %{_libdir}/xorg/modules/wfb.so %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so +%attr(755,root,root) %{_libdir}/libcuda.so +%attr(755,root,root) %{_libdir}/libvdpau.so %dir %{_includedir}/GL %{_includedir}/GL/gl.h %{_includedir}/GL/glext.h %{_includedir}/GL/glx.h %{_includedir}/GL/glxext.h +%{_includedir}/cuda +%{_includedir}/vdpau %if %{with multigl} %attr(755,root,root) %{_libdir}/libGL.so %endif