X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=0ed96896afc8cfd8b29bd24c8642b6fe73d0463d;hp=72bb271d6edd07864e3e28af5617d62c013e97ce;hb=e24c88a125d23fa23a0e2e1bcef4649ece29fc4a;hpb=bae116ea2866e777a00df5e502b4946007334cb8

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 72bb271..0ed9689 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -25,21 +25,21 @@
 %define		no_install_post_check_so 1
 
 %define		pname		xorg-driver-video-nvidia
-%define		rel		2%{?with_multigl:.mgl}
+%define		rel		4%{?with_multigl:.mgl}
 
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
 Summary(pl.UTF-8):	Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:		%{pname}
-Version:	260.19.12
+Version:	270.30
 Release:	%{rel}
 Epoch:		1
 License:	nVidia Binary
 Group:		X11
 Source0:	http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run
-# Source0-md5:	8bcefb2423908160d3676200650ad5c9
+# Source0-md5:	ff319212b9ac52d645df31027c31ee45
 Source1:	http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run
-# Source1-md5:	111da94be1ea21c0531b6e1c45d01b9b
+# Source1-md5:	2fa08295aa0d0ea21646bdc9630c5116
 Source2:	%{pname}-xinitrc.sh
 Source3:	gl.pc.in
 Patch0:		X11-driver-nvidia-GL.patch
@@ -54,7 +54,7 @@ BuildRequires:	sed >= 4.0
 BuildConflicts:	XFree86-nvidia
 Requires:	%{pname}-libs = %{epoch}:%{version}-%{rel}
 Requires:	xorg-xserver-server
-Requires:	xorg-xserver-server(videodrv-abi) <= 8.0
+Requires:	xorg-xserver-server(videodrv-abi) <= 10.0
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
 Provides:	xorg-xserver-module(glx)
 Obsoletes:	XFree86-driver-nvidia
@@ -264,10 +264,12 @@ install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh
 
 for f in \
 	libGL.so.%{version}			\
+	libOpenCL.so.1.0.0			\
 	libXvMCNVIDIA.so.%{version}		\
 	libcuda.so.%{version}			\
 	libnvidia-cfg.so.%{version}		\
 	libnvidia-glcore.so.%{version}		\
+	libnvidia-ml.so.%{version}		\
 	tls/libnvidia-tls.so.%{version}		\
 ; do
 %if %{without multigl}
@@ -277,6 +279,8 @@ for f in \
 %endif
 done
 
+/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
+
 cp -a libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}
 install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau
 
@@ -287,7 +291,7 @@ install -p nvidia_drv.so \
 install -p libnvidia-wfb.so.%{version} \
 	$RPM_BUILD_ROOT%{_libdir}/xorg/modules
 
-cp -a gl*.h $RPM_BUILD_ROOT%{_includedir}/GL
+cp -p gl*.h $RPM_BUILD_ROOT%{_includedir}/GL
 
 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so
 ln -sf nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -300,19 +304,27 @@ echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf
 ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1
 ln -sf nvidia/libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
 
-ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
+ln -sf libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenCL.so.1
+ln -sf nvidia/libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so
+
 ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
+ln -sf nvidia/libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
 
 ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
+ln -sf nvidia/libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so.%{version}
 %else
 # OpenGL ABI for Linux compatibility
 ln -sf libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libGL.so.1
 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
 
-ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
+ln -sf libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so.1
+ln -sf libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/libOpenCL.so
+
 ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynamic.so.1
+ln -sf libXvMCNVIDIA_dynamic.so.1 $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA.so
 
-ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
+ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1
+ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so
 %endif
 %endif
 
@@ -321,7 +333,11 @@ ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so
 %endif
 
 install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
-sed -e 's|@@prefix@@|%{_prefix}|g;s|@@libdir@@|%{_libdir}|g;s|@@includedir@@|%{_includedir}|g;s|@@version@@|%{version}|g' < %{SOURCE3} \
+sed -e '
+	s|@@prefix@@|%{_prefix}|g;
+	s|@@libdir@@|%{_libdir}|g;
+	s|@@includedir@@|%{_includedir}|g;
+	s|@@version@@|%{version}|g' < %{SOURCE3} \
 	> $RPM_BUILD_ROOT%{_pkgconfigdir}/gl.pc
 
 %clean
@@ -331,11 +347,6 @@ rm -rf $RPM_BUILD_ROOT
 cat << 'EOF'
 NOTE: You must also install kernel module for this driver to work
   kernel-video-nvidia-%{version}
-  kernel-desktop-video-nvidia-%{version}
-  kernel-laptop-video-nvidia-%{version}
-  kernel-vanilla-video-nvidia-%{version}
-
-Depending on which kernel brand you use.
 
 EOF
 %if %{with multigl}
@@ -380,13 +391,19 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
 %dir %{_libdir}/nvidia
 %attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1
+%attr(755,root,root) %{_libdir}/libOpenCL.so
+%attr(755,root,root) %{_libdir}/nvidia/libOpenCL.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/nvidia/libOpenCL.so.1
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
 %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1
 %attr(755,root,root) %{_libdir}/libcuda.so
+%attr(755,root,root) %ghost %{_libdir}/libcuda.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.*
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glcore.so.*.*
+%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ml.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnvidia-ml.so.1
 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.*
 %else
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
@@ -394,13 +411,20 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
 # symlink for binary apps which fail to conform Linux OpenGL ABI
 # (and dlopen libGL.so instead of libGL.so.1)
 %attr(755,root,root) %{_libdir}/libGL.so
+%attr(755,root,root) %{_libdir}/libOpenCL.so
+%attr(755,root,root) %{_libdir}/libOpenCL.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libOpenCL.so.1
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so
 %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libXvMCNVIDIA_dynamic.so.1
 %attr(755,root,root) %{_libdir}/libcuda.so
+%attr(755,root,root) %ghost %{_libdir}/libcuda.so.1
 %attr(755,root,root) %{_libdir}/libcuda.so.*.*
 %attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnvidia-cfg.so.1
 %attr(755,root,root) %{_libdir}/libnvidia-glcore.so.*.*
+%attr(755,root,root) %{_libdir}/libnvidia-ml.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnvidia-ml.so.1
 %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*
 %endif
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.*