commit 8c1e49c4fe71cfd1ab3ceca4f54ab90a970e4f53 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sat Aug 24 00:32:28 2024 +0100 egl fixes xorg-x11-drv-nvidia.spec | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) --- diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index dba3fcb..27b51d4 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -286,6 +286,14 @@ popd install -p -m 0644 -D nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json sed -i -e 's|libGLX_nvidia|%{_libdir}/libGLX_nvidia|g' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json +# EGL config for libglvnd +install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/ +install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json + +# EGL configs +install -m 0755 -d %{buildroot}%{_datadir}/egl/egl_external_platform.d/ +install -pm 0644 20_nvidia_xcb.json 20_nvidia_xlib.json %{buildroot}%{_datadir}/egl/egl_external_platform.d/ + %ifarch x86_64 aarch64 # Vulkan layer install -p -m 0644 -D nvidia_layers.json %{buildroot}%{_datadir}/vulkan/implicit_layer.d/nvidia_layers.json @@ -298,15 +306,6 @@ install -D -p -m 0755 nvidia_drv.so %{buildroot}%{_libdir}/xorg/modules/drivers/ install -m 0755 -d %{buildroot}%{_sysconfdir}/OpenCL/vendors/ install -p -m 0644 nvidia.icd %{buildroot}%{_sysconfdir}/OpenCL/vendors/ -# EGL config for libglvnd -install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/ -install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json - -# EGL configs -install -m 0755 -d %{buildroot}%{_datadir}/egl/egl_external_platform.d/ -install -pm 0644 20_nvidia_xcb.json 20_nvidia_xlib.json \ - %{buildroot}%{_datadir}/egl/egl_external_platform.d/ - # Blacklist nouveau, autoload nvidia-uvm module after nvidia module mkdir -p %{buildroot}%{_modprobedir} install -p -m 0644 %{SOURCE11} %{buildroot}%{_modprobedir} @@ -442,8 +441,6 @@ fi ||: %{_firmwarepath} %dir %{_alternate_dir} %{_alternate_dir}/alternate-install-present -%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json -%{_datadir}/egl/egl_external_platform.d/20_nvidia_*.json %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf %ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf @@ -495,6 +492,8 @@ fi ||: %{_libdir}/gbm/ %{_libdir}/vdpau/libvdpau_nvidia.so.1 %{_libdir}/vdpau/libvdpau_nvidia.so.%{version} +%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json +%{_datadir}/egl/egl_external_platform.d/20_nvidia_*.json %{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json %ifarch x86_64 aarch64 %{_datadir}/vulkan/implicit_layer.d/nvidia_layers.json