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=161616cfac636f67bdbba15c24527c4bff1e37d7;hp=f582bd3a6b6996c07870f3fcaba815140751b5cd;hb=f4d2c99eec94f2583849c85a5d7a561f9e665c26;hpb=502a464c07493218c7358bb4c9580fec13ae04e4 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index f582bd3..161616c 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -22,23 +22,24 @@ # 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 8 +%define rel 2%{?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: 190.42 -Release: %{rel}%{?with_multigl:.mgl} +Version: 260.19.29 +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: f94806feee87de756d14fe3e9bcaf05a -Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run -# Source1-md5: ae431ff849ec01446e6724f9fcfe3bb4 +Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run +# Source0-md5: e982a05a85c68130acfe1d48086250e3 +Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run +# Source1-md5: 0583668d86f7318d99def3ed3e1cc4bc Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Patch0: X11-driver-nvidia-GL.patch @@ -53,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) <= 6.0 +Requires: xorg-xserver-server(videodrv-abi) <= 8.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-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 @@ -103,7 +104,8 @@ Starsze układy graficzne nie są obsługiwane przez ten pakiet: Summary: OpenGL (GL and GLX) Nvidia libraries Summary(pl.UTF-8): Biblioteki OpenGL (GL i GLX) Nvidia Group: X11/Development/Libraries -#Requires: %{pname} = %{epoch}:%{version}-%{rel} +Requires(post,postun): /sbin/ldconfig +Requires: libvdpau >= 0.3 Provides: OpenGL = 2.1 Provides: OpenGL-GLX = 1.4 %if %{without multigl} @@ -163,6 +165,14 @@ Statikus XwMCNVIDIA könyvtár. %description static -l pl.UTF-8 Statyczna biblioteka XvMCNVIDIA. +%package doc +Summary: Documentation for NVIDIA Graphics Driver +Group: Documentation + +%description doc +NVIDIA Accelerated Linux Graphics Driver README and Installation +Guide. + %package progs 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 @@ -210,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' @@ -240,49 +250,48 @@ 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},%{_bindir},%{_mandir}/man1} \ + $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} %if %{with multigl} install -d $RPM_BUILD_ROOT{%{_libdir}/nvidia,%{_sysconfdir}/ld.so.conf.d} %endif -install usr/bin/nvidia-{settings,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir} -install usr/share/man/man1/nvidia-{settings,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 -install usr/share/applications/nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} -install usr/share/pixmaps/nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} -install %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh +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} +install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh 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/lib/libvdpau_nvidia.so.%{version} \ - usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ -%if %{without multigl} - usr/X11R6/lib/libXvMCNVIDIA.a \ + libGL.so.%{version} \ + libXvMCNVIDIA.so.%{version} \ + libcuda.so.%{version} \ + libnvidia-cfg.so.%{version} \ + libnvidia-glcore.so.%{version} \ + tls/libnvidia-tls.so.%{version} \ ; do - install $f $RPM_BUILD_ROOT%{_libdir} -done +%if %{without multigl} + install -p $f $RPM_BUILD_ROOT%{_libdir} %else -; do - install $f $RPM_BUILD_ROOT%{_libdir}/nvidia -done -install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} + install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia %endif +done + +cp -a libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} +install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau -install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ +install -p libglx.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions -install 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 usr/X11R6/lib/modules/libnvidia-wfb.so.%{version} \ +install -p libnvidia-wfb.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules -install usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL -install usr/include/cuda/*.h $RPM_BUILD_ROOT%{_includedir}/cuda +cp -a 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 +ln -sf libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1 %if %{with multigl} echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf @@ -308,7 +317,7 @@ ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.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} @@ -322,11 +331,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} @@ -335,10 +339,18 @@ if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then 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 -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%post libs +/sbin/ldconfig +/sbin/ldconfig -N %{_libdir}/vdpau + +%postun libs +/sbin/ldconfig +/sbin/ldconfig -N %{_libdir}/vdpau %post -n kernel%{_alt_kernel}-video-nvidia %depmod %{_kernel_ver} @@ -349,52 +361,53 @@ fi %if %{with userspace} %files %defattr(644,root,root,755) -%doc LICENSE -%doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html} +%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 -%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.* %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.*.* %attr(755,root,root) %ghost %{_libdir}/xorg/modules/drivers/nvidia_drv.so %files libs +%defattr(644,root,root,755) %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-glcore.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.* -%attr(755,root,root) %{_libdir}/nvidia/libvdpau_nvidia.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.*.* +%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) %{_libdir}/libcuda.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.* +%attr(755,root,root) %{_libdir}/libnvidia-glcore.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.* -%attr(755,root,root) %{_libdir}/libvdpau_nvidia.so.*.* %endif +%attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.* +%attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1 %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so -%attr(755,root,root) %{_libdir}/libcuda.so %dir %{_includedir}/GL %{_includedir}/GL/gl.h %{_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 @@ -404,11 +417,16 @@ fi %defattr(644,root,root,755) %{_libdir}/libXvMCNVIDIA.a +%files doc +%defattr(644,root,root,755) +%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-*