From 04f4171c8a42ed088f7377ab771682b9d28ce49f Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 20 Jan 2022 16:07:06 +0000 Subject: [PATCH] Use external egl-gbm for f35+ --- xorg-x11-drv-nvidia.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index a9e464e..0b34cb8 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -171,6 +171,9 @@ Requires: vulkan-loader%{?_isa} %ifarch x86_64 # Fedora 35 has early XWayland support using recent egl-wayland Requires: egl-wayland%{?_isa} %{?fc35: >= 1.1.9-2} +%if 0%{?fedora} > 34 +Requires: egl-gbm%{?_isa} +%endif # Boolean dependencies are only fedora and el8 Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if mesa-libGL(x86-32)) %endif @@ -233,7 +236,9 @@ cp -a \ libnvidia-rtcore.so.%{version} \ libnvoptix.so.%{version} \ libnvidia-vulkan-producer.so.%{version} \ +%if 0%{?fedora} < 35 libnvidia-egl-gbm.so.1.1.0 \ +%endif %endif libnvidia-eglcore.so.%{version} \ libnvidia-encode.so.%{version} \ @@ -490,8 +495,10 @@ fi ||: %{_datadir}/vulkan/icd.d/nvidia_icd.json %{_libdir}/libnvidia-cfg.so.1 %{_libdir}/libnvidia-cfg.so.%{version} +%if 0%{?fedora} < 35 %{_libdir}/libnvidia-egl-gbm.so.1 %{_libdir}/libnvidia-egl-gbm.so.1.1.0 +%endif %{_libdir}/libnvidia-ngx.so.1 %{_libdir}/libnvidia-ngx.so.%{version} %{_libdir}/libnvidia-rtcore.so.%{version}