commit b3021b9d38d88b9c1c69ca01c378f2e0cf33d9c0 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sat Feb 15 11:41:23 2020 +0000 Ensure that only one Vulkan ICD and layers manifest is present xorg-x11-drv-nvidia.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) --- diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 76716e2..071cdd1 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -20,7 +20,7 @@ Name: xorg-x11-drv-nvidia Epoch: 3 Version: 440.59 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -243,12 +243,12 @@ ln -sf libvdpau_nvidia.so.%{version} %{buildroot}%{_libdir}/vdpau/libvdpau_nvidi popd %endif +%ifarch x86_64 # Vulkan config install -m 0755 -d %{buildroot}%{_datadir}/vulkan/{icd.d,implicit_layer.d}/ -install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json -install -p -m 0644 nvidia_layers.json %{buildroot}%{_datadir}/vulkan/implicit_layer.d/nvidia_layers.%{_target_cpu}.json +install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/ +install -p -m 0644 nvidia_layers.json %{buildroot}%{_datadir}/vulkan/implicit_layer.d/ -%ifarch x86_64 # X DDX driver and GLX extension install -p -D -m 0755 libglxserver_nvidia.so.%{version} %{buildroot}%{_libdir}/xorg/modules/extensions/libglxserver_nvidia.so install -D -p -m 0755 nvidia_drv.so %{buildroot}%{_libdir}/xorg/modules/drivers/nvidia_drv.so @@ -431,8 +431,6 @@ fi ||: %endif %files libs -%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json -%{_datadir}/vulkan/implicit_layer.d/nvidia_layers.%{_target_cpu}.json %{_libdir}/libEGL_nvidia.so.0 %{_libdir}/libEGL_nvidia.so.%{version} %{_libdir}/libGLESv1_CM_nvidia.so.1 @@ -444,6 +442,8 @@ fi ||: %{_libdir}/libnvidia-allocator.so.1 %{_libdir}/libnvidia-allocator.so.%{version} %ifarch x86_64 +%{_datadir}/vulkan/implicit_layer.d/nvidia_layers.json +%{_datadir}/vulkan/icd.d/nvidia_icd.json %{_libdir}/libnvidia-cbl.so.%{version} %{_libdir}/libnvidia-cfg.so.1 %{_libdir}/libnvidia-cfg.so.%{version} @@ -503,6 +503,9 @@ fi ||: %{_libdir}/libnvidia-encode.so %changelog +* Sat Feb 15 2020 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3:440.59-2 +- Ensure that only one Vulkan ICD manifest is present + * Mon Feb 03 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3:440.59-1 - Update to 440.59 release