X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=42beae46fb60d573b9d795d0c27bc0f6e2e38c34;hp=fd9b12341b374e1ff7c9221ee9e88e8768b66338;hb=ba94a1cfeef5a8165c05fd5ccf063374af95cdef;hpb=4d7dd0f2b4ec996b55b70102cf284203cc7fb3e5

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index fd9b123..42beae4 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -4,12 +4,11 @@
 %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		6111
+%define		_nv_rel		7167
 %define		_min_x11	6.7.0
-%define		_rel		5
+%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,12 +18,17 @@ 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:	d88d606873be255e8c4926961a1f09bf
 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:	a0433d841c41862af266300b589c12a7
 Patch0:		%{name}-gcc34.patch
 Patch1:		%{name}-GL.patch
+Patch2:		%{name}-conftest.patch
+# http://www.minion.de/files/1.0-6629/
+Patch3:		NVIDIA_kernel-1.0-7167-1233959.diff
+Patch4:		NVIDIA_kernel-1.0-7167-1237815.diff
 URL:		http://www.nvidia.com/object/linux.html
 BuildConflicts:	XFree86-nvidia
 BuildRequires:	grep
@@ -37,7 +41,6 @@ BuildRequires:	textutils
 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
@@ -168,41 +171,51 @@ rm -rf NVIDIA-Linux-x86*-%{_nv_ver}-%{_nv_rel}-pkg*
 %endif
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p0
+%patch4 -p0
 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
@@ -214,7 +227,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}
 
@@ -226,6 +240,7 @@ ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
 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 \
@@ -234,6 +249,7 @@ 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
@@ -271,12 +287,14 @@ 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.*.*
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
-%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.*
+%dir /usr/%{_lib}/tls
+%attr(755,root,root) /usr/%{_lib}/libnvidia-tls.so.*.*.*
+%attr(755,root,root) /usr/%{_lib}/tls/libnvidia-tls.so.*.*.*
 %ifarch amd64
 # support for running 32-bit OpenGL applications on 64-bit AMD64 Linux installations
 #dir %{_libdir32}