%bcond_with verbose # verbose build (V=1)
#
%define _nv_ver 1.0
-%define _nv_rel 7667
+%define _nv_rel 8178
%define _min_x11 6.7.0
-%define _rel 3
+%define _rel 2
#
%define need_x86 0
%define need_x8664 0
Release: %{_rel}
License: nVidia Binary
Vendor: nVidia Corp.
-Group: X11/XFree86
+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}-pkg0.run
-# Source0-md5: 1d062204da2902ae86154a03e1a40204
+Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
+# Source0-md5: bc9d459bfeee93735e3959de041635df
%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}-pkg0.run
-# Source1-md5: fa4e143a3193c0bd9cd697eb8637b354
+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
%endif
Patch0: %{name}-gcc34.patch
Patch1: %{name}-GL.patch
Patch2: %{name}-conftest.patch
# http://www.minion.de/files/1.0-6629/
URL: http://www.nvidia.com/object/linux.html
-BuildConflicts: XFree86-nvidia
BuildRequires: grep
+%if %{with kernel}
%{?with_dist_kernel:BuildRequires: kernel-module-build >= 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
+BuildConflicts: XFree86-nvidia
Requires: X11-Xserver
Requires: X11-libs >= %{_min_x11}
Requires: X11-modules >= %{_min_x11}
%endif
%description
-This driver set adds improved 2D functionality to the XFree86 4.0 X
+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 XFree86 4.0 install and are not supported by this driver set.
-
-Software: Linux kernel >= 2.2.12, XFree86 >= 4.0.
+the base Xorg/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
+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 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/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.
%package devel
Summary: OpenGL for X11R6 development (only gl?.h)
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: XFree86-driver-nvidia-progs
%description progs
Tools for advanced control of nVidia graphic cards.
%description -n kernel-video-nvidia -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
Summary: nVidia kernel module for nVidia Architecture support
%description -n kernel-smp-video-nvidia -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}
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}-pkg0
+%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}-pkg0
+%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg1
%endif
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
%build
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
+%if %{without dist_kernel}
+ ln -sf %{_kernelsrcdir}/scripts
+%endif
touch include/config/MARKER
%{__make} -C %{_kernelsrcdir} clean \
RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
projects / packages / xorg-driver-video-nvidia.git / blobdiff