#
%define no_install_post_strip 1
#
-%define _nv_ver 1.0
-%define _nv_rel 9755
+%define _nv_ver 100
+%define _nv_rel 14.11
%define _min_x11 6.7.0
%define _rel 1
#
%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: 594a47bd7e85343bd482775482cd1dce
+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: 88eb6b856ab201dc00663165e10109f9
+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.379
BuildRequires: sed >= 4.0
BuildConflicts: XFree86-nvidia
Requires: xorg-xserver-server
-Provides: OpenGL = 1.5
-Provides: OpenGL-GLX
+Provides: OpenGL = 2.1
+Provides: OpenGL-GLX = 1.4
Provides: xorg-xserver-libglx
Obsoletes: Mesa
Obsoletes: Mesa-libGL
%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
%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
%post
/sbin/ldconfig
cat << EOF
-
- *******************************************************
- * *
- * NOTE: *
- * You must install: *
- * kernel(24)-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
%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
%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*
-%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
%{_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
projects / packages / xorg-driver-video-nvidia.git / blobdiff