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=eb2a8655b9a5bfe23f8bc5cd367932808acf175c;hp=54360dae2c30fe6b734654080bc0d55b78c5e6c9;hb=41b9c00fc23871b14f205232e975da988d03c948;hpb=94b0339450de83d416346e36827b312e8f37daca diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 54360da..eb2a865 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -22,24 +22,23 @@ # nothing to be placed to debuginfo package %define _enable_debug_packages 0 %endif +%define no_install_post_check_so 1 -%define pname xorg-driver-video-nvidia -%define rel 4 -%define relcrap %{rel}%{?with_multigl:.mgl} - +%define rel 0.1%{?with_multigl:.mgl} +%define pname xorg-driver-video-nvidia 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: 256.35 -Release: %{relcrap} +Version: 285.05.09 +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: f6af8917a500de28396a438f3f548c88 +# Source0-md5: 2d469a90abef50320f548cfa8085e3a0 Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 7b5924f14a4d2326b4d916efdb7852ff +# Source1-md5: 2f4a0e78f5560c07220b7ed6fc1e27aa Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Patch0: X11-driver-nvidia-GL.patch @@ -52,10 +51,11 @@ BuildRequires: %{kgcc_package} BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia -Requires: %{pname}-libs = %{epoch}:%{version}-%{relcrap} +Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 7.0 +Requires: xorg-xserver-server(videodrv-abi) <= 11.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 +Provides: xorg-driver-video Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia Obsoletes: XFree86-nvidia @@ -130,7 +130,7 @@ Summary: OpenGL (GL and GLX) header files Summary(hu.UTF-8): OpenGL (GL és GLX) fejléc fájlok Summary(pl.UTF-8): Pliki nagłówkowe OpenGL (GL i GLX) Group: X11/Development/Libraries -Requires: %{pname}-libs = %{epoch}:%{version}-%{relcrap} +Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Provides: OpenGL-GLX-devel = 1.4 Provides: OpenGL-devel = 2.1 Obsoletes: X11-OpenGL-devel-base @@ -154,7 +154,7 @@ Summary: Static XvMCNVIDIA library Summary(hu.UTF-8): Statikus XwMCNVIDIA könyvtár Summary(pl.UTF-8): Statyczna biblioteka XvMCNVIDIA Group: X11/Development/Libraries -Requires: %{pname}-devel = %{epoch}:%{version}-%{relcrap} +Requires: %{pname}-devel = %{epoch}:%{version}-%{rel} %description static Static XvMCNVIDIA library. @@ -178,7 +178,7 @@ Summary: Tools for advanced control of nVidia graphic cards Summary(hu.UTF-8): Eszközök az nVidia grafikus kártyák beállításához Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia Group: Applications/System -Requires: %{pname} = %{epoch}:%{version}-%{relcrap} +Requires: %{pname} = %{epoch}:%{version}-%{rel} Suggests: pkgconfig Obsoletes: XFree86-driver-nvidia-progs @@ -196,12 +196,12 @@ Summary: nVidia kernel module for nVidia Architecture support Summary(de.UTF-8): Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung Summary(hu.UTF-8): nVidia Architektúra támogatás Linux kernelhez. Summary(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia -Release: %{relcrap}@%{_kernel_ver_str} +Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod Requires: dev >= 2.7.7-10 %{?with_dist_kernel:%requires_releq_kernel} -Requires: %{pname} = %{epoch}:%{version}-%{relcrap} +Requires: %{pname} = %{epoch}:%{version}-%{rel} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel @@ -250,33 +250,43 @@ rm -rf $RPM_BUILD_ROOT %if %{with userspace} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ - $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda},%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ - $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} + $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ + $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \ + $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors + %if %{with multigl} install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d} %endif install -p nvidia-{settings,smi,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir} -cp -a nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 -cp -a nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} -cp -a nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} +cp -p nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 +cp -p nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} +cp -p nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh +install -p nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors + +%if %{without multigl} +install -p libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir} +%else +install -p libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia +%endif for f in \ - libGL.so.%{version} \ + libOpenCL.so.1.0.0 \ libXvMCNVIDIA.so.%{version} \ libcuda.so.%{version} \ + libnvcuvid.so.%{version} \ libnvidia-cfg.so.%{version} \ + libnvidia-compiler.so.%{version} \ libnvidia-glcore.so.%{version} \ + libnvidia-ml.so.%{version} \ tls/libnvidia-tls.so.%{version} \ ; do -%if %{without multigl} install -p $f $RPM_BUILD_ROOT%{_libdir} -%else - install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia -%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,8 +297,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 -a cuda*.h $RPM_BUILD_ROOT%{_includedir}/cuda +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,21 +309,23 @@ echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf # OpenGL ABI for Linux compatibility 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 libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1 - -ln -sf nvidia/libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so %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 +%endif + +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.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 -%endif +ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1 +ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so + +ln -sf libnvcuvid.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libnvcuvid.so.1 +ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/libnvcuvid.so %endif %if %{with kernel} @@ -322,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 @@ -332,21 +347,17 @@ 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 +# until versioned SONAME is built for nvidia_drv.so, update symlink manually +ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %if %{with multigl} if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then + /sbin/ldconfig -N %{_libdir}/xorg/modules/extensions ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so fi %else /sbin/ldconfig -N %{_libdir}/xorg/modules/extensions -# until versioned SONAME is built for nvidia_drv.so, update symlink manually -ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so %endif @@ -376,34 +387,40 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so %files libs %defattr(644,root,root,755) +%dir %{_sysconfdir}/OpenCL +%dir %{_sysconfdir}/OpenCL/vendors +%{_sysconfdir}/OpenCL/vendors/nvidia.icd %if %{with multigl} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf %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}/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) %{_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-tls.so.*.* %else %attr(755,root,root) %{_libdir}/libGL.so.*.* %attr(755,root,root) %ghost %{_libdir}/libGL.so.1 # 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 +%endif +%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}/libnvcuvid.so +%attr(755,root,root) %ghost %{_libdir}/libnvcuvid.so.1 +%attr(755,root,root) %{_libdir}/libnvcuvid.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-compiler.so.*.* %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.*.* %attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1 @@ -414,7 +431,6 @@ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so %{_includedir}/GL/glext.h %{_includedir}/GL/glx.h %{_includedir}/GL/glxext.h -%{_includedir}/cuda %if %{with multigl} %attr(755,root,root) %{_libdir}/libGL.so %endif