# Conditional build:
%bcond_without dist_kernel # without distribution kernel
%bcond_without smp # without smp packages
+%bcond_without kernel # without kernel packages
%bcond_with verbose # verbose build (V=1)
%bcond_with tls # install libraries with tls support
+%bcond_with nptl # implies TLS support
+#
+%if %{with nptl}
+%define with_tls 1
+%endif
#
%define _nv_ver 1.0
-%define _nv_rel 6106
+%define _nv_rel 6629
%define _min_x11 6.7.0
-%define _rel 2
+%define _rel 1
#
Summary: Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
Summary(pl): Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
License: nVidia Binary
Vendor: nVidia Corp.
Group: X11/XFree86
+# 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: 5432f919f0211ce36b854d87108d7db0
+# Source0-md5: f7737c1e95371f37a4fd30da2f11e72c
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: 024f21a3fa134bee8339adac64bdc77a
+# Source1-md5: 652e69f549c81a7a3f2806daa74b9c36
Patch0: %{name}-gcc34.patch
+Patch1: %{name}-GL.patch
+Patch2: %{name}-conftest.patch
URL: http://www.nvidia.com/object/linux.html
BuildConflicts: XFree86-nvidia
BuildRequires: grep
BuildRequires: rpmbuild(macros) >= 1.153
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}
Provides: X11-OpenGL-libGL
Provides: XFree86-OpenGL-core
Provides: XFree86-OpenGL-libGL
-Provides: XFree86-driver-nvidia
Obsoletes: Mesa
Obsoletes: X11-OpenGL-core
Obsoletes: X11-OpenGL-libGL
%package progs
Summary: Tools for advanced control of nVidia graphic cards
Summary(pl): Narzêdzia do zarz±dzania kartami graficznymi nVidia
-Group: Application/System
+Group: Applications/System
+Obsoletes: XFree86-driver-nvidia-progs
Requires: %{name} = %{version}-%{release}
%description progs
%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}-%{_nv_rel}-pkg2
%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
%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}
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
+%post
+/sbin/ldconfig
cat << EOF
*******************************************************
* *
* NOTE: *
* You must install: *
- * kernel-video-nvidia-%{version}-%{release} *
- * for this driver to work correctly *
+ * kernel(24)(-smp)-video-nvidia-%{version} *
+ * for this driver to work *
* *
*******************************************************
EOF
-%postun -p /sbin/ldconfig
-
-%post st -p /sbin/ldconfig
-%postun st -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
%post -n kernel-video-nvidia
%depmod %{_kernel_ver}
%defattr(644,root,root,755)
%doc LICENSE
%doc usr/share/doc/{README,NVIDIA_Changelog,XF86Config.sample}
-%lang(de) %doc usr/share/doc/README.DE
+#%%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}/modules/extensions/libglx.so*
%attr(755,root,root) %{_libdir}/modules/drivers/nvidia_drv.o
+%if %{with kernel}
%files -n kernel-video-nvidia
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}/misc/*.ko*
%defattr(644,root,root,755)
/lib/modules/%{_kernel_ver}smp/misc/*.ko*
%endif
+%endif
%files devel
%defattr(644,root,root,755)
projects / packages / xorg-driver-video-nvidia.git / blobdiff