%bcond_with verbose # verbose build (V=1)
#
%define _nv_ver 1.0
-%define _nv_rel 8178
+%define _nv_rel 9629
%define _min_x11 6.7.0
-%define _rel 2
+%define _rel 1
#
%define need_x86 0
%define need_x8664 0
%define need_x8664 1
%endif
%endif
-#
-Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
-Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
+%if %{without kernel}
+%undefine with_dist_kernel
+%endif
+#
+Summary: Linux Drivers for NVIDIA GeForce/Quadro Chips
+Summary(pl): Sterowniki do kart graficznych NVIDIA GeForce/Quadro
Name: X11-driver-nvidia
Version: %{_nv_ver}.%{_nv_rel}
Release: %{_rel}
License: nVidia Binary
-Vendor: nVidia Corp.
Group: X11
# why not pkg0!?
%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: bc9d459bfeee93735e3959de041635df
+# Source0-md5: a9e6097e84a0d6310e5a71c58249ccae
%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}-pkg1.run
-# Source1-md5: 0da016f8d5138c1ee51b7fa375821574
+# Source1-md5: 7ff9c0cb34f0e43817703a765d21f813
%endif
-Patch0: %{name}-gcc34.patch
-Patch1: %{name}-GL.patch
-Patch2: %{name}-conftest.patch
+Source2: %{name}-settings.desktop
+Source3: %{name}-xinitrc.sh
+Patch0: %{name}-GL.patch
+Patch1: %{name}-conftest.patch
# http://www.minion.de/files/1.0-6629/
URL: http://www.nvidia.com/object/linux.html
-BuildRequires: grep
%if %{with kernel}
-%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7}
+%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.7}
%endif
BuildRequires: %{kgcc_package}
-BuildRequires: rpmbuild(macros) >= 1.213
-BuildRequires: sed >= 4.0
-BuildRequires: textutils
#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
+BuildRequires: rpmbuild(macros) >= 1.326
+BuildRequires: sed >= 4.0
BuildConflicts: XFree86-nvidia
Requires: X11-Xserver
Requires: X11-libs >= %{_min_x11}
%define _noautoreqdep libGL.so.1 libGLcore.so.1
%define _prefix /usr/X11R6
+%define _mandir %{_prefix}/man
%ifarch %{x8664}
%define _libdir32 %{_prefix}/lib
%endif
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.
+Supported hardware: new 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
+ X11-driver-nvidia-legacy drivers.
%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.
+Xorg/XFree86, 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 NVIDIA nie s± obs³ugiwane przez ten pakiet:
+- NV1 i Riva 128/128ZX s± obs³ugiwane przez sterownik nv z Xorg.
+- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 obs³ugiwane s± przez
+ sterownik NVIDIA z pakietu X11-driver-nvidia-legacy.
%package devel
Summary: OpenGL for X11R6 development (only gl?.h)
%description progs -l pl
Narzêdzia do zarz±dzania kartami graficznymi nVidia.
-%package -n kernel-video-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
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
-%description -n kernel-video-nvidia
+%description -n kernel%{_alt_kernel}-video-nvidia
nVidia Architecture support for Linux kernel.
-%description -n kernel-video-nvidia -l de
+%description -n kernel%{_alt_kernel}-video-nvidia -l de
Die nVidia-Architektur-Unterstützung für den Linux-Kern.
-%description -n kernel-video-nvidia -l pl
+%description -n kernel%{_alt_kernel}-video-nvidia -l pl
Obs³uga architektury nVidia dla j±dra Linuksa. Pakiet wymagany przez
sterownik nVidii dla Xorg/XFree86.
-%package -n kernel-smp-video-nvidia
+%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
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
-%description -n kernel-smp-video-nvidia
+%description -n kernel%{_alt_kernel}-smp-video-nvidia
nVidia Architecture support for Linux kernel SMP.
-%description -n kernel-smp-video-nvidia -l de
+%description -n kernel%{_alt_kernel}-smp-video-nvidia -l de
Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP.
-%description -n kernel-smp-video-nvidia -l pl
+%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.
%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg1
%endif
%patch0 -p1
-%patch1 -p1
-#%patch2 -p1
+#%patch1 -p1
sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
%build
%if %{with kernel}
cd usr/src/nv/
ln -sf Makefile.kbuild Makefile
-for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
- if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
- exit 1
- fi
- rm -rf include
- install -d include/{linux,config}
- ln -sf %{_kernelsrcdir}/config-$cfg .config
- ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
- ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
- ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
- touch include/config/MARKER
- %{__make} -C %{_kernelsrcdir} clean \
- RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD \
- M=$PWD O=$PWD \
- %{?with_verbose:V=1}
- %{__make} -C %{_kernelsrcdir} modules \
- CC="%{__cc}" CPP="%{__cpp}" \
- SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD \
- M=$PWD O=$PWD \
- %{?with_verbose:V=1}
- mv nvidia.ko nvidia-$cfg.ko
-done
+%build_kernel_modules -m nvidia
%endif
%install
%if %{with userspace}
install -d $RPM_BUILD_ROOT%{_libdir}/modules/{drivers,extensions} \
- $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir}}
+ $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir},%{_mandir}/man1} \
+ $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},/etc/X11/xinit/xinitrc.d}
ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
+install usr/bin/nvidia-xconfig $RPM_BUILD_ROOT%{_bindir}
+install usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir}
+install usr/share/man/man1/nvidia-[sx]* $RPM_BUILD_ROOT%{_mandir}/man1
+install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}/nvidia-settings.desktop
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
install usr/lib/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}
install usr/lib/tls/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT/usr/%{_lib}/tls
install usr/lib/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir}
#install usr/lib32/libGL{,core}.so.%{version} $RPM_BUILD_ROOT%{_libdir32}
%endif
-install usr/X11R6/lib/modules/drivers/nvidia_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/drivers
+install usr/X11R6/lib/modules/drivers/nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/modules/drivers
install usr/X11R6/lib/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}
install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
install usr/include/GL/*.h $RPM_BUILD_ROOT/usr/include/GL
-#install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/modules/extensions/libglx.so
%endif
%if %{with kernel}
-cd usr/src/nv/
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install nvidia-%{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/nvidia.ko
-%if %{with smp} && %{with dist_kernel}
-install nvidia-smp.ko \
- $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvidia.ko
-%endif
+%install_kernel_modules -m usr/src/nv/nvidia -d misc
%endif
%clean
%postun -p /sbin/ldconfig
-%post -n kernel-video-nvidia
+%post -n kernel%{_alt_kernel}-video-nvidia
%depmod %{_kernel_ver}
-%postun -n kernel-video-nvidia
+%postun -n kernel%{_alt_kernel}-video-nvidia
%depmod %{_kernel_ver}
-%post -n kernel-smp-video-nvidia
+%post -n kernel%{_alt_kernel}-smp-video-nvidia
%depmod %{_kernel_ver}smp
-%postun -n kernel-smp-video-nvidia
+%postun -n kernel%{_alt_kernel}-smp-video-nvidia
%depmod %{_kernel_ver}smp
%if %{with userspace}
%attr(755,root,root) /usr/%{_lib}/libGL.so.1
%attr(755,root,root) /usr/%{_lib}/libGL.so
%attr(755,root,root) %{_libdir}/modules/extensions/libglx.so*
-%attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.so
%endif
%if %{with kernel}
-%files -n kernel-video-nvidia
+%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-smp-video-nvidia
+%files -n kernel%{_alt_kernel}-smp-video-nvidia
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/misc/*.ko*
%endif
%files progs
%defattr(644,root,root,755)
-%doc usr/share/doc/nvidia-settings-user-guide.txt
%attr(755,root,root) %{_bindir}/nvidia-settings
+%attr(755,root,root) %{_bindir}/nvidia-xconfig
+%attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh
+%{_desktopdir}/*.desktop
+%{_mandir}/man1/*
+%{_pixmapsdir}/*
%endif
projects / packages / X11-driver-nvidia.git / blobdiff