X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=3415307580a4e43ba0b0714cd0031361cae6c480;hb=8b2ba8927b61f84d79777abc3a7ac18d6bf26e71;hp=8ac50e1be9c3a063db1a6a07263fc9e154a4746e;hpb=26cf1083d1796c468bca294e428458ce43c67e6c;p=packages%2Fxorg-driver-video-nvidia.git

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 8ac50e1..3415307 100644
--- 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		6629
 %define		_min_x11	6.7.0
-%define		_rel		0.2
+%define		_rel		2
 #
 Summary:	Linux Drivers for nVidia TNT/TNT2/GeForce/Quadro Chips
 Summary(pl):	Sterowniki do kart graficznych nVidia TNT/TNT2/GeForce/Quadro
@@ -22,13 +27,13 @@ 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:	f7737c1e95371f37a4fd30da2f11e72c
-# 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:	652e69f549c81a7a3f2806daa74b9c36
-# Source1-size:	7333486
 Patch0:		%{name}-gcc34.patch
 Patch1:		%{name}-GL.patch
 Patch2:		%{name}-conftest.patch
+Patch3:		%{name}-1165235.patch
+Patch4:		%{name}-1171869.patch
 URL:		http://www.nvidia.com/object/linux.html
 BuildConflicts:	XFree86-nvidia
 BuildRequires:	grep
@@ -173,6 +178,8 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
+%patch4 -p0
 sed -i 's:-Wpointer-arith::' usr/src/nv/Makefile.kbuild
 
 %build