X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=xorg-driver-video-nvidia.spec;h=5c2c6b7b064cd992549a8a7d8e04aca1e7ecfcdb;hb=c543fa7c3ab3ed8a67b1d9dad461456cc2b7b454;hp=cb91d49652e1e40803fe53d620859ff3a950ff13;hpb=504709c00280a49fed2305146fd0acc9ebb922ef;p=packages%2Fxorg-driver-video-nvidia.git diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index cb91d49..5c2c6b7 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -2,50 +2,37 @@ # 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.19 -%define _rel 1 -# -%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 4 + 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: 169.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: d2f89f60cef8f9a0cc0ce228b46eeb8b -%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: 2afec320e9495444bc1582bf358e5237 -%endif -Source2: %{name}-xinitrc.sh +Source0: http://http.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg1.run +# Source0-md5: c1d45a150a90e6a11da21623493a628e +Source1: http://http.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg2.run +# Source1-md5: 8d29f4541f35e10ef06e566c57500cc1 +Source2: %{pname}-xinitrc.sh Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch -URL: http://www.nvidia.com/object/linux.html +Patch2: NVIDIA_kernel-169.12-2286310.diff +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 @@ -60,7 +47,6 @@ Provides: OpenGL-GLX = 1.4 Provides: xorg-xserver-libglx %if !%{with 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 +54,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 !%{with multigl} +Conflicts: Mesa-libGL +%endif Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -143,12 +132,13 @@ Tools for advanced control of nVidia graphic cards. %description progs -l pl.UTF-8 Narzędzia do zarządzania kartami graficznymi nVidia. +%if %{with kernel} %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(pl.UTF-8): Moduł jądra dla obsługi kart graficznych nVidia -Version: %{_nv_ver}.%{_nv_rel} -Release: %{_rel}@%{_kernel_ver_str} +Version: %{version} +Release: %{rel}@%{_kernel_ver_str} Group: Base/Kernel Requires(post,postun): /sbin/depmod Requires: dev >= 2.7.7-10 @@ -165,19 +155,23 @@ Die nVidia-Architektur-Unterstützung für den Linux-Kern. %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. +%endif %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 +%if "%{_kernel_ver}" >= "2.6.25" +%patch2 -p0 +%endif echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> usr/src/nv/Makefile.kbuild %build @@ -280,11 +274,13 @@ fi %postun -p /sbin/ldconfig +%if %{with kernel} %post -n kernel%{_alt_kernel}-video-nvidia %depmod %{_kernel_ver} %postun -n kernel%{_alt_kernel}-video-nvidia %depmod %{_kernel_ver} +%endif %if %{with userspace} %files @@ -299,8 +295,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 +308,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