%bcond_without kernel # without kernel packages
%bcond_with verbose # verbose build (V=1)
#
+### DON'T CHANGE THIS ###############
%define _nv_ver 1.0
-%define _nv_rel 7174
+%define _nv_rel 7182
%define _min_x11 6.7.0
-%define _rel 3
+%define _rel 0.1
+#####################################
#
-Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
-Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
+%define oldname X11-driver-nvidia
+
+Summary: Linux Drivers for nVidia TNT/TNT2/GF/old GF2/Quadro Chips
+Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/old GF2/Quadro
Name: X11-driver-nvidia-legacy
Version: %{_nv_ver}.%{_nv_rel}
Release: %{_rel}
License: nVidia Binary
-Vendor: nVidia Corp.
-Group: X11/XFree86
+Group: X11
# why not pkg0!?
Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5: e9840ae34ae9f5a3dc7d0fafe040c8af
+# Source0-md5: a7c84815943dc4784a207608abf2e5d6
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: 125ec3ecc64202c6c27ef762a438d0f0
+# Source1-md5: 5a670a73a8887bdc776064aecae8f769
Patch0: %{name}-gcc34.patch
Patch1: %{name}-GL.patch
Patch2: %{name}-conftest.patch
+Patch3: %{name}-verbose.patch
+Patch4: NVIDIA_kernel-1.0-7174-1258475.diff
+Patch5: NVIDIA_kernel-1.0-7174-1296092.diff
+Patch6: NVIDIA_kernel-1.0-7174-1321905.diff
+Patch7: NVIDIA_kernel-1.0-7174-1361053.diff
+Patch8: NVIDIA_kernel-1.0-7174-1386866.diff
+Patch9: %{name}-build-fix.patch
# http://www.minion.de/files/1.0-6629/
URL: http://www.nvidia.com/object/linux.html
-BuildConflicts: XFree86-nvidia
-BuildRequires: grep
-%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7}
BuildRequires: %{kgcc_package}
+#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
+%{?with_dist_kernel:BuildRequires: kernel-module-build >= 3:2.6.7}
BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: sed >= 4.0
-BuildRequires: textutils
-#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
+BuildConflicts: XFree86-nvidia
Requires: X11-Xserver
Requires: X11-libs >= %{_min_x11}
Requires: X11-modules >= %{_min_x11}
Provides: X11-OpenGL-libGL
Provides: XFree86-OpenGL-core
Provides: XFree86-OpenGL-libGL
+Obsoletes: %{oldname} < 1.0.7174
Obsoletes: Mesa
Obsoletes: X11-OpenGL-core
Obsoletes: X11-OpenGL-libGL
-Obsoletes: X11-driver-nvidia
Obsoletes: XFree86-OpenGL-core
Obsoletes: XFree86-OpenGL-libGL
Obsoletes: XFree86-driver-nvidia
Obsoletes: XFree86-nvidia
+#Conflicts: %{oldname}
Conflicts: XFree86-OpenGL-devel <= 4.2.0-3
ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%endif
%description
-This driver set adds improved 2D functionality to the XFree86 4.0 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, old GeForce2 or Quadro based graphics
-accelerator. The nVidia NV1 and RIVA 128/128ZX chips are supported in
-the base XFree86 4.0 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 multiple monitor support.
-Software: Linux kernel >= 2.2.12, XFree86 >= 4.0.
+Hardware: nVidia TNT, TNT2, GeForce, old GeForce2 or Quadro based
+graphics accelerator. New GeForce2, GeForce3 and GeForce4 adapters are
+supported by X11-driver-nvidia package. The nVidia NV1 and RIVA
+128/128ZX chips are supported in the base Xorg or XFree86 install and
+are not supported by this driver set.
%description -l pl
-Usprawnione sterowniki dla kart graficznych nVidia do serwera XFree86
-4.0, daj±ce wysokowydajn± akceleracjê OpenGL, obs³ugê AGP i wielu
-monitorów 2D.
+Usprawnione sterowniki dla kart graficznych nVidia do serwera X daj±ce
+wysokowydajn± akceleracjê OpenGL, obs³ugê AGP i wiele monitorów.
-Obs³uguj± karty nVidia TNT/TNT2/GeForce/stare GeForce2/Quadro do serwera XFree86 4.0;
-Karty nVidia NV1 i Riva 128/128ZX s± obs³ugiwane przez sterownik nv z
-pakietów XFree86 - NIE s± obs³ugiwane przez ten pakiet.
+Obs³uguj± karty nVidia TNT/TNT2/GeForce/stare GeForce2/Quadro do
+serwera Xorg. Dla kart GF2 (nowych), GF3 i GF4 jest pakiet
+X11-driver-nvidia. Karty nVidia NV1 i Riva 128/128ZX s± obs³ugiwane
+przez sterownik nv z pakietów Xorg lub XFree86 - NIE s± obs³ugiwane
+przez ten pakiet.
%package devel
Summary: OpenGL for X11R6 development (only gl?.h)
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
Provides: OpenGL-devel-base
+Obsoletes: %{oldname}-devel < 1.0.7174
Obsoletes: OpenGL-devel-base
Obsoletes: XFree86-driver-nvidia-devel
+Conflicts: %{oldname}-devel
Conflicts: XFree86-OpenGL-devel < 4.3.99.902-0.3
%description devel
Summary: Tools for advanced control of nVidia graphic cards
Summary(pl): Narzêdzia do zarz±dzania kartami graficznymi nVidia
Group: Applications/System
-Obsoletes: XFree86-driver-nvidia-progs
Requires: %{name} = %{version}-%{release}
+Obsoletes: %{oldname}-progs < 1.0.7174
+Obsoletes: XFree86-driver-nvidia-progs
+Conflicts: %{oldname}-progs
%description progs
Tools for advanced control of nVidia graphic cards.
%description progs -l pl
Narzêdzia do zarz±dzania kartami graficznymi nVidia.
-%package -n kernel-video-nvidia
+%package -n kernel-video-nvidia-legacy
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
%{?with_dist_kernel:%requires_releq_kernel_up}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
+Obsoletes: kernel-video-nvidia < 1.0.7174
+Conflicts: kernel-video-nvidia
-%description -n kernel-video-nvidia
+%description -n kernel-video-nvidia-legacy
nVidia Architecture support for Linux kernel.
-%description -n kernel-video-nvidia -l de
+%description -n kernel-video-nvidia-legacy -l de
Die nVidia-Architektur-Unterstützung für den Linux-Kern.
-%description -n kernel-video-nvidia -l pl
+%description -n kernel-video-nvidia-legacy -l pl
Obs³uga architektury nVidia dla j±dra Linuksa. Pakiet wymagany przez
-sterownik nVidii dla XFree86 4.
+sterownik nVidii dla Xorg/XFree86.
-%package -n kernel-smp-video-nvidia
+%package -n kernel-smp-video-nvidia-legacy
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
%{?with_dist_kernel:%requires_releq_kernel_smp}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
+Obsoletes: kernel-smp-video-nvidia < 1.0.7174
+Conflicts: kernel-smp-video-nvidia
-%description -n kernel-smp-video-nvidia
+%description -n kernel-smp-video-nvidia-legacy
nVidia Architecture support for Linux kernel SMP.
-%description -n kernel-smp-video-nvidia -l de
+%description -n kernel-smp-video-nvidia-legacy -l de
Die nVidia-Architektur-Unterstützung für den Linux-Kern SMP.
-%description -n kernel-smp-video-nvidia -l pl
+%description -n kernel-smp-video-nvidia-legacy -l pl
Obs³uga architektury nVidia dla j±dra Linuksa SMP. Pakiet wymagany
-przez sterownik nVidii dla XFree86 4.
+przez sterownik nVidii dla Xorg/XFree86.
%prep
cd %{_builddir}
/bin/sh %{SOURCE1} --extract-only
%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2
%endif
-%patch0 -p1
+#%patch0 -p1
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
+%if %{with verbose}
+%patch3 -p1
+%endif
+#%patch4 -p0
+#%patch5 -p0
+#%patch6 -p0
+#%patch7 -p0
+#%patch8 -p0
+#%patch9 -p1
sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
%build
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
- touch include/config/MARKER
+ install -d o/include/linux
+ ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+ ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+ ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+%if %{with dist_kernel}
+ %{__make} -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+ install -d o/include/config
+ touch o/include/config/MARKER
+ ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
%{__make} -C %{_kernelsrcdir} clean \
RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD \
- M=$PWD O=$PWD \
+ SYSOUT=$PWD/o \
+ M=$PWD O=$PWD/o \
%{?with_verbose:V=1}
%{__make} -C %{_kernelsrcdir} modules \
CC="%{__cc}" CPP="%{__cpp}" \
SYSSRC=%{_kernelsrcdir} \
- SYSOUT=$PWD \
- M=$PWD O=$PWD \
+ SYSOUT=$PWD/o \
+ M=$PWD O=$PWD/o \
%{?with_verbose:V=1}
mv nvidia.ko nvidia-$cfg.ko
done
* *
* NOTE: *
* You must install: *
- * kernel(24)(-smp)-video-nvidia-%{version} *
+ * kernel(24)(-smp)-video-nvidia-legacy-%{version} *
* for this driver to work *
* *
*******************************************************
%postun -p /sbin/ldconfig
-%post -n kernel-video-nvidia
+%post -n kernel-video-nvidia-legacy
%depmod %{_kernel_ver}
-%postun -n kernel-video-nvidia
+%postun -n kernel-video-nvidia-legacy
%depmod %{_kernel_ver}
-%post -n kernel-smp-video-nvidia
+%post -n kernel-smp-video-nvidia-legacy
%depmod %{_kernel_ver}smp
-%postun -n kernel-smp-video-nvidia
+%postun -n kernel-smp-video-nvidia-legacy
%depmod %{_kernel_ver}smp
%files
%attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o
%if %{with kernel}
-%files -n kernel-video-nvidia
+%files -n kernel-video-nvidia-legacy
%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-smp-video-nvidia-legacy
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/misc/*.ko*
%endif
projects / packages / X11-driver-nvidia-legacy.git / blobdiff