%bcond_without dist_kernel # without distribution kernel
%bcond_without smp # without smp packages
%bcond_without kernel # without kernel packages
+%bcond_without incall # include all tarballs
%bcond_with verbose # verbose build (V=1)
-%bcond_with tls # install libraries with tls support
#
%define _nv_ver 1.0
-%define _nv_rel 6111
+%define _nv_rel 7667
%define _min_x11 6.7.0
-%define _rel 5
+%define _rel 3
#
+%define need_x86 0
+%define need_x8664 0
+%if %{with incall}
+%define need_x86 1
+%define need_x8664 1
+%else
+%ifarch %{ix86}
+%define need_x86 1
+%endif
+%ifarch %{x8664}
+%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
Name: X11-driver-nvidia
License: nVidia Binary
Vendor: nVidia Corp.
Group: X11/XFree86
-Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
-# Source0-md5: 51e83be46f83c52102ccb8995b54f4e2
-# Source0-size: 8167999
-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: 6c7b0c8b3ce5c34186e0c80042e6d046
-# Source1-size: 7333486
+# 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
+%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
+%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
%{?with_dist_kernel:BuildRequires: kernel-module-build >= 2.6.7}
BuildRequires: %{kgcc_package}
-BuildRequires: rpmbuild(macros) >= 1.153
+BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: sed >= 4.0
BuildRequires: textutils
#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
Requires: X11-Xserver
Requires: X11-libs >= %{_min_x11}
Requires: X11-modules >= %{_min_x11}
-%{?with_tls:Requires: glibc(tls)}
Provides: X11-OpenGL-core
Provides: X11-OpenGL-libGL
Provides: XFree86-OpenGL-core
Obsoletes: XFree86-driver-nvidia
Obsoletes: XFree86-nvidia
Conflicts: XFree86-OpenGL-devel <= 4.2.0-3
-ExclusiveArch: %{ix86} amd64
+ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLcore.so.1
%define _prefix /usr/X11R6
-%ifarch amd64
+%ifarch %{x8664}
%define _libdir32 %{_prefix}/lib
%endif
Version: %{_nv_ver}.%{_nv_rel}
Release: %{_rel}@%{_kernel_ver_str}
Group: Base/Kernel
-PreReq: modutils >= 2.3.18-2
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
%{?with_dist_kernel:%requires_releq_kernel_up}
Summary(pl): Modu³ j±dra dla obs³ugi kart graficznych nVidia
Release: %{_rel}@%{_kernel_ver_str}
Group: Base/Kernel
-PreReq: modutils >= 2.3.18-2
Requires(post,postun): /sbin/depmod
Requires: dev >= 2.7.7-10
%{?with_dist_kernel:%requires_releq_kernel_smp}
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}-pkg0
%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}-pkg0
%endif
%patch0 -p1
%patch1 -p1
+%patch2 -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
- touch include/config/MARKER
- %{__make} -C %{_kernelsrcdir} clean \
- RCS_FIND_IGNORE="-name '*.ko' -o -name nv-kernel.o -o" \
- M=$PWD O=$PWD \
- %{?with_verbose:V=1}
- %{__make} -C %{_kernelsrcdir} modules \
- CC="%{__cc}" CPP="%{__cpp}" \
- M=$PWD O=$PWD \
- %{?with_verbose:V=1}
- mv nvidia.ko nvidia-$cfg.ko
+ 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
+ %{__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
+%endif
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{_libdir}/modules/{drivers,extensions} \
- $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib},%{_bindir}}
+ $RPM_BUILD_ROOT{/usr/include/GL,/usr/%{_lib}/tls,%{_bindir}}
ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
install usr/bin/nvidia-settings $RPM_BUILD_ROOT%{_bindir}
-install usr/lib%{?with_tls:/tls}/libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{_libdir}
+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/X11R6/lib/modules/extensions/libglx.so.%{version} \
$RPM_BUILD_ROOT%{_libdir}/modules/extensions
-%ifarch amd64
+%ifarch %{x8664}
# support for running 32-bit OpenGL applications on 64-bit AMD64 Linux installations
#install -d $RPM_BUILD_ROOT%{_libdir32}
#install usr/lib32%{?with_tls:/tls}/libnvidia-tls.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/libXvMCNVIDIA.* $RPM_BUILD_ROOT%{_libdir}
+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 %{_libdir}/libGL.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so.1
ln -sf %{_libdir}/libGL.so $RPM_BUILD_ROOT/usr/%{_lib}/libGL.so
+%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 \
install nvidia-smp.ko \
$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/nvidia.ko
%endif
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc LICENSE
-%doc usr/share/doc/{README,NVIDIA_Changelog,XF86Config.sample}
-%lang(de) %doc usr/share/doc/README.DE
+%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample}
+#%%lang(de) %doc usr/share/doc/README.DE
%attr(755,root,root) %{_libdir}/libGL.so.*.*
%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}/libnvidia-tls.so.*.*.*
-%ifarch amd64
+%dir /usr/%{_lib}/tls
+%attr(755,root,root) /usr/%{_lib}/libnvidia-tls.so.*.*.*
+%attr(755,root,root) /usr/%{_lib}/tls/libnvidia-tls.so.*.*.*
+%ifarch %{x8664}
# support for running 32-bit OpenGL applications on 64-bit AMD64 Linux installations
#dir %{_libdir32}
#attr(755,root,root) %{_libdir32}/libGL.so.*.*
%{_libdir}/libXvMCNVIDIA.a
%files progs
-%defattr(755,root,root,755)
-%{_bindir}/nvidia-settings
+%defattr(644,root,root,755)
+%doc usr/share/doc/nvidia-settings-user-guide.txt
+%attr(755,root,root) %{_bindir}/nvidia-settings