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=c001f9e1c1e3ad71a04b84f8b048fb754abfaff2;hp=44108267f32bbb3f38ae73470743e35028debdb4;hb=28bd8abbdf3ff97fe5b6a973e49557e93bab7b12;hpb=8d2b2a197d3ca5eec79973c0dcfd4f22a8266e96 diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec index 4410826..c001f9e 100644 --- a/xorg-driver-video-nvidia.spec +++ b/xorg-driver-video-nvidia.spec @@ -5,6 +5,7 @@ # # 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) @@ -39,22 +40,21 @@ 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: 381.22 +Version: 387.22 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: 8825cec1640739521689bd80121d1425 +# Source0-md5: abdbb3c813e52148f7435308121e6a37 Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-no-compat32.run -# Source1-md5: 0e9590d48703c8baa034b6f0f8bbf1e5 +# Source1-md5: b21f9bafb20409b337505c9b1d362c34 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: linux-4.1-and-older.patch URL: http://www.nvidia.com/object/unix.html BuildRequires: rpmbuild(macros) >= 1.701 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}} @@ -66,7 +66,7 @@ Requires: xorg-xserver-server(videodrv-abi) <= 23.0 Requires: xorg-xserver-server(videodrv-abi) >= 2.0 Provides: ocl-icd(nvidia) Provides: ocl-icd-driver -Provides: vulkan(icd) = 1.0.42 +Provides: vulkan(icd) = 1.0.46 Provides: xorg-driver-video Provides: xorg-xserver-module(glx) Obsoletes: XFree86-driver-nvidia @@ -119,7 +119,7 @@ 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} +%if %{with glvnd} && %{with system_libglvnd} Requires: libglvnd Requires: libglvnd-libGL Requires: libglvnd-libGLES @@ -268,7 +268,6 @@ rm -rf NVIDIA-Linux-x86*-%{version}* %endif %patch0 -p1 %patch1 -p1 -%patch2 -p1 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild %build @@ -282,7 +281,7 @@ install -d $RPM_BUILD_ROOT%{_libdir}/{nvidia,xorg/modules/{drivers,extensions/nv $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%{_datadir}/vulkan/icd.d + $RPM_BUILD_ROOT%{_datadir}/{nvidia,vulkan/icd.d} %if %{with settings} install -p nvidia-settings $RPM_BUILD_ROOT%{_bindir} @@ -300,9 +299,21 @@ 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.0.0 \ + libGLX.so.0 \ + libOpenGL.so.0 \ + libGLdispatch.so.0 \ + libGLESv1_CM.so.1 \ + libGLESv2.so.2 \ +%endif libGLX_nvidia.so.%{version} \ libEGL.so.1 \ libEGL_nvidia.so.%{version} \ @@ -357,6 +368,14 @@ echo %{_libdir}/vdpau >>$RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia.conf # OpenGL ABI for Linux compatibility %if %{with glvnd} +%if %{without system_libglvnd} +ln -sf libGL.so.1.0.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 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv1_CM.so +ln -sf libGLESv2.so.2 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGLESv2.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.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libEGL.so @@ -370,7 +389,7 @@ ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/nvidia/libGL.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 -sed 's!"library_path":[[:blank:]]*"[^"]\+"!"library_path": "%{vulkan_lib}"!g' nvidia_icd.json > $RPM_BUILD_ROOT%{_datadir}/vulkan/icd.d/nvidia_icd.json +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} @@ -413,6 +432,10 @@ EOF %attr(755,root,root) %{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_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 %{_datadir}/vulkan/icd.d/nvidia_icd.json %files libs @@ -423,6 +446,15 @@ EOF %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.0.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 +%attr(755,root,root) %{_libdir}/nvidia/libGLESv2.so.2 +%endif %attr(755,root,root) %{_libdir}/nvidia/libEGL.so.1 %attr(755,root,root) %ghost %{_libdir}/nvidia/libEGL_nvidia.so.0 %attr(755,root,root) %{_libdir}/nvidia/libEGL_nvidia.so.*.* @@ -457,6 +489,7 @@ EOF %attr(755,root,root) %{_libdir}/nvidia/libnvidia-glsi.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.*.* @@ -474,6 +507,13 @@ EOF %{_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 +%endif %attr(755,root,root) %{_libdir}/nvidia/libEGL.so %else %attr(755,root,root) %{_libdir}/nvidia/libGL.so