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=b50b0605426cf7804da39868108c7576ce387616;hp=1482323aaf990de86ba74baa2389cda1c75a92bd;hb=7341cfe7bf19b3083b3c2e8076a01dd5e29a5b11;hpb=3d1a6bed8598c8920b8d9fb21a2cca664ddc9abc diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 1482323..b50b060 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -22,23 +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 1 - +%define rel 6%{?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: 195.36.15 -Release: %{rel}%{?with_multigl:.mgl} +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}-pkg0.run -# Source0-md5: b09b45113585524b08b3b2acfdf4a290 -Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run -# Source1-md5: 82ff23e6d02b9f208c618ec17c60ca29 +Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run +# Source0-md5: 2d469a90abef50320f548cfa8085e3a0 +Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run +# Source1-md5: 2f4a0e78f5560c07220b7ed6fc1e27aa Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Patch0: X11-driver-nvidia-GL.patch @@ -53,8 +53,9 @@ BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 6.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 @@ -62,7 +63,7 @@ Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define _noautoreqdep libGL.so.1 libGLcore.so.1 +%define _noautoreqdep libGL.so.1 %description This driver set adds improved 2D functionality to the Xorg X server as @@ -219,21 +220,21 @@ sterownik nVidii dla Xorg/XFree86. %prep cd %{_builddir} -rm -rf NVIDIA-Linux-x86*-%{version}-pkg* +rm -rf NVIDIA-Linux-x86*-%{version}* %ifarch %{ix86} /bin/sh %{SOURCE0} --extract-only -%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg0 +%setup -qDT -n NVIDIA-Linux-x86-%{version} %else /bin/sh %{SOURCE1} --extract-only -%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg0 +%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-no-compat32 %endif %patch0 -p1 %patch1 -p1 -echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild +echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build %if %{with kernel} -cd usr/src/nv +cd kernel ln -sf Makefile.kbuild Makefile cat >> Makefile <<'EOF' @@ -249,44 +250,54 @@ 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 usr/bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir} -cp -a usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 -cp -a usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} -cp -a usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} +install -p nvidia-{settings,smi,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir} +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 -for f in \ - usr/lib/tls/libnvidia-tls.so.%{version} \ - usr/lib/libnvidia-cfg.so.%{version} \ - usr/lib/libGL{,core}.so.%{version} \ - usr/lib/libcuda.so.%{version} \ - usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ -; do %if %{without multigl} - install -p $f $RPM_BUILD_ROOT%{_libdir} +install -p libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir} %else - install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia +install -p libGL.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia %endif + +for f in \ + 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 + install -p $f $RPM_BUILD_ROOT%{_libdir} done -cp -a usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} -install -p usr/lib/vdpau/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau +/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir} -install -p usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ +cp -a libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} +install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau + +install -p libglx.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions -install -p usr/X11R6/lib/modules/drivers/nvidia_drv.so \ +install -p nvidia_drv.so \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version} -install -p usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \ +install -p libnvidia-wfb.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules -cp -a usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL -cp -a usr/include/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 @@ -298,29 +309,35 @@ 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} -%install_kernel_modules -m usr/src/nv/nvidia -d misc +%install_kernel_modules -m kernel/nvidia -d misc %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 @@ -330,21 +347,18 @@ 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 %post libs @@ -364,8 +378,7 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %if %{with userspace} %files %defattr(644,root,root,755) -%doc LICENSE -%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample} +%doc LICENSE NVIDIA_Changelog README.txt %attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.* %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.* %attr(755,root,root) %ghost %{_libdir}/xorg/modules/extensions/libglx.so @@ -374,34 +387,40 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.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}/nvidia/libGLcore.so.*.* -%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-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 -%attr(755,root,root) %{_libdir}/libGLcore.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 @@ -412,7 +431,6 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.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 @@ -424,13 +442,14 @@ ln -sf nvidia_drv.so.%{version} %{_libdir}/xorg/modules/drivers/nvidia_drv.so %files doc %defattr(644,root,root,755) -%doc usr/share/doc/html/* +%doc html/* %files progs %defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh %attr(755,root,root) %{_bindir}/nvidia-settings +%attr(755,root,root) %{_bindir}/nvidia-smi %attr(755,root,root) %{_bindir}/nvidia-xconfig -%attr(755,root,root) %{_bindir}/nvidia-bug-report.sh %attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh %{_desktopdir}/nvidia-settings.desktop %{_mandir}/man1/nvidia-*