- move xorg drivers to suggests rel 2

mesa gl may want dri drivers regardless of xorg driver, ex. running
driver amdgpu without and with radeonsi_dri.so:

libGL error: MESA-LOADER: failed to open radeonsi: /usr/lib64/xorg/modules/dri/radeonsi_dri.so: cannot open shared object file: No such file or directory (search paths /usr/lib64/xorg/modules/dri, suffix _dri)
libGL error: failed to load driver: radeonsi
GL_RENDERER: llvmpipe (LLVM 12.0.1, 256 bits)

with radeonsi_dri.so present:

GL_RENDERER: Radeon RX 580 Series (POLARIS10, DRM 3.42.0, 5.14.15-1, LLVM 12.0.1)

diff --git a/Mesa.spec b/Mesa.spec
index 619f122ff0c439ced9e07b83aa449d8c796ca7fa..d624dc4764bd6915aa04da249626bb7a1077488d 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -72,7 +72,7 @@ Summary:      Free OpenGL implementation
 Summary(pl.UTF-8):     Wolnodostępna implementacja standardu OpenGL
 Name:          Mesa
 Version:       21.2.5
-Release:       1
+Release:       2
 License:       MIT (core) and others - see license.html file
 Group:         X11/Libraries
 #Source0:      ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz
@@ -613,11 +613,12 @@ Summary:  X.org DRI driver for ATI R100 card family
 Summary(pl.UTF-8):     Sterownik X.org DRI dla rodziny kart ATI R100
 License:       MIT
 Group:         X11/Libraries
-Requires:      xorg-driver-video-ati
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
 Obsoletes:     X11-driver-radeon-dri < 1:7.0.0
+Suggests:      xorg-driver-video-amdgpu
+Suggests:      xorg-driver-video-ati
 
 %description dri-driver-ati-radeon-R100
 X.org DRI driver for ATI R100 card family (Radeon 7000-7500). It
@@ -632,11 +633,12 @@ Summary:  X.org DRI driver for ATI R200 card family
 Summary(pl.UTF-8):     Sterownik X.org DRI dla rodziny kart ATI R200
 License:       MIT
 Group:         X11/Libraries
-Requires:      xorg-driver-video-ati
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
 Obsoletes:     X11-driver-radeon-dri < 1:7.0.0
+Suggests:      xorg-driver-video-amdgpu
+Suggests:      xorg-driver-video-ati
 
 %description dri-driver-ati-radeon-R200
 X.org DRI driver for ATI R200 card family (Radeon 8500-92xx). It
@@ -652,11 +654,12 @@ Summary(pl.UTF-8):        Sterownik X.org DRI dla rodziny kart ATI R300
 License:       MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
-Requires:      xorg-driver-video-ati
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
 Obsoletes:     X11-driver-radeon-dri < 1:7.0.0
+Suggests:      xorg-driver-video-amdgpu
+Suggests:      xorg-driver-video-ati
 
 %description dri-driver-ati-radeon-R300
 X.org Gallium DRI driver for ATI R300/R400/RS690/R500 card family
@@ -679,10 +682,11 @@ License:  MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
 Requires:      radeon-ucode
-Requires:      xorg-driver-video-ati
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+Suggests:      xorg-driver-video-amdgpu
+Suggests:      xorg-driver-video-ati
 
 %description dri-driver-ati-radeon-R600
 X.org Gallium DRI driver for ATI R600/R700 card family (Radeon HD
@@ -705,10 +709,11 @@ License:  MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
 Requires:      radeon-ucode
-Requires:      xorg-driver-video-ati
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+Suggests:      xorg-driver-video-amdgpu
+Suggests:      xorg-driver-video-ati
 
 %description dri-driver-ati-radeon-SI
 X.org Gallium DRI driver for ATI Southern Islands card family (Radeon
@@ -728,10 +733,10 @@ Summary(pl.UTF-8):        Sterownik X.org DRI dla układów Vivante 3D
 License:       MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
-#Requires:     xorg-driver-video-?
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+#Suggests:     xorg-driver-video-?
 
 %description dri-driver-etnaviv
 X.org Gallium DRI driver for Vivante 3D chips.
@@ -745,10 +750,10 @@ Summary(pl.UTF-8):        Sterownik X.org DRI dla układów Adreno
 License:       MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
-Requires:      xorg-driver-video-freedreno
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+Suggests:      xorg-driver-video-freedreno
 
 %description dri-driver-freedreno
 X.org Gallium DRI driver for Adreno chips.
@@ -847,10 +852,10 @@ Summary(pl.UTF-8):        Sterownik X.org DRI Gallium wykorzystujący architekturę KMS
 License:       MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
-#Requires:     xorg-driver-video-?
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+#Suggests:     xorg-driver-video-?
 
 %description dri-driver-kmsro
 X.org Gallium DRI driver using KMS Render-Only architecture.
@@ -865,10 +870,10 @@ Summary(pl.UTF-8):        Sterownik X.org DRI dla układów Mali Utgard
 License:       MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
-#Requires:     xorg-driver-video-???
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+#Suggests:     xorg-driver-video-???
 
 %description dri-driver-lima
 X.org Gallium DRI driver for Mali Utgard chips.
@@ -884,10 +889,10 @@ Group:            X11/Libraries
 %if %{with gallium_nouveau}
 %{?with_swr:Requires:  cpuinfo(avx)}
 %endif
-Requires:      xorg-driver-video-nouveau
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+Suggests:      xorg-driver-video-nouveau
 
 %description dri-driver-nouveau
 X.org DRI drivers for NVIDIA card family.
@@ -901,10 +906,10 @@ Summary(pl.UTF-8):        Sterownik X.org DRI dla układów Mali Midgard/Bifrost
 License:       MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
-#Requires:     xorg-driver-video-???
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+#Suggests:     xorg-driver-video-???
 
 %description dri-driver-panfrost
 X.org Gallium DRI driver for Mali Midgard/Bifrost chips.
@@ -934,10 +939,10 @@ Summary(pl.UTF-8):        Sterownik X.org DRI dla układów SoC Tegra
 License:       MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
-#Requires:     xorg-driver-video-???
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+#Suggests:     xorg-driver-video-???
 
 %description dri-driver-tegra
 X.org Gallium DRI driver for Tegra SoC chips.
@@ -951,10 +956,10 @@ Summary(pl.UTF-8):        Sterownik X.org DRI dla układów Broadcom VC5
 License:       MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
-Requires:      xorg-driver-video-modesetting
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+Suggests:      xorg-driver-video-modesetting
 
 %description dri-driver-v3d
 X.org Gallium DRI driver for Broadcom VC5 chips.
@@ -968,10 +973,10 @@ Summary(pl.UTF-8):        Sterownik X.org DRI dla układów Broadcom VC4
 License:       MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
-Requires:      xorg-driver-video-modesetting
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+Suggests:      xorg-driver-video-modesetting
 
 %description dri-driver-vc4
 X.org Gallium DRI driver for Broadcom VC4 chips.
@@ -1001,10 +1006,10 @@ Summary(pl.UTF-8):      Sterownik X.org DRI dla VMware
 License:       MIT
 Group:         X11/Libraries
 %{?with_swr:Requires:  cpuinfo(avx)}
-Requires:      xorg-driver-video-vmware
 Requires:      xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:      xorg-xserver-server >= %{xserver_ver}
 Requires:      zlib >= %{zlib_ver}
+Suggests:      xorg-driver-video-vmware
 
 %description dri-driver-vmwgfx
 X.org Gallium DRI driver for VMWare.