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=7a35f0698b740fe91bbc72c01eb4d68fd5c686a6;hp=91dd756474a1798e4e305ebc490669f429e0cc30;hb=5fe7ec5f6f6d4015d33fba539939cd3e23f32c23;hpb=b37addd9debff1d781b983a01fc76880805ba284 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 91dd756..7a35f06 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -1,8 +1,6 @@ # # Conditional build: %bcond_without dist_kernel # without distribution kernel -%bcond_without up # without up packages -%bcond_without smp # without smp packages %bcond_without kernel # without kernel packages %bcond_without incall # include all tarballs %bcond_without userspace # don't build userspace programs @@ -11,9 +9,9 @@ %define no_install_post_strip 1 # %define _nv_ver 1.0 -%define _nv_rel 9746 +%define _nv_rel 9762 %define _min_x11 6.7.0 -%define _rel 1 +%define _rel 2 # %define need_x86 0 %define need_x8664 0 @@ -29,8 +27,8 @@ %endif %endif # -Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips -Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro +Summary: Linux Drivers for nVidia GeForce/Quadro Chips +Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro Name: xorg-driver-video-nvidia Version: %{_nv_ver}.%{_nv_rel} Release: %{_rel} @@ -38,28 +36,29 @@ License: nVidia Binary Group: X11 %if %{need_x86} Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run -# Source0-md5: cf0cdbd9099a6df028de429044e7f4da +# Source0-md5: 9e85cd92befcc04fa6cc668da57d0f30 %endif %if %{need_x8664} Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2.run -# Source1-md5: c0afc66e1c21a9a54ba6719b8edd3166 +# Source1-md5: 988a4714ef6741ffbb8432364b0c90c7 %endif Source2: %{name}-xinitrc.sh Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch URL: http://www.nvidia.com/object/linux.html %if %{with kernel} -%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7} +%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2} %endif BuildRequires: %{kgcc_package} -BuildRequires: rpmbuild(macros) >= 1.330 +BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: xorg-xserver-server Provides: OpenGL = 1.5 Provides: OpenGL-GLX -Provides: xorg-xserver-modules-libglx +Provides: xorg-xserver-libglx Obsoletes: Mesa +Obsoletes: Mesa-libGL Obsoletes: X11-OpenGL-core < 1:7.0.0 Obsoletes: X11-OpenGL-libGL < 1:7.0.0 Obsoletes: XFree86-OpenGL-core < 1:7.0.0 @@ -73,24 +72,28 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautoreqdep libGL.so.1 libGLcore.so.1 %description -This driver set adds improved 2D functionality to the Xorg/XFree86 X -server as well as high performance OpenGL acceleration, AGP support, -support for most flat panels, and 2D multiple monitor support. - -Hardware: nVidia TNT, TNT2, GeForce, or Quadro based graphics -accelerator. The nVidia NV1 and RIVA 128/128ZX chips are supported in -the base Xorg/XFree86 install and are not supported by this driver -set. +This driver set adds improved 2D functionality to the Xorg X server as +well as high performance OpenGL acceleration, AGP support, support for +most flat panels, and 2D multiple monitor support. Supported hardware: +modern NVIDIA GeForce (from GeForce2 MX) and Quadro (Quadro4 and up) +based graphics accelerators. + +The older graphics chips are unsupported: +- NV1 and RIVA 128/128ZX chips are supported in the base Xorg install + (nv driver) +- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 are suported by -legacy + drivers. %description -l pl.UTF-8 -Usprawnione sterowniki dla kart graficznych nVidia do serwera -Xorg/XFree86, dające wysokowydajną akcelerację OpenGL, obsługę AGP i -wielu monitorów 2D. +Usprawnione sterowniki dla kart graficznych nVidia do serwera Xorg, +dające wysokowydajną akcelerację OpenGL, obsługę AGP i wielu monitorów +2D. Obsługują w miarę nowe karty NVIDIA GeForce (od wersji GeForce2 +MX) oraz Quadro (od wersji Quadro4). -Obsługują karty nVidia TNT/TNT2/GeForce/Quadro do serwera -Xorg/XFree86; Karty nVidia NV1 i Riva 128/128ZX są obsługiwane przez -sterownik nv z pakietów Xorg/XFree8 - NIE są obsługiwane przez ten -pakiet. +Starsze układy graficzne nie są obsługiwane przez ten pakiet: +- NV1 i RIVA 128/128ZX są obsługiwane przez sterownik nv z Xorg +- TNT/TNT2/GeForce 256/GeForce 2 Ultra/Quadro 2 są obsługiwane przez + sterowniki -legacy %package devel Summary: OpenGL for X11R6 development (only gl?.h) @@ -133,7 +136,7 @@ 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_up} +%{?with_dist_kernel:%requires_releq_kernel} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel @@ -147,28 +150,6 @@ Die nVidia-Architektur-Unterstützung für den Linux-Kern. Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez sterownik nVidii dla Xorg/XFree86. -%package -n kernel%{_alt_kernel}-smp-video-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 -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_smp} -Provides: X11-driver-nvidia(kernel) -Obsoletes: XFree86-nvidia-kernel - -%description -n kernel%{_alt_kernel}-smp-video-nvidia -nVidia Architecture support for Linux kernel SMP. - -%description -n kernel%{_alt_kernel}-smp-video-nvidia -l de.UTF-8 -Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP. - -%description -n kernel%{_alt_kernel}-smp-video-nvidia -l pl.UTF-8 -Obsługa architektury nVidia dla jądra Linuksa SMP. Pakiet wymagany -przez sterownik nVidii dla Xorg/XFree86. - %prep cd %{_builddir} rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg* @@ -254,7 +235,7 @@ cat << EOF * * * NOTE: * * You must install: * - * kernel(24)(-smp)-video-nvidia-%{version} * + * kernel(24)-video-nvidia-%{version} * * for this driver to work * * * ******************************************************* @@ -269,12 +250,6 @@ EOF %postun -n kernel%{_alt_kernel}-video-nvidia %depmod %{_kernel_ver} -%post -n kernel%{_alt_kernel}-smp-video-nvidia -%depmod %{_kernel_ver}smp - -%postun -n kernel%{_alt_kernel}-smp-video-nvidia -%depmod %{_kernel_ver}smp - %if %{with userspace} %files %defattr(644,root,root,755) @@ -297,19 +272,11 @@ EOF %endif %if %{with kernel} -%if %{with up} || %{without dist_kernel} %files -n kernel%{_alt_kernel}-video-nvidia %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/*.ko* %endif -%if %{with smp} && %{with dist_kernel} -%files -n kernel%{_alt_kernel}-smp-video-nvidia -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}smp/misc/*.ko* -%endif -%endif - %if %{with userspace} %files devel %defattr(644,root,root,755)