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=458609578dc09fc2d22d627dc19e1c479e7e00f5;hp=cb22b42365922895a323e5e5f2a5fe35cfe716ac;hb=a8147efc4ac381b2a88f130bbac1d9d40e7801e1;hpb=3b2061638e8041382172575aff93ee6a5e3e5c2e diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index cb22b42..4586095 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 @@ -7,32 +8,39 @@ %bcond_without dist_kernel # without distribution kernel %bcond_without kernel # without kernel packages %bcond_without userspace # don't build userspace programs +%bcond_with force_userspace # force userspace build (useful if alt_kernel is set) %bcond_with multigl # package libGL and libglx.so in a way allowing concurrent install with nvidia/fglrx drivers %bcond_with verbose # verbose build (V=1) %if "%{_alt_kernel}" != "%{nil}" %undefine with_userspace %endif +%if %{with force_userspace} +%define with_userspace 1 +%endif %if %{without userspace} # nothing to be placed to debuginfo package %define _enable_debug_packages 0 %endif %define pname xorg-driver-video-nvidia -%define rel 2 +%define rel 4 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: 173.14.12 +Name: %{pname} +Version: 190.42 Release: %{rel}%{?with_multigl:.mgl} +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: c099b6e15ef34187571403fb017d58a1 -Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run -# Source1-md5: 220b8dbe64d976e0045ee875cfa33c03 +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 Source2: %{pname}-xinitrc.sh +Source3: gl.pc.in Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch URL: http://www.nvidia.com/object/unix.html @@ -43,23 +51,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) = 2.0 -Provides: OpenGL = 2.1 -Provides: OpenGL-GLX = 1.4 -Provides: xorg-xserver-libglx -%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 +Requires: xorg-xserver-server(videodrv-abi) <= 6.0 +Requires: xorg-xserver-server(videodrv-abi) >= 2.0 +Provides: xorg-xserver-module(glx) 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) @@ -79,6 +77,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 @@ -90,11 +99,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 @@ -106,46 +140,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 @@ -155,6 +201,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. @@ -164,10 +213,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 @@ -191,7 +240,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},%{_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} @@ -207,6 +256,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.so.%{version} \ usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ %if %{without multigl} usr/X11R6/lib/libXvMCNVIDIA.a \ @@ -223,14 +274,15 @@ install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions install usr/X11R6/lib/modules/drivers/nvidia_drv.so \ - $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers + $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version} 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 ln -sf libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libglx.so -ln -sf libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/wfb.so +ln -sf nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so %if %{with multigl} echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf @@ -241,6 +293,8 @@ 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 @@ -248,6 +302,8 @@ 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 libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so %endif %endif @@ -255,11 +311,14 @@ ln -sf libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libXvMCNVIDIA_dynam %install_kernel_modules -m usr/src/nv/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} \ + > $RPM_BUILD_ROOT%{_pkgconfigdir}/gl.pc + %clean 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} @@ -274,9 +333,12 @@ EOF if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so fi +%else +/sbin/ldconfig -N %{_libdir}/xorg/modules/extensions %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} @@ -289,6 +351,13 @@ fi %defattr(644,root,root,755) %doc LICENSE %doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html} +%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 %if %{with multigl} %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia.conf %dir %{_libdir}/nvidia @@ -296,11 +365,11 @@ fi %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 %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) %ghost %{_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}/xorg/modules/extensions/libglx.so.* -%ghost %{_libdir}/xorg/modules/extensions/libglx.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 @@ -309,26 +378,27 @@ fi %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_dynamic.so.1 +%attr(755,root,root) %ghost %{_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_nvidia.so.*.* %endif -%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.so.*.* -%attr(755,root,root) %{_libdir}/xorg/modules/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 %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 +%{_pkgconfigdir}/gl.pc %files static %defattr(644,root,root,755)