- post 2.6.10 patchset.

[packages/xorg-driver-video-nvidia.git] / xorg-driver-video-nvidia.spec

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 6891e9c2d04a85a131395defc77cb9de2c4182a1..22f35c7dcaec95e988ac132d4e553fcf5ed1b957 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -5,11 +5,16 @@
 %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         6111
+%define                _nv_rel         6629
 %define                _min_x11        6.7.0
-%define                _rel            4
+%define                _rel            1
 #
 Summary:       Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl):   Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
@@ -19,17 +24,18 @@ Release:    %{_rel}
 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: 51e83be46f83c52102ccb8995b54f4e2
+# 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: 6c7b0c8b3ce5c34186e0c80042e6d046
+# 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
 %{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.7}
-%{?with_dist_kernel:BuildRequires:     kernel-source >= 2.6.7}
 BuildRequires: %{kgcc_package}
 BuildRequires: rpmbuild(macros) >= 1.153
 BuildRequires: sed >= 4.0
@@ -169,31 +175,38 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %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
@@ -215,7 +228,8 @@ install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \
 %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}
 
@@ -272,7 +286,7 @@ EOF
 %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.*.*