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=0f14e1723c1f15b2053429169fdd3957b7e11fe4;hp=62727f89c0e34f6eb3af99f563b93726acc0f4e4;hb=31407033d52ae50d78029a54e0846df40edaa6d6;hpb=2e3e538ec4bb2f8e320a8592896d530e5032ccf2 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 62727f8..0f14e17 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,21 +20,21 @@ %endif %define pname xorg-driver-video-nvidia -%define rel 11 +%define rel 2.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: %{pname}%{_alt_kernel} -Version: 180.22 -Release: %{rel}%{?with_multigl:.mgl} +Version: 180.35 +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: 265a984e973bcf5a7c2feeba4b0927a9 +# Source0-md5: 23a4e1cbe24943452c82eeab9dd8200d Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run -# Source1-md5: 91a40e758b06429453d780932f51d6d9 +# Source1-md5: 451fdd8d5196a15aba424618ab16ed12 Source2: %{pname}-xinitrc.sh Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch @@ -45,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) <= 4.1 +Requires: xorg-xserver-server(videodrv-abi) < 6.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 -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) @@ -104,12 +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: %{pname} = %{epoch}:%{version}-%{release} +Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Provides: OpenGL-GLX-devel = 1.4 Provides: OpenGL-devel = 2.1 Obsoletes: X11-OpenGL-devel-base @@ -133,7 +147,7 @@ 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: %{pname}-devel = %{epoch}:%{version}-%{release} +Requires: %{pname}-devel = %{epoch}:%{version}-%{rel} %description static Static XvMCNVIDIA library. @@ -149,7 +163,7 @@ 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: %{pname} = %{epoch}:%{version}-%{release} +Requires: %{pname} = %{epoch}:%{version}-%{rel} Suggests: pkgconfig Obsoletes: XFree86-driver-nvidia-progs @@ -167,12 +181,12 @@ 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: %{release}@%{_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}-%{release} +Requires: %{pname} = %{epoch}:%{version}-%{rel} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel @@ -298,7 +312,6 @@ ln -sf libcuda.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libcuda.so 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} @@ -315,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} @@ -329,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.*.* @@ -359,10 +383,7 @@ fi %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)