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=9868aa6eb802b01386d38422aa67176d377c68b5;hp=44f99d6b9d79c55755bf75272cfc98fdb7a33a61;hb=c75ad589abbfc8b2140f1a342c986861303dba0f;hpb=4e3e8de1a7c652870d07427b232cf6da08781107 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 44f99d6..9868aa6 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -1,4 +1,5 @@ # TODO +# - should -libs Require main package? # - solve this (shouldn't there be some obsoletes?): # error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686 # error: xorg-driver-video-nvidia-169.12-3.i686 (cnfl Mesa-libGL) conflicts with installed Mesa-libGL-7.0.3-2.i686 @@ -19,19 +20,21 @@ %endif %define pname xorg-driver-video-nvidia -%define rel 7 +%define rel 5%{?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}%{_alt_kernel} -Version: 177.82 -Release: %{rel}%{?with_multigl:.mgl} +Version: 180.37 +Release: %{rel} +Epoch: 1 License: nVidia Binary Group: X11 -Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run -# Source0-md5: 8e46c4af035bf29064140fa6255f3cf3 -Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run -# Source1-md5: 963d5223851ee307b15b0923492c2ace +Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run +# Source0-md5: ace799a4c119d02ddc6aeed28d598ab3 +Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run +# Source1-md5: 2fc28871c7a89de60dc42240d3ec7231 Source2: %{pname}-xinitrc.sh Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch @@ -43,24 +46,13 @@ BuildRequires: %{kgcc_package} BuildRequires: rpmbuild(macros) >= 1.379 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) >= 2.0 -Requires: xorg-xserver-server(videodrv-abi) <= 4.1 -Provides: OpenGL = 2.1 -Provides: OpenGL-GLX = 1.4 Provides: xorg-xserver-module(glx) -%if %{without multigl} -Obsoletes: Mesa -%endif -Obsoletes: X11-OpenGL-core < 1:7.0.0 -Obsoletes: X11-OpenGL-libGL < 1:7.0.0 -Obsoletes: XFree86-OpenGL-core < 1:7.0.0 -Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0 Obsoletes: XFree86-driver-nvidia Obsoletes: XFree86-nvidia -%if %{without multigl} -Conflicts: Mesa-libGL -%endif Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -80,6 +72,17 @@ The older graphics chips are unsupported: - TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 are suported by -legacy drivers. +%description -l hu.UTF-8 +Ez a meghajtó kibővíti az Xorg X szerver 2D működését OpenGL +gyorsítással, AGP támogatással és támogatja a több monitort. +Támogatott hardverek: modern NVIDIA GeForce (GeForce2 MX-től) és +Quadro (Quadro4 és újabbak) alapú grafikai gyorsítók. + +A régekbbi grafikus chipek nem támogatottak: +- NV1 és RIVA 128/128ZX chipek az alap Xorg telepítéssel (nv meghajtó) +- TNT/TNT2/GeForce 256/GeForce2 Ultra/Quadro2 a -legacy driverekkel + támogatottak. + %description -l pl.UTF-8 Usprawnione sterowniki dla kart graficznych nVidia do serwera Xorg, dające wysokowydajną akcelerację OpenGL, obsługę AGP i wielu monitorów @@ -91,11 +94,36 @@ Starsze układy graficzne nie są obsługiwane przez ten pakiet: - TNT/TNT2/GeForce 256/GeForce 2 Ultra/Quadro 2 są obsługiwane przez sterowniki -legacy +%package libs +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} +Provides: OpenGL = 2.1 +Provides: OpenGL-GLX = 1.4 +%if %{without multigl} +Obsoletes: Mesa +%endif +Obsoletes: X11-OpenGL-core < 1:7.0.0 +Obsoletes: X11-OpenGL-libGL < 1:7.0.0 +Obsoletes: XFree86-OpenGL-core < 1:7.0.0 +Obsoletes: XFree86-OpenGL-libGL < 1:7.0.0 +%if %{without multigl} +Conflicts: Mesa-libGL +%endif + +%description libs +NVIDIA OpenGL (GL and GLX only) implementation libraries. + +%description libs -l pl.UTF-8 +Implementacja OpenGL (tylko GL i GLX) firmy NVIDIA. + %package devel 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: %{name} = %{version}-%{release} +Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Provides: OpenGL-GLX-devel = 1.4 Provides: OpenGL-devel = 2.1 Obsoletes: X11-OpenGL-devel-base @@ -107,46 +135,58 @@ Conflicts: XFree86-OpenGL-devel < 4.3.99.902-0.3 OpenGL header files (GL and GLX only) for NVIDIA OpenGL implementation. +%description devel -l hu.UTF-8 +OpenGL fejléc fájlok (csak GL és GLX) NVIDIA OpenGL implementációhoz. + %description devel -l pl.UTF-8 Pliki nagłówkowe OpenGL (tylko GL i GLX) dla implementacji OpenGL firmy NVIDIA. %package static 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: %{name}-devel = %{version}-%{release} +Requires: %{pname}-devel = %{epoch}:%{version}-%{rel} %description static Static XvMCNVIDIA library. +%description static -l hu.UTF-8 +Statikus XwMCNVIDIA könyvtár. + %description static -l pl.UTF-8 Statyczna biblioteka XvMCNVIDIA. %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 Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia Group: Applications/System -Requires: %{name} = %{version}-%{release} +Requires: %{pname} = %{epoch}:%{version}-%{rel} Suggests: pkgconfig Obsoletes: XFree86-driver-nvidia-progs %description progs Tools for advanced control of nVidia graphic cards. +%description progs -l hu.UTF-8 +Eszközök az nVidia grafikus kártyák beállításához. + %description progs -l pl.UTF-8 Narzędzia do zarządzania kartami graficznymi nVidia. %package -n kernel%{_alt_kernel}-video-nvidia 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: %{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} = %{version}-%{rel} +Requires: %{pname} = %{epoch}:%{version}-%{rel} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel @@ -156,6 +196,9 @@ nVidia Architecture support for Linux kernel. %description -n kernel%{_alt_kernel}-video-nvidia -l de.UTF-8 Die nVidia-Architektur-Unterstützung für den Linux-Kern. +%description -n kernel%{_alt_kernel}-video-nvidia -l hu.UTF-8 +nVidia Architektúra támogatás Linux kernelhez. + %description -n kernel%{_alt_kernel}-video-nvidia -l pl.UTF-8 Obsługa architektury nVidia dla jądra Linuksa. Pakiet wymagany przez sterownik nVidii dla Xorg/XFree86. @@ -165,10 +208,10 @@ cd %{_builddir} rm -rf NVIDIA-Linux-x86*-%{version}-pkg* %ifarch %{ix86} /bin/sh %{SOURCE0} --extract-only -%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg1 +%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg0 %else /bin/sh %{SOURCE1} --extract-only -%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg2 +%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg0 %endif %patch0 -p1 %patch1 -p1 @@ -192,7 +235,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with userspace} install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,extensions} \ - $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir},%{_bindir},%{_mandir}/man1} \ + $RPM_BUILD_ROOT{%{_includedir}/{GL,cuda,vdpau},%{_libdir},%{_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} @@ -208,6 +251,8 @@ 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,_trace}.so.%{version} \ usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ %if %{without multigl} usr/X11R6/lib/libXvMCNVIDIA.a \ @@ -229,6 +274,8 @@ install usr/X11R6/lib/modules/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 +install usr/include/vdpau/*.h $RPM_BUILD_ROOT%{_includedir}/vdpau ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so @@ -241,6 +288,9 @@ 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/libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so +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 @@ -248,6 +298,9 @@ ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.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 libvdpau.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libvdpau.so +ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so %endif %endif @@ -259,7 +312,6 @@ ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynam rm -rf $RPM_BUILD_ROOT %post -/sbin/ldconfig cat << 'EOF' NOTE: You must also install kernel module for this driver to work kernel-video-nvidia-%{version} @@ -276,7 +328,8 @@ if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then fi %endif -%postun -p /sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %post -n kernel%{_alt_kernel}-video-nvidia %depmod %{_kernel_ver} @@ -290,6 +343,16 @@ fi %doc LICENSE %doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html} %if %{with multigl} +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.* +%ghost %{_libdir}/xorg/modules/extensions/libglx.so +%else +%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so* +%endif +%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.* +%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so + +%files libs +%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.*.* @@ -297,8 +360,12 @@ fi %attr(755,root,root) %{_libdir}/nvidia/libGLcore.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.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-tls.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libvdpau.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libvdpau_nvidia.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libvdpau_trace.so.*.* %attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.* %ghost %{_libdir}/xorg/modules/extensions/libglx.so %else @@ -310,21 +377,26 @@ fi %attr(755,root,root) %{_libdir}/libGLcore.so.*.* %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so.*.* %attr(755,root,root) %{_libdir}/libXvMCNVIDIA_dynamic.so.1 +%attr(755,root,root) %{_libdir}/libcuda.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-cfg.so.*.* %attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.* -%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so* +%attr(755,root,root) %{_libdir}/libvdpau.so.*.* +%attr(755,root,root) %{_libdir}/libvdpau_nvidia.so.*.* +%attr(755,root,root) %{_libdir}/libvdpau_trace.so.*.* %endif -%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.* -%attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libXvMCNVIDIA.so +%attr(755,root,root) %{_libdir}/libcuda.so +%attr(755,root,root) %{_libdir}/libvdpau.so %dir %{_includedir}/GL %{_includedir}/GL/gl.h %{_includedir}/GL/glext.h %{_includedir}/GL/glx.h %{_includedir}/GL/glxext.h +%{_includedir}/cuda +%{_includedir}/vdpau %if %{with multigl} %attr(755,root,root) %{_libdir}/libGL.so %endif