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=a31dadaaa0bb1c7dc8900726fef8bf43c98506a2;hp=8e858451f9e4ae5f2dfde8303609c12a31c7c8db;hb=fae7ed8413bba95dbd7aaa7a288d602f7894f5b3;hpb=c6de2c8b96f86731c39181262e8ceb82ce88128b diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 8e85845..a31dada 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -1,51 +1,43 @@ +# TODO +# - 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 # # Conditional build: %bcond_without dist_kernel # without distribution kernel %bcond_without kernel # without kernel packages -%bcond_without incall # include all tarballs %bcond_without userspace # don't build userspace programs +%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) -# -%define no_install_post_strip 1 -# -%define _nv_ver 100 -%define _nv_rel 14.11 -%define _min_x11 6.7.0 -%define _rel 3 -# -%define need_x86 0 -%define need_x8664 0 -%if %{with incall} -%define need_x86 1 -%define need_x8664 1 -%else -%ifarch %{ix86} -%define need_x86 1 -%endif -%ifarch %{x8664} -%define need_x8664 1 + +%if "%{_alt_kernel}" != "%{nil}" +%undefine with_userspace %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 1%{?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: xorg-driver-video-nvidia -Version: %{_nv_ver}.%{_nv_rel} -Release: %{_rel} +Name: %{pname}%{_alt_kernel} +Version: 180.35 +Release: %{rel} +Epoch: 1 License: nVidia Binary Group: X11 -%if %{need_x86} -Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1.run -# Source0-md5: 3e76376b5f1a53e0c18694fa65691c75 -%endif -%if %{need_x8664} -Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{_nv_ver}.%{_nv_rel}/NVIDIA-Linux-x86_64-%{_nv_ver}.%{_nv_rel}-pkg2.run -# Source1-md5: 060dfcab02bc903ce6f18da4fad6f74f -%endif -Source2: %{name}-xinitrc.sh +Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run +# Source0-md5: 23a4e1cbe24943452c82eeab9dd8200d +Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run +# Source1-md5: 451fdd8d5196a15aba424618ab16ed12 +Source2: %{pname}-xinitrc.sh Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch -URL: http://www.nvidia.com/object/linux.html +URL: http://www.nvidia.com/object/unix.html %if %{with kernel} %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.20.2} %endif @@ -54,18 +46,23 @@ BuildRequires: rpmbuild(macros) >= 1.379 BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) = 1.2 +Requires: xorg-xserver-server(videodrv-abi) <= 4.1 +Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: OpenGL = 2.1 Provides: OpenGL-GLX = 1.4 -Provides: xorg-xserver-libglx +Provides: xorg-xserver-module(glx) +%if %{without multigl} Obsoletes: Mesa -Obsoletes: Mesa-libGL +%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) @@ -85,6 +82,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 @@ -98,9 +106,10 @@ Starsze układy graficzne nie są obsługiwane przez ten pakiet: %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} = %{epoch}:%{version}-%{rel} Provides: OpenGL-GLX-devel = 1.4 Provides: OpenGL-devel = 2.1 Obsoletes: X11-OpenGL-devel-base @@ -112,45 +121,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 -Version: %{_nv_ver}.%{_nv_rel} -Release: %{_rel}@%{_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}-%{rel} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel @@ -160,19 +182,22 @@ 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. %prep cd %{_builddir} -rm -rf NVIDIA-Linux-x86*-%{_nv_ver}.%{_nv_rel}-pkg* +rm -rf NVIDIA-Linux-x86*-%{version}-pkg* %ifarch %{ix86} /bin/sh %{SOURCE0} --extract-only -%setup -qDT -n NVIDIA-Linux-x86-%{_nv_ver}.%{_nv_rel}-pkg1 +%setup -qDT -n NVIDIA-Linux-x86-%{version}-pkg0 %else /bin/sh %{SOURCE1} --extract-only -%setup -qDT -n NVIDIA-Linux-x86_64-%{_nv_ver}.%{_nv_rel}-pkg2 +%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-pkg0 %endif %patch0 -p1 %patch1 -p1 @@ -180,7 +205,7 @@ echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/s %build %if %{with kernel} -cd usr/src/nv/ +cd usr/src/nv ln -sf Makefile.kbuild Makefile cat >> Makefile <<'EOF' @@ -196,8 +221,11 @@ 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} +%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 @@ -209,11 +237,20 @@ 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 \ ; do install $f $RPM_BUILD_ROOT%{_libdir} done +%else +; do + install $f $RPM_BUILD_ROOT%{_libdir}/nvidia +done +install usr/X11R6/lib/libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir} +%endif install usr/X11R6/lib/modules/extensions/libglx.so.%{version} \ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions @@ -223,15 +260,34 @@ 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 -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 libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/wfb.so +%if %{with multigl} +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/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 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 %if %{with kernel} @@ -243,11 +299,21 @@ rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -cat << EOF -NOTE: You must install: -kernel-video-nvidia-%{version} -for this driver to work +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} +if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then + ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so +fi +%endif %postun -p /sbin/ldconfig @@ -262,6 +328,23 @@ EOF %defattr(644,root,root,755) %doc LICENSE %doc usr/share/doc/{README.txt,NVIDIA_Changelog,XF86Config.sample,html} +%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}/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 %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 @@ -270,21 +353,32 @@ EOF %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}/libnvidia-cfg.so.*.*.* -%attr(755,root,root) %{_libdir}/libnvidia-tls.so.*.*.* -%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 +%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}/libvdpau.so.*.* +%attr(755,root,root) %{_libdir}/libvdpau_nvidia.so.*.* +%attr(755,root,root) %{_libdir}/libvdpau_trace.so.*.* %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 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 %files static %defattr(644,root,root,755)