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=51782686d69ffd5f1fd16029dd0b8b0c565a5e6e;hp=2cd57e9047f89756ca73864339ea34a7cbabf678;hb=a124a22f8c8c229c9c6dacb5887c53a520f21b35;hpb=14b704ec071198f63f793c6c18d028b24845ce71 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 2cd57e9..5178268 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -1,58 +1,65 @@ # TODO # - should -libs Require main package? +# - drop binary-only nvidia-settings from here, and use nvidia-settings.spec for it? +# - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm # # Conditional build: -%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 settings # package nvidia-settings here (GPL version of same packaged from nvidia-settings.spec) %bcond_with verbose # verbose build (V=1) -%if "%{_alt_kernel}" != "%{nil}" -%undefine with_userspace -%endif -%if %{with force_userspace} -%define with_userspace 1 +# The goal here is to have main, userspace, package built once with +# simple release number, and only rebuild kernel packages with kernel +# version as part of release number, without the need to bump release +# with every kernel change. +%if 0%{?_pld_builder:1} && %{with kernel} && %{with userspace} +%{error:kernel and userspace cannot be built at the same time on PLD builders} +exit 1 %endif + %if %{without userspace} # nothing to be placed to debuginfo package %define _enable_debug_packages 0 %endif + %define no_install_post_check_so 1 -%define rel 3 +%define rel 1 %define pname xorg-driver-video-nvidia 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: 304.64 -Release: %{rel} +Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} +# when updating version here, keep nvidia-settings.spec in sync as well +Version: 352.21 +Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} Epoch: 1 License: nVidia Binary Group: X11 Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run -# Source0-md5: 6964415cf648a5f4f38117b168369de2 +# Source0-md5: c91760a04f658845722380f6c7fd4709 Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 76007ed4b72afd334e26377b646f5f7e +# Source1-md5: 4eea308a1b04553f720f82fd2fac79d3 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf Source5: 10-nvidia-modules.conf Patch0: X11-driver-nvidia-GL.patch Patch1: X11-driver-nvidia-desktop.patch +Patch2: nvidia-kernel-3.18.patch +Patch3: linux-4.0.patch 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 -BuildRequires: %{kgcc_package} -BuildRequires: rpmbuild(macros) >= 1.379 +BuildRequires: rpmbuild(macros) >= 1.701 +%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}} BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 13.0 +Requires: xorg-xserver-server(videodrv-abi) <= 19.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 +Provides: ocl-icd(nvidia) +Provides: ocl-icd-driver Provides: xorg-driver-video Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia @@ -61,7 +68,9 @@ Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 ExclusiveArch: %{ix86} %{x8664} BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n) -%define _noautoreqdep libGL.so.1 +%define _noautoreqdep libGL.so.1 libnvcuvid.so +# libnvidia-encode.so.*.* links with libnvcuvid.so instead of libnvcuvid.so.1 +%define _noautoreq libnvcuvid.so %description This driver set adds improved 2D functionality to the Xorg X server as @@ -104,7 +113,7 @@ Summary(pl.UTF-8): Biblioteki OpenGL (GL i GLX) Nvidia Group: X11/Development/Libraries Requires(post,postun): /sbin/ldconfig Requires: libvdpau >= 0.3 -Provides: OpenGL = 2.1 +Provides: OpenGL = 3.3 Provides: OpenGL-GLX = 1.4 Obsoletes: X11-OpenGL-core < 1:7.0.0 Obsoletes: X11-OpenGL-libGL < 1:7.0.0 @@ -141,22 +150,6 @@ OpenGL fejléc fájlok (csak GL és GLX) NVIDIA OpenGL implementációhoz. 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: %{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 doc Summary: Documentation for NVIDIA Graphics Driver Group: Documentation @@ -183,32 +176,67 @@ 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} = %{epoch}:%{version} -Provides: X11-driver-nvidia(kernel) -Obsoletes: XFree86-nvidia-kernel - -%description -n kernel%{_alt_kernel}-video-nvidia -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. +%define kernel_pkg()\ +%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\ +%requires_releq_kernel\ +%if %{_kernel_version_code} >= %{_kernel_version_magic 3 10 0}\ +Requires: %{releq_kernel -n drm}\ +%endif\ +Requires(postun): %releq_kernel\ +Requires: %{pname} = %{epoch}:%{version}\ +Provides: X11-driver-nvidia(kernel)\ +Obsoletes: XFree86-nvidia-kernel\ +\ +%description -n kernel%{_alt_kernel}-video-nvidia\ +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.\ +\ +%if %{with kernel}\ +%files -n kernel%{_alt_kernel}-video-nvidia\ +%defattr(644,root,root,755)\ +/lib/modules/%{_kernel_ver}/misc/*.ko*\ +%endif\ +\ +%post -n kernel%{_alt_kernel}-video-nvidia\ +%depmod %{_kernel_ver}\ +\ +%postun -n kernel%{_alt_kernel}-video-nvidia\ +%depmod %{_kernel_ver}\ +%{nil} + +%define build_kernel_pkg()\ +cd kernel\ +#cat >> Makefile <<'EOF'\ +#\ +#$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin\ +# cp $< $@\ +#EOF\ +#mv nv-kernel.o{,.bin}\ +#build_kernel_modules -m nvidia\ +%{__make} SYSSRC=%{_kernelsrcdir} clean\ +%{__make} SYSSRC=%{_kernelsrcdir} module\ +cd ..\ +%install_kernel_modules -D installed -m kernel/nvidia -d misc\ +%{nil} + +%{?with_kernel:%{expand:%create_kernel_packages}} %prep cd %{_builddir} @@ -222,20 +250,12 @@ rm -rf NVIDIA-Linux-x86*-%{version}* %endif %patch0 -p1 %patch1 -p1 +%patch2 -p0 +%patch3 -p1 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build -%if %{with kernel} -cd kernel -ln -sf Makefile.kbuild Makefile -cat >> Makefile <<'EOF' - -$(obj)/nv-kernel.o: $(src)/nv-kernel.o.bin - cp $< $@ -EOF -mv nv-kernel.o{,.bin} -%build_kernel_modules -m nvidia -%endif +%{?with_kernel:%{expand:%build_kernel_packages}} %install rm -rf $RPM_BUILD_ROOT @@ -246,11 +266,17 @@ install -d $RPM_BUILD_ROOT%{_libdir}/{nvidia,xorg/modules/{drivers,extensions/nv $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \ $RPM_BUILD_ROOT%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d} -install -p nvidia-{settings,smi,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir} -cp -p nvidia-{settings,smi,xconfig}.* $RPM_BUILD_ROOT%{_mandir}/man1 +%if %{with settings} +install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir} +cp -p nvidia-settings.1* $RPM_BUILD_ROOT%{_mandir}/man1 cp -p nvidia-settings.desktop $RPM_BUILD_ROOT%{_desktopdir} cp -p nvidia-settings.png $RPM_BUILD_ROOT%{_pixmapsdir} install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/nvidia-settings.sh +%endif + +install -p nvidia-{smi,xconfig,bug-report.sh} $RPM_BUILD_ROOT%{_bindir} +install -p nvidia-cuda-mps-{control,server} $RPM_BUILD_ROOT%{_bindir} +cp -p nvidia-{smi,xconfig,cuda-mps-control}.1* $RPM_BUILD_ROOT%{_mandir}/man1 install -p nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d @@ -259,20 +285,19 @@ sed -i -e 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-nvi for f in \ libGL.so.%{version} \ - libOpenCL.so.1.0.0 \ - libXvMCNVIDIA.so.%{version} \ libcuda.so.%{version} \ libnvcuvid.so.%{version} \ libnvidia-cfg.so.%{version} \ libnvidia-compiler.so.%{version} \ + libnvidia-encode.so.%{version} \ libnvidia-glcore.so.%{version} \ libnvidia-ml.so.%{version} \ + libnvidia-opencl.so.%{version} \ tls/libnvidia-tls.so.%{version} \ ; do install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia done -cp -a libXvMCNVIDIA.a $RPM_BUILD_ROOT%{_libdir}/nvidia install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau install -p libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia @@ -280,7 +305,7 @@ ln -s libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvi install -p nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so.%{version} ln -s nvidia_drv.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so install -p libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia -ln -s libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so +ln -s libnvidia-wfb.so.1 $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libnvidia-wfb.so /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/nvidia /sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia @@ -300,14 +325,13 @@ echo %{_libdir}/vdpau >>$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 libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so -ln -sf libOpenCL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenCL.so -ln -sf libXvMCNVIDIA_dynamic.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libXvMCNVIDIA.so ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libcuda.so ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvcuvid.so %endif %if %{with kernel} -%install_kernel_modules -m kernel/nvidia -d misc +install -d $RPM_BUILD_ROOT +cp -a installed/* $RPM_BUILD_ROOT %endif install -d $RPM_BUILD_ROOT%{_pkgconfigdir} @@ -324,19 +348,13 @@ rm -rf $RPM_BUILD_ROOT %post cat << 'EOF' NOTE: You must also install kernel module for this driver to work - kernel-video-nvidia-%{version} + kernel%{_alt_kernel}-video-nvidia-%{version} EOF -%post libs -p /sbin/ldconfig +%post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%post -n kernel%{_alt_kernel}-video-nvidia -%depmod %{_kernel_ver} - -%postun -n kernel%{_alt_kernel}-video-nvidia -%depmod %{_kernel_ver} - %if %{with userspace} %files %defattr(644,root,root,755) @@ -361,12 +379,6 @@ EOF %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/libOpenCL.so.*.* -%attr(755,root,root) %ghost %{_libdir}/nvidia/libOpenCL.so.1 -%attr(755,root,root) %{_libdir}/nvidia/libOpenCL.so -%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so.*.* -%attr(755,root,root) %{_libdir}/nvidia/libXvMCNVIDIA.so -%attr(755,root,root) %ghost %{_libdir}/nvidia/libXvMCNVIDIA_dynamic.so.1 %attr(755,root,root) %{_libdir}/nvidia/libcuda.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libcuda.so.1 %attr(755,root,root) %{_libdir}/nvidia/libcuda.so @@ -376,9 +388,13 @@ EOF %attr(755,root,root) %{_libdir}/nvidia/libnvidia-cfg.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-cfg.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-compiler.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-encode.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-encode.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glcore.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libnvidia-ml.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ml.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-opencl.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-opencl.so.1 %attr(755,root,root) %{_libdir}/nvidia/libnvidia-tls.so.*.* %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nvidia.so.*.* %attr(755,root,root) %ghost %{_libdir}/vdpau/libvdpau_nvidia.so.1 @@ -393,10 +409,6 @@ EOF %attr(755,root,root) %{_libdir}/nvidia/libGL.so %{_pkgconfigdir}/gl.pc -%files static -%defattr(644,root,root,755) -%{_libdir}/nvidia/libXvMCNVIDIA.a - %files doc %defattr(644,root,root,755) %doc html/* @@ -404,17 +416,18 @@ EOF %files progs %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/nvidia-bug-report.sh -%attr(755,root,root) %{_bindir}/nvidia-settings +%attr(755,root,root) %{_bindir}/nvidia-cuda-mps-control +%attr(755,root,root) %{_bindir}/nvidia-cuda-mps-server %attr(755,root,root) %{_bindir}/nvidia-smi %attr(755,root,root) %{_bindir}/nvidia-xconfig +%{_mandir}/man1/nvidia-cuda-mps-control.1* +%{_mandir}/man1/nvidia-smi.1* +%{_mandir}/man1/nvidia-xconfig.1* +%if %{with settings} %attr(755,root,root) /etc/X11/xinit/xinitrc.d/*.sh +%attr(755,root,root) %{_bindir}/nvidia-settings +%{_mandir}/man1/nvidia-settings.1* %{_desktopdir}/nvidia-settings.desktop -%{_mandir}/man1/nvidia-* %{_pixmapsdir}/nvidia-settings.png %endif - -%if %{with kernel} -%files -n kernel%{_alt_kernel}-video-nvidia -%defattr(644,root,root,755) -/lib/modules/%{_kernel_ver}/misc/*.ko* %endif