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=8cc8408e05a344f96a0a471390d4f80a20b403be;hp=a07a498dbbf6b4d3c4d5a6e9705fd09b84fd81ff;hb=0e15e33b4969f776327b856b3e9dc68a44f67ee6;hpb=6d259251eeac4d75e525bda7d09bdc663f4b7036 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index a07a498..8cc8408 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -1,7 +1,6 @@ # # Conditional build: %bcond_without dist_kernel # without distribution kernel -%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 @@ -10,9 +9,9 @@ %define no_install_post_strip 1 # %define _nv_ver 1.0 -%define _nv_rel 9629 +%define _nv_rel 9755 %define _min_x11 6.7.0 -%define _rel 0.1 +%define _rel 1 # %define need_x86 0 %define need_x8664 0 @@ -28,45 +27,42 @@ %endif %endif # -Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips -Summary(pl): 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} License: nVidia Binary Group: X11 %if %{need_x86} -Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run -# Source0-md5: a9e6097e84a0d6310e5a71c58249ccae +Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run +# Source0-md5: 594a47bd7e85343bd482775482cd1dce %endif %if %{need_x8664} -Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2.run -# Source1-md5: c7be950ab060dbd33a9958785f96b6e2 +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: 88eb6b856ab201dc00663165e10109f9 %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: X11-OpenGL-core -Provides: X11-OpenGL-libGL -Provides: XFree86-OpenGL-core -Provides: XFree86-OpenGL-libGL -Provides: xorg-xserver-modules-libglx +Provides: xorg-xserver-libglx Obsoletes: Mesa -Obsoletes: X11-OpenGL-core -Obsoletes: X11-OpenGL-libGL -Obsoletes: XFree86-OpenGL-core -Obsoletes: XFree86-OpenGL-libGL +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 +Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0 Obsoletes: XFree86-driver-nvidia Obsoletes: XFree86-nvidia Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 @@ -76,28 +72,32 @@ 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. - -%description -l pl -Usprawnione sterowniki dla kart graficznych nVidia do serwera -Xorg/XFree86, daj±ce wysokowydajn± akceleracjê OpenGL, obs³ugê AGP i -wielu monitorów 2D. - -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. +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, +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). + +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) -Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h) +Summary(pl.UTF-8): Pliki nagłówkowe OpenGL dla systemu X11R6 (tylko gl?.h) Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} Provides: OpenGL-GLX-devel @@ -110,13 +110,13 @@ Conflicts: XFree86-OpenGL-devel < 4.3.99.902-0.3 %description devel Base headers (only gl?.h) for OpenGL for X11R6 for nvidia drivers. -%description devel -l pl -Podstawowe pliki nag³ówkowe (tylko gl?.h) OpenGL dla systemu X11R6 dla -sterowników nvidii. +%description devel -l pl.UTF-8 +Podstawowe pliki nagłówkowe (tylko gl?.h) OpenGL dla systemu X11R6 dla +sterowników nvidii. %package progs Summary: Tools for advanced control of nVidia graphic cards -Summary(pl): Narzêdzia do zarz±dzania kartami graficznymi nVidia +Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia Group: Applications/System Requires: %{name} = %{version}-%{release} Obsoletes: XFree86-driver-nvidia-progs @@ -124,54 +124,32 @@ Obsoletes: XFree86-driver-nvidia-progs %description progs Tools for advanced control of nVidia graphic cards. -%description progs -l pl -Narzêdzia do zarz±dzania kartami graficznymi nVidia. +%description progs -l pl.UTF-8 +Narzędzia do zarządzania kartami graficznymi nVidia. %package -n kernel%{_alt_kernel}-video-nvidia Summary: nVidia kernel module for nVidia Architecture support -Summary(de): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung -Summary(pl): Modu³ j±dra dla obs³ugi kart graficznych nVidia +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: %{_nv_ver}.%{_nv_rel} 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 %description -n kernel%{_alt_kernel}-video-nvidia nVidia Architecture support for Linux kernel. -%description -n kernel%{_alt_kernel}-video-nvidia -l de -Die nVidia-Architektur-Unterstützung für den Linux-Kern. +%description -n kernel%{_alt_kernel}-video-nvidia -l de.UTF-8 +Die nVidia-Architektur-Unterstützung für den Linux-Kern. -%description -n kernel%{_alt_kernel}-video-nvidia -l pl -Obs³uga architektury nVidia dla j±dra Linuksa. Pakiet wymagany przez +%description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8 +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): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung -Summary(pl): 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 -Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP. - -%description -n kernel%{_alt_kernel}-smp-video-nvidia -l pl -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* @@ -215,6 +193,7 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh for f in \ usr/lib/tls/libnvidia-tls.so.%{version} \ + usr/lib/libnvidia-cfg.so.%{version} \ usr/lib/libGL{,core}.so.%{version} \ usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ usr/X11R6/lib/libXvMCNVIDIA.a \ @@ -226,12 +205,15 @@ install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions install usr/X11R6/lib/modules/drivers/nvidia_drv.so \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers +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 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.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 libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/wfb.so # OpenGL ABI for Linux compatibility ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1 @@ -253,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 * * * ******************************************************* @@ -268,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) @@ -287,21 +263,18 @@ EOF %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}/libnvidia-cfg.so.*.*.* %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.* -%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so* +%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 +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so* %endif %if %{with kernel} %files -n kernel%{_alt_kernel}-video-nvidia %defattr(644,root,root,755) /lib/modules/%{_kernel_ver}/misc/*.ko* - -%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}