]> git.pld-linux.org Git - packages/X11-driver-nvidia-legacy.git/blobdiff - X11-driver-nvidia-legacy.spec
- initial
[packages/X11-driver-nvidia-legacy.git] / X11-driver-nvidia-legacy.spec
index 10b50b6d4f0c35ac6b4cff7ef2d317fa3b19e4e6..c227afe606a88cf5e1688ddae30634f4abbf0dcc 100644 (file)
@@ -5,11 +5,11 @@
 %bcond_without kernel          # without kernel packages
 %bcond_with    verbose         # verbose build (V=1)
 #
-### NOT CHANGE THIS #################
+### 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            5
+%define                _rel            2
 #####################################
 #
 %define                oldname         X11-driver-nvidia
@@ -20,25 +20,21 @@ Name:               X11-driver-nvidia-legacy
 Version:       %{_nv_ver}.%{_nv_rel}
 Release:       %{_rel}
 License:       nVidia Binary
-Vendor:                nVidia Corp.
 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
-# http://www.minion.de/files/1.0-6629/
+Patch2:                %{name}-verbose.patch
 URL:           http://www.nvidia.com/object/linux.html
-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}
@@ -46,7 +42,8 @@ Requires:     X11-modules >= %{_min_x11}
 Provides:      X11-OpenGL-core
 Provides:      X11-OpenGL-libGL
 Provides:      XFree86-OpenGL-core
-Provides:      XFree86-OpenGL-libGL    
+Provides:      XFree86-OpenGL-libGL
+Obsoletes:     %{oldname} < 1.0.7174
 Obsoletes:     Mesa
 Obsoletes:     X11-OpenGL-core
 Obsoletes:     X11-OpenGL-libGL
@@ -54,7 +51,6 @@ Obsoletes:    XFree86-OpenGL-core
 Obsoletes:     XFree86-OpenGL-libGL
 Obsoletes:     XFree86-driver-nvidia
 Obsoletes:     XFree86-nvidia
-Obsoletes:     %{oldname} < 1.0.7174
 #Conflicts:    %{oldname}
 Conflicts:     XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch: %{ix86} %{x8664}
@@ -67,13 +63,13 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %endif
 
 %description
-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.
+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.
 
 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
+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.
 
@@ -93,9 +89,9 @@ Summary(pl):  Pliki nag
 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
-Obsoletes:     %{oldname}-devel < 1.0.7174
 Conflicts:     %{oldname}-devel
 Conflicts:     XFree86-OpenGL-devel < 4.3.99.902-0.3
 
@@ -111,8 +107,8 @@ Summary:    Tools for advanced control of nVidia graphic cards
 Summary(pl):   Narzêdzia do zarz±dzania kartami graficznymi nVidia
 Group:         Applications/System
 Requires:      %{name} = %{version}-%{release}
-Obsoletes:     XFree86-driver-nvidia-progs
 Obsoletes:     %{oldname}-progs < 1.0.7174
+Obsoletes:     XFree86-driver-nvidia-progs
 Conflicts:     %{oldname}-progs
 
 %description progs
@@ -134,7 +130,7 @@ Requires:   dev >= 2.7.7-10
 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel
 Obsoletes:     kernel-video-nvidia < 1.0.7174
-Conflicts:     kernel-video-nvidia     
+Conflicts:     kernel-video-nvidia
 
 %description -n kernel-video-nvidia-legacy
 nVidia Architecture support for Linux kernel.
@@ -158,7 +154,7 @@ Requires:   dev >= 2.7.7-10
 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel
 Obsoletes:     kernel-smp-video-nvidia < 1.0.7174
-Conflicts:     kernel-smp-video-nvidia 
+Conflicts:     kernel-smp-video-nvidia
 
 %description -n kernel-smp-video-nvidia-legacy
 nVidia Architecture support for Linux kernel SMP.
@@ -182,7 +178,9 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %endif
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+%if %{with verbose}
+%patch2 -p0
+%endif
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build
@@ -193,24 +191,28 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
        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
+       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} -j1 -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
This page took 0.083742 seconds and 4 git commands to generate.