commit 507497e8884ffd9e48a8720f4eff241fc994dcab Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Mon Jul 10 11:36:47 2017 +0200 back to non-glvnd version for vulkan when needed xorg-x11-drv-nvidia.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 7575c61..6c69857 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -273,7 +273,7 @@ install -m 0755 -d %{buildroot}%{_sysconfdir}/OpenCL/vendors/ install -p -m 0644 nvidia.icd %{buildroot}%{_sysconfdir}/OpenCL/vendors/ # Vulkan config install -m 0755 -d %{buildroot}%{_datadir}/vulkan/icd.d/ -install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/ +install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{__target_cpu}.json %endif # EGL config for libglvnd @@ -341,6 +341,9 @@ install -pm 0644 %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf +# back to non-glvnd version for vulkan +sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{__target_cpu}.json +touch -r nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{__target_cpu}.json %endif #Ghost Xorg nvidia.conf files touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf @@ -463,9 +466,6 @@ fi ||: %doc nvidiapkg/html %dir %{_alternate_dir} %{_alternate_dir}/alternate-install-present -%ifarch x86_64 i686 -%{_datadir}/vulkan/icd.d/nvidia_icd.json -%endif %{_datadir}/glvnd/egl_vendor.d/10_nvidia.json %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf @@ -527,6 +527,9 @@ fi ||: %if 0%{?rhel} || 0%{?fedora} == 24 %config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf %endif +%ifarch x86_64 i686 +%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json +%endif %dir %{_nvidia_libdir} %{_libdir}/libEGL_nvidia.so.0 %{_libdir}/libEGL_nvidia.so.%{version}