X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxorg-driver-video-nvidia.git;a=blobdiff_plain;f=xorg-driver-video-nvidia.spec;h=fdcfbb9eb63bdc303bcebc605e1c253217b5c45d;hp=15f0de57060506077da7c68f93d202b0de8816b2;hb=2ea8529d8aa59a06136fff1888587dbb2c6ff24c;hpb=38471eb0dcfa9da36d26177bb4705a4d463eaca7 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 15f0de5..fdcfbb9 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -4,6 +4,8 @@ # - kernel-drm is required on never kernels. driver for kernel-longterm not requires drm # # Conditional build: +%bcond_with glvnd # with GL vendor neutral libs +%bcond_without system_libglvnd # do not use system libglvnd %bcond_without kernel # without kernel packages %bcond_without userspace # don't build userspace programs %bcond_with settings # package nvidia-settings here (GPL version of same packaged from nvidia-settings.spec) @@ -18,6 +20,12 @@ exit 1 %endif +%if %{with glvnd} +%define vulkan_lib libGLX_nvidia.so.0 +%else +%define vulkan_lib libGL.so.1 +%endif + %if %{without userspace} # nothing to be placed to debuginfo package %define _enable_debug_packages 0 @@ -32,15 +40,13 @@ Summary(hu.UTF-8): Linux meghajtók nVidia GeForce/Quadro chipekhez Summary(pl.UTF-8): Sterowniki do kart graficznych nVidia GeForce/Quadro Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} # when updating version here, keep nvidia-settings.spec in sync as well -Version: 355.11 +Version: 396.24 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: 16d143ccafe99328a2ca8e5a396fd4bc -Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 30133d89690f4683c4e289ec6c0247dc +Source0: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run +# Source0-md5: 7b5c4735a5b7ad3a9d166ca85cc88e17 Source2: %{pname}-xinitrc.sh Source3: gl.pc.in Source4: 10-nvidia.conf @@ -54,16 +60,17 @@ BuildRequires: sed >= 4.0 BuildConflicts: XFree86-nvidia Requires: %{pname}-libs = %{epoch}:%{version}-%{rel} Requires: xorg-xserver-server -Requires: xorg-xserver-server(videodrv-abi) <= 19.0 +Requires: xorg-xserver-server(videodrv-abi) <= 24.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: ocl-icd(nvidia) Provides: ocl-icd-driver +Provides: vulkan(icd) = 1.1.70 Provides: xorg-driver-video Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia Obsoletes: XFree86-nvidia Conflicts: XFree86-OpenGL-devel <= 4.2.0-3 -ExclusiveArch: %{ix86} %{x8664} +ExclusiveArch: %{x8664} BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n) %define _noautoreqdep libGL.so.1 libnvcuvid.so @@ -110,6 +117,11 @@ Summary: OpenGL (GL and GLX) Nvidia libraries Summary(pl.UTF-8): Biblioteki OpenGL (GL i GLX) Nvidia Group: X11/Development/Libraries Requires(post,postun): /sbin/ldconfig +%if %{with glvnd} && %{with system_libglvnd} +Requires: libglvnd +Requires: libglvnd-libGL +Requires: libglvnd-libGLES +%endif Requires: libvdpau >= 0.3 Provides: OpenGL = 3.3 Provides: OpenGL-GLX = 1.4 @@ -151,6 +163,9 @@ firmy NVIDIA. %package doc Summary: Documentation for NVIDIA Graphics Driver Group: Documentation +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif %description doc NVIDIA Accelerated Linux Graphics Driver README and Installation @@ -229,23 +244,19 @@ cd kernel\ #mv nv-kernel.o{,.bin}\ #build_kernel_modules -m nvidia\ %{__make} SYSSRC=%{_kernelsrcdir} clean\ -%{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 module\ +%{__make} SYSSRC=%{_kernelsrcdir} IGNORE_CC_MISMATCH=1 NV_VERBOSE=1 CC=%{__cc} module\ cd ..\ -%install_kernel_modules -D installed -m kernel/nvidia -d misc\ +%install_kernel_modules -D installed -m kernel/nvidia,kernel/nvidia-drm,kernel/nvidia-modeset -d misc\ +%install_kernel_modules -D installed -m kernel/nvidia-uvm -d misc\ %{nil} %{?with_kernel:%{expand:%create_kernel_packages}} %prep cd %{_builddir} -rm -rf NVIDIA-Linux-x86*-%{version}* -%ifarch %{ix86} +rm -rf NVIDIA-Linux-x86_64-%{version} /bin/sh %{SOURCE0} --extract-only -%setup -qDT -n NVIDIA-Linux-x86-%{version} -%else -/bin/sh %{SOURCE1} --extract-only -%setup -qDT -n NVIDIA-Linux-x86_64-%{version}-no-compat32 -%endif +%setup -qDT -n NVIDIA-Linux-x86_64-%{version} %patch0 -p1 %patch1 -p1 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild @@ -260,7 +271,8 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_libdir}/{nvidia,xorg/modules/{drivers,extensions/nvidia}} \ $RPM_BUILD_ROOT{%{_includedir}/GL,%{_libdir}/vdpau,%{_bindir},%{_mandir}/man1} \ $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir},/etc/X11/xinit/xinitrc.d} \ - $RPM_BUILD_ROOT%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d} + $RPM_BUILD_ROOT%{_sysconfdir}/{OpenCL/vendors,ld.so.conf.d,X11/xorg.conf.d} \ + $RPM_BUILD_ROOT%{_datadir}/{glvnd/egl_vendor.d,nvidia,vulkan/icd.d} %if %{with settings} install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir} @@ -278,23 +290,51 @@ install -p nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors install %{SOURCE4} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d install %{SOURCE5} $RPM_BUILD_ROOT/etc/X11/xorg.conf.d sed -i -e 's|@@LIBDIR@@|%{_libdir}|g' $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-nvidia-modules.conf +install -p nvidia-drm-outputclass.conf $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf + +install -p nvidia-application-profiles-%{version}-key-documentation $RPM_BUILD_ROOT%{_datadir}/nvidia +install -p nvidia-application-profiles-%{version}-rc $RPM_BUILD_ROOT%{_datadir}/nvidia for f in \ +%if %{with glvnd} +%if %{without system_libglvnd} + libGL.so.1.7.0 \ + libGLX.so.0 \ + libOpenGL.so.0 \ + libGLdispatch.so.0 \ + libGLESv1_CM.so.1.2.0 \ + libGLESv2.so.2.1.0 \ + libEGL.so.1.1.0 \ +%endif + libGLX_nvidia.so.%{version} \ + libEGL_nvidia.so.%{version} \ + libGLESv1_CM_nvidia.so.%{version} \ + libGLESv2_nvidia.so.%{version} \ + libnvidia-egl-wayland.so.1.0.3 \ + libnvidia-eglcore.so.%{version} \ +%else libGL.so.%{version} \ +%endif libcuda.so.%{version} \ libnvcuvid.so.%{version} \ libnvidia-cfg.so.%{version} \ libnvidia-compiler.so.%{version} \ - libnvidia-encode.so.%{version} \ + libnvidia-encode.so.%{version} \ + libnvidia-fatbinaryloader.so.%{version} \ + libnvidia-fbc.so.%{version} \ libnvidia-glcore.so.%{version} \ + libnvidia-glsi.so.%{version} \ + libnvidia-glvkspirv.so.%{version} \ + libnvidia-ifr.so.%{version} \ libnvidia-ml.so.%{version} \ libnvidia-opencl.so.%{version} \ + libnvidia-ptxjitcompiler.so.%{version} \ tls/libnvidia-tls.so.%{version} \ ; do install -p $f $RPM_BUILD_ROOT%{_libdir}/nvidia done -install -p libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau +install -p %{srcdir}/libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau install -p libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia ln -s libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so @@ -310,19 +350,38 @@ cp -p gl*.h $RPM_BUILD_ROOT%{_includedir}/GL ln -sf libvdpau_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_nvidia.so.1 -%ifarch %{x8664} echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia64.conf echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia64.conf -%else -echo %{_libdir}/nvidia >$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf -echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf -%endif # OpenGL ABI for Linux compatibility +%if %{with glvnd} +%if %{without system_libglvnd} +ln -sf libGL.so.1.7.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so.1 +ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.so +ln -sf libGLX.so.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX.so +ln -sf libOpenGL.so.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libOpenGL.so +ln -sf libGLESv1_CM.so.1.2.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM.so.1 +ln -sf libGLESv1_CM.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM.so +ln -sf libGLESv2.so.2.1.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2.so.2 +ln -sf libGLESv2.so.2 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2.so +ln -sf libEGL.so.1.1.0 $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL.so.1 +ln -sf libEGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL.so +%endif +ln -sf libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX_nvidia.so.0 +ln -sf libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLX_indirect.so.0 +ln -sf libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL_nvidia.so.0 +ln -sf libGLESv1_CM_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM_nvidia.so.1 +ln -sf libGLESv2_nvidia.so.%{version} $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2_nvidia.so.2 + +install -p 10_nvidia.json $RPM_BUILD_ROOT%{_datadir}/glvnd/egl_vendor.d +%else 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 +%endif ln -sf libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libcuda.so ln -sf libnvcuvid.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libnvcuvid.so + +sed 's!__NV_VK_ICD__!%{vulkan_lib}!g' nvidia_icd.json.template > $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d/nvidia_icd.json %endif %if %{with kernel} @@ -363,8 +422,12 @@ EOF %attr(755,root,root) %{_libdir}/xorg/modules/extensions/nvidia/libglx.so %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so.* %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so -%{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xorg.conf.d/10-nvidia.conf %{_sysconfdir}/X11/xorg.conf.d/10-nvidia-modules.conf +%{_sysconfdir}/X11/xorg.conf.d/10-nvidia-drm-outputclass.conf +%dir %{_datadir}/nvidia +%{_datadir}/nvidia/nvidia-application-profiles-%{version}-key-documentation +%{_datadir}/nvidia/nvidia-application-profiles-%{version}-rc %files libs %defattr(644,root,root,755) @@ -373,8 +436,36 @@ EOF %{_sysconfdir}/OpenCL/vendors/nvidia.icd %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/nvidia*.conf %dir %{_libdir}/nvidia +%if %{with glvnd} +%if %{without system_libglvnd} +%attr(755,root,root) %{_libdir}/nvidia/libGL.so.1.7.0 +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libGLX.so.0 +%attr(755,root,root) %{_libdir}/nvidia/libOpenGL.so.0 +%attr(755,root,root) %{_libdir}/nvidia/libGLdispatch.so.0 +%attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM.so.1.2.0 +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGLESv1_CM.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so.2.1.0 +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGLESv2.so.2 +%attr(755,root,root) %{_libdir}/nvidia/libEGL.so.1.1.0 +%attr(755,root,root) %ghost %{_libdir}/nvidia/libEGL.so.1 +%endif +%attr(755,root,root) %ghost %{_libdir}/nvidia/libEGL_nvidia.so.0 +%attr(755,root,root) %{_libdir}/nvidia/libEGL_nvidia.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGLESv1_CM_nvidia.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM_nvidia.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGLESv2_nvidia.so.2 +%attr(755,root,root) %{_libdir}/nvidia/libGLESv2_nvidia.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGLX_indirect.so.0 +%attr(755,root,root) %ghost %{_libdir}/nvidia/libGLX_nvidia.so.0 +%attr(755,root,root) %{_libdir}/nvidia/libGLX_nvidia.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-egl-wayland.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-egl-wayland.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-eglcore.so.*.* +%else %attr(755,root,root) %{_libdir}/nvidia/libGL.so.*.* %attr(755,root,root) %ghost %{_libdir}/nvidia/libGL.so.1 +%endif %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 @@ -386,14 +477,27 @@ EOF %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-fatbinaryloader.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-fbc.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-fbc.so.*.* %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glcore.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-glsi.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-glvkspirv.so.*.* +%attr(755,root,root) %ghost %{_libdir}/nvidia/libnvidia-ifr.so.1 +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ifr.so.*.* +%attr(755,root,root) %{_libdir}/nvidia/libnvidia-ptxjitcompiler.so.1 %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-ptxjitcompiler.so.*.* %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 +%if %{with glvnd} +%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json +%endif +%{_datadir}/vulkan/icd.d/nvidia_icd.json %files devel %defattr(644,root,root,755) @@ -402,7 +506,18 @@ EOF %{_includedir}/GL/glext.h %{_includedir}/GL/glx.h %{_includedir}/GL/glxext.h +%if %{with glvnd} +%if %{without system_libglvnd} %attr(755,root,root) %{_libdir}/nvidia/libGL.so +%attr(755,root,root) %{_libdir}/nvidia/libGLX.so +%attr(755,root,root) %{_libdir}/nvidia/libOpenGL.so +%attr(755,root,root) %{_libdir}/nvidia/libGLESv1_CM.so +%attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so +%attr(755,root,root) %{_libdir}/nvidia/libEGL.so +%endif +%else +%attr(755,root,root) %{_libdir}/nvidia/libGL.so +%endif %{_pkgconfigdir}/gl.pc %files doc @@ -426,4 +541,3 @@ EOF %{_desktopdir}/nvidia-settings.desktop %{_pixmapsdir}/nvidia-settings.png %endif -%endif