# 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
#
%define _nv_ver 1.0
-%define _nv_rel 5336
-%define _nv_pkg pkg0
+%define _nv_rel 6111
+%define _min_x11 6.7.0
+%define _rel 1
#
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
Version: %{_nv_ver}.%{_nv_rel}
-%define _rel 4
Release: %{_rel}
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}-%{_nv_pkg}.run
-# Source0-md5: 2ceffa20391d5471b8a483101563eccb
+Source0: http://download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}-%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-pkg1.run
+# Source0-md5: 51e83be46f83c52102ccb8995b54f4e2
+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
Patch0: %{name}-gcc34.patch
-Patch1: %{name}-api_calls.patch
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: sed >= 4.0
BuildRequires: textutils
-Requires: X11-driver-nvidia(kernel)
+#BuildRequires: X11-devel >= %{_min_x11} # disabled for now
Requires: X11-Xserver
-Requires: X11-libs >= 4.0.1
-Requires: X11-modules >= 4.0.1
+Requires: X11-libs >= %{_min_x11}
+Requires: X11-modules >= %{_min_x11}
%{?with_tls:Requires: glibc(tls)}
Provides: X11-OpenGL-core
-Provides: XFree86-driver-nvidia
+Provides: X11-OpenGL-libGL
Provides: XFree86-OpenGL-core
+Provides: XFree86-OpenGL-libGL
Obsoletes: Mesa
+Obsoletes: X11-OpenGL-core
+Obsoletes: X11-OpenGL-libGL
Obsoletes: XFree86-OpenGL-core
Obsoletes: XFree86-OpenGL-libGL
Obsoletes: XFree86-driver-nvidia
Obsoletes: XFree86-nvidia
Conflicts: XFree86-OpenGL-devel <= 4.2.0-3
-ExclusiveArch: %{ix86}
+ExclusiveArch: %{ix86} amd64
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _noautoreqdep libGL.so.%{_nv_ver}.%{_nv_rel} libGLcore.so.%{_nv_ver}.%{_nv_rel}
+%define _noautoreqdep libGL.so.1 libGLcore.so.1
%define _prefix /usr/X11R6
+%ifarch amd64
+%define _libdir32 %{_prefix}/lib
+%endif
%description
This driver set adds improved 2D functionality to the XFree86 4.0 X
Summary: Tools for advanced control of nVidia graphic cards
Summary(pl): Narzêdzia do zarz±dzania kartami graficznymi nVidia
Group: Application/System
+Obsoletes: XFree86-driver-nvidia-progs
Requires: %{name} = %{version}-%{release}
%description progs
%prep
cd %{_builddir}
-rm -rf NVIDIA-Linux-x86-%{_nv_ver}-%{_nv_rel}-%{_nv_pkg}
+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}-%{_nv_pkg}
+%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}-pkg2
+%endif
%patch0 -p1
-%patch1 -p1
+sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
%build
cd usr/src/nv/
-cp Makefile.kbuild Makefile
+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
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 modules \
+ %{__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
done
ln -sf $RPM_BUILD_ROOT%{_libdir} $RPM_BUILD_ROOT%{_prefix}/../lib
-install usr/lib%{?with_tls:/tls}/libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}
-install usr/lib%{?with_tls:/tls}/libGLcore.so.%{version} $RPM_BUILD_ROOT%{_libdir}
-install usr/X11R6/lib/modules/extensions%{?with_tls:/tls}/libglx.so.%{version} \
+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/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
+# 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}
+#install usr/lib32/libGL{,core}.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}
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+cat << EOF
+
+ *******************************************************
+ * *
+ * NOTE: *
+ * You must install: *
+ * kernel-video-nvidia-%{version}-%{release} *
+ * for this driver to work correctly *
+ * *
+ *******************************************************
+
+EOF
+
%postun -p /sbin/ldconfig
%post -n kernel-video-nvidia
%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
+# support for running 32-bit OpenGL applications on 64-bit AMD64 Linux installations
+#dir %{_libdir32}
+#attr(755,root,root) %{_libdir32}/libGL.so.*.*
+#attr(755,root,root) %{_libdir32}/libGLcore.so.*.*
+#attr(755,root,root) %{_libdir32}/libXvMCNVIDIA.so.*.*
+#attr(755,root,root) %{_libdir32}/libnvidia-tls.so.*.*.*
+%endif
%attr(755,root,root) /usr/%{_lib}/libGL.so.1
%attr(755,root,root) /usr/%{_lib}/libGL.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)
# -static
%{_libdir}/libXvMCNVIDIA.a
-#%files progs
-#%defattr(755,root,root,755)
-#%{_bindir}/nvidia-settings
+%files progs
+%defattr(755,root,root,755)
+%{_bindir}/nvidia-settings
projects / packages / xorg-driver-video-nvidia.git / blobdiff