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=94965cc4dc795a361ced1210f506a3e2ca566c50;hp=b1fe191f46786e4222d91c1d83bbcf7782d2060b;hb=f98c564593889effdb37faf2dda751d24a73a6f0;hpb=9333041ee577ee92be619faa5ae5fa917c924c24 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index b1fe191..94965cc 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 @@ -10,10 +8,10 @@ # %define no_install_post_strip 1 # -%define _nv_ver 1.0 -%define _nv_rel 9746 +%define _nv_ver 100 +%define _nv_rel 14.11 %define _min_x11 6.7.0 -%define _rel 1 +%define _rel 2 # %define need_x86 0 %define need_x8664 0 @@ -29,36 +27,37 @@ %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} 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: http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1.run +# Source0-md5: 3e76376b5f1a53e0c18694fa65691c75 %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: 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: 060dfcab02bc903ce6f18da4fad6f74f %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 +Requires: xorg-xserver-server(videodrv-abi) = 1.2 +Provides: OpenGL = 2.1 +Provides: OpenGL-GLX = 1.4 +Provides: xorg-xserver-libglx Obsoletes: Mesa Obsoletes: Mesa-libGL Obsoletes: X11-OpenGL-core < 1:7.0.0 @@ -74,43 +73,60 @@ 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) -Summary(pl.UTF-8): Pliki nagłówkowe OpenGL dla systemu X11R6 (tylko gl?.h) +Summary: OpenGL (GL and GLX) header files +Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX) Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Provides: OpenGL-GLX-devel -Provides: OpenGL-devel = 1.5 -Provides: OpenGL-devel-base -Obsoletes: OpenGL-devel-base +Provides: OpenGL-GLX-devel = 1.4 +Provides: OpenGL-devel = 2.1 +Obsoletes: X11-OpenGL-devel-base +Obsoletes: XFree86-OpenGL-devel-base Obsoletes: XFree86-driver-nvidia-devel Conflicts: XFree86-OpenGL-devel < 4.3.99.902-0.3 %description devel -Base headers (only gl?.h) for OpenGL for X11R6 for nvidia drivers. +OpenGL header files (GL and GLX only) for NVIDIA OpenGL +implementation. %description devel -l pl.UTF-8 -Podstawowe pliki nagłówkowe (tylko gl?.h) OpenGL dla systemu X11R6 dla -sterowników nvidii. +Pliki nagłówkowe OpenGL (tylko GL i GLX) dla implementacji OpenGL +firmy NVIDIA. + +%package static +Summary: Static XvMCNVIDIA library +Summary(pl.UTF-8): Statyczna biblioteka XvMCNVIDIA +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +Static XvMCNVIDIA library. + +%description static -l pl.UTF-8 +Statyczna biblioteka XvMCNVIDIA. %package progs Summary: Tools for advanced control of nVidia graphic cards @@ -134,7 +150,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 @@ -148,37 +164,15 @@ 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* +rm -rf NVIDIA-Linux-x86*-%{_nv_ver}.%{_nv_rel}-pkg* %ifarch %{ix86} /bin/sh %{SOURCE0} --extract-only -%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1 +%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1 %else /bin/sh %{SOURCE1} --extract-only -%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2 +%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}.%{_nv_rel}-pkg2 %endif %patch0 -p1 %patch1 -p1 @@ -250,16 +244,9 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig cat << EOF - - ******************************************************* - * * - * NOTE: * - * You must install: * - * kernel(24)(-smp)-video-nvidia-%{version} * - * for this driver to work * - * * - ******************************************************* - +NOTE: You must install: +kernel-video-nvidia-%{version} +for this driver to work EOF %postun -p /sbin/ldconfig @@ -270,22 +257,16 @@ 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) %doc LICENSE %doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html} -# OpenGL ABI for Linux compatibility -%attr(755,root,root) %{_libdir}/libGL.so -%attr(755,root,root) %{_libdir}/libGL.so.1 -# %attr(755,root,root) %{_libdir}/libGL.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libGL.so.1 +# 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}/libGLcore.so.*.* %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.* %attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1 @@ -295,28 +276,18 @@ EOF %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} -%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) %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so -%{_includedir}/GL/*.h -# -static +%dir %{_includedir}/GL +%{_includedir}/GL/gl.h +%{_includedir}/GL/glext.h +%{_includedir}/GL/glx.h +%{_includedir}/GL/glxext.h + +%files static +%defattr(644,root,root,755) %{_libdir}/libXvMCNVIDIA.a %files progs @@ -329,3 +300,9 @@ EOF %{_mandir}/man1/nvidia-* %{_pixmapsdir}/nvidia-settings.png %endif + +%if %{with kernel} +%files -n kernel%{_alt_kernel}-video-nvidia +%defattr(644,root,root,755) +/lib/modules/%{_kernel_ver}/misc/*.ko* +%endif