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=0a6476e90d5175b47c1529449e329603aa062cb9;hp=c769ea699c3f480b36e59c175f6d823a434eda88;hb=039c72218cd2b34136ee042252f36f2cce38ade5;hpb=2d490dcae86392c96cef760d9bd24cf91d8bdea0

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index c769ea6..0a6476e 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -6,48 +6,55 @@
 %bcond_with	tls		# install libraries with tls support
 #
 %define		_nv_ver		1.0
-%define		_nv_rel		5336
-%define		_nv_pkg		pkg0
+%define		_nv_rel		6106
+%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:	5432f919f0211ce36b854d87108d7db0
+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
 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)
 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
+Provides:	XFree86-driver-nvidia
 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
+%define		_libdir32	%{_prefix}/lib32
 
 %description
 This driver set adds improved 2D functionality to the XFree86 4.0 X
@@ -147,15 +154,20 @@ przez sterownik nVidii dla XFree86 4.
 
 %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
@@ -166,10 +178,14 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
     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
 
@@ -180,10 +196,17 @@ install -d $RPM_BUILD_ROOT%{_libdir}/modules/{drivers,extensions} \
 
 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}
@@ -234,6 +257,15 @@ rm -rf $RPM_BUILD_ROOT
 %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*
@@ -256,6 +288,6 @@ rm -rf $RPM_BUILD_ROOT
 # -static
 %{_libdir}/libXvMCNVIDIA.a
 
-#%files progs
-#%defattr(755,root,root,755)
-#%{_bindir}/nvidia-settings
+%files progs
+%defattr(755,root,root,755)
+%{_bindir}/nvidia-settings