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=8b750141db1608db8857bf8321465c3bbc394853;hp=e682eaf02b52b9f820ee55b1b987fe92aca2ee45;hb=08cbb75030aa6475c1a810b7561108685408622b;hpb=2fb47db1e3737acb42bd2f0b00e3ba3c2b20005a diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index e682eaf..8b75014 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -1,48 +1,38 @@ +# 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 verbose # verbose build (V=1) %bcond_with multigl # package libGL and libglx.so in a way allowing concurrent install with nvidia/fglrx drivers -# -%define no_install_post_strip 1 -# -%define _nv_ver 100 -%define _nv_rel 14.23 -%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 +%bcond_with verbose # verbose build (V=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 3 + Summary: Linux Drivers for nVidia GeForce/Quadro Chips Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro -Name: xorg-driver-video-nvidia -Version: %{_nv_ver}.%{_nv_rel} -Release: %{_rel}%{?with_multigl:.mgl} +Name: %{pname}%{_alt_kernel} +Version: 173.14.12 +Release: %{rel}%{?with_multigl:.mgl} 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: 66de6fb23512ac40210cfb7944b3647e -%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: 11514ccb857def2bb5bd946b345bdf21 -%endif -Source2: %{name}-xinitrc.sh +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 +Source2: %{pname}-xinitrc.sh Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch URL: http://www.nvidia.com/object/unix.html @@ -58,9 +48,8 @@ Requires: xorg-xserver-server(videodrv-abi) = 2.0 Provides: OpenGL = 2.1 Provides: OpenGL-GLX = 1.4 Provides: xorg-xserver-libglx -%if !%{with multigl} +%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 @@ -68,6 +57,9 @@ 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) @@ -135,6 +127,7 @@ Summary: Tools for advanced control of nVidia graphic cards Summary(pl.UTF-8): Narzędzia do zarządzania kartami graficznymi nVidia Group: Applications/System Requires: %{name} = %{version}-%{release} +Suggests: pkgconfig Obsoletes: XFree86-driver-nvidia-progs %description progs @@ -147,12 +140,12 @@ Narzędzia do zarządzania kartami graficznymi 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(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} = %{version}-%{rel} Provides: X11-driver-nvidia(kernel) Obsoletes: XFree86-nvidia-kernel @@ -168,13 +161,13 @@ 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}-pkg1 %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}-pkg2 %endif %patch0 -p1 %patch1 -p1 @@ -182,7 +175,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' @@ -215,7 +208,7 @@ for f in \ usr/lib/libnvidia-cfg.so.%{version} \ usr/lib/libGL{,core}.so.%{version} \ usr/X11R6/lib/libXvMCNVIDIA.so.%{version} \ -%if !%{with multigl} +%if %{without multigl} usr/X11R6/lib/libXvMCNVIDIA.a \ ; do install $f $RPM_BUILD_ROOT%{_libdir} @@ -267,10 +260,15 @@ 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 @@ -299,8 +297,8 @@ 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/libnvidia-cfg.so.*.*.* -%attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.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 %else @@ -312,11 +310,11 @@ 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}/libnvidia-cfg.so.*.*.* -%attr(755,root,root) %{_libdir}/libnvidia-tls.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* %endif -%attr(755,root,root) %{_libdir}/xorg/modules/libnvidia-wfb.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