X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=Mesa.spec;h=2fd54e253b3cb248a08487c6f03d86a6145a5450;hb=8cdeb38aa30b4aa26c62306eb909c820ee7db579;hp=de080378619e910e9865c73c360c5845b81fc3ae;hpb=111ed145374cfa4ca36588ba2393005f6af61180;p=packages%2FMesa.git

diff --git a/Mesa.spec b/Mesa.spec
index de08037..2fd54e2 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1,10 +1,13 @@
-# TODO: libtizonia >= 0.10.0 as an alternative for bellagio?
+# TODO:
+# - libtizonia >= 0.10.0 as an alternative for bellagio?
+# - bcond for perfetto peformance analysis? (BR: perfetto)
 #
 # Conditional build:
 %bcond_without	gallium		# gallium drivers
-%bcond_with	gallium_i915	# gallium i915 driver instead of dri i915 driver
+%bcond_without	gallium_i915	# gallium i915 driver
 %bcond_without	gallium_nouveau	# gallium nouveau driver
 %bcond_without	gallium_radeon	# gallium radeon drivers
+%bcond_without	gallium_rusticl	# gallium OpenCL frontend
 %bcond_without	gallium_zink	# gallium zink driver (based on vulkan)
 %bcond_without	egl		# EGL libraries
 %bcond_without	gbm		# Graphics Buffer Manager
@@ -12,14 +15,13 @@
 %bcond_without	opencl		# OpenCL support
 %bcond_without	opencl_spirv	# OpenCL SPIRV support
 %bcond_without	ocl_icd		# OpenCL as ICD (installable client driver)
-%bcond_with	glvnd		# OpenGL vendor neutral dispatcher support
+%bcond_without	glvnd		# OpenGL vendor neutral dispatcher support
 %bcond_without	omx		# OpenMAX (Bellagio OMXIL) support
 %bcond_without	va		# VA library
 %bcond_without	wayland		# Wayland EGL
 %bcond_without	xa		# XA state tracker (for vmwgfx xorg driver)
 %bcond_without	radv		# disable build of the radeon Vulkan driver
-%bcond_with	swr		# OpenSWR software rasterizer (x86 SIMD only; due to broken design
-				# propagates AVX code over Gallium DRI megadriver, swrast pipe driver and libOSMesa)
+%bcond_with	sse2		# SSE2 instructions
 %bcond_with	hud_extra	# HUD block/NIC I/O HUD stats support
 %bcond_with	lm_sensors	# HUD lm_sensors support
 %bcond_with	tests		# tests
@@ -29,22 +31,24 @@
 # (until they start to be somehow versioned themselves)
 %define		glapi_ver		7.1.0
 # other packages
-%define		libdrm_ver		2.4.102
+%define		libdrm_ver		2.4.110
 %define		dri2proto_ver		2.8
 %define		glproto_ver		1.4.14
 %define		zlib_ver		1.2.8
 %define		wayland_ver		1.18
-%define		llvm_ver		8.0.0
-%define		gcc_ver 		6:4.8.0
+%define		libglvnd_ver		1.3.4-2
+%define		llvm_ver		11.0.0
+%define		gcc_ver 		6:5
 
 %if %{without gallium}
 %undefine	with_gallium_i915
 %undefine	with_gallium_nouveau
 %undefine	with_gallium_radeon
+%undefine	with_gallium_rusticl
 %undefine	with_nine
 %undefine	with_omx
 %undefine	with_opencl
-%undefine	with_swr
+%undefine	with_va
 %undefine	with_xa
 %endif
 
@@ -54,33 +58,33 @@
 %endif
 
 %if %{without opencl}
+%undefine	with_gallium_rusticl
 %undefine	with_ocl_icd
 %endif
 
-%ifnarch %{ix86} %{x8664} x32
-%undefine	with_swr
+%if %{with gallium}
+%define		with_vdpau	1
 %endif
 
-%if %{with gallium_radeon} || %{with gallium_nouveau}
-%define		with_vdpau	1
-%define		with_xvmc	1
+%ifarch %{x86_with_sse2}
+%define		with_sse2	1
 %endif
 
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	21.0.0
+Version:	23.0.1
 Release:	1
 License:	MIT (core) and others - see license.html file
 Group:		X11/Libraries
 #Source0:	ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz
 ## Source0-md5:	7c61a801311fb8d2f7b3cceb7b5cf308
-Source0:	https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-%{version}/mesa-mesa-%{version}.tar.bz2
-# Source0-md5:	07cfd25ab952133364c435189edc8a19
-Patch0:		nouveau_no_rtti.patch
-Patch1:		i9x5-tex-ignore-the-diff-between-GL_TEXTURE_2D-and-GL_TEXTURE_RECTANGLE.patch
-URL:		http://www.mesa3d.org/
-%{?with_opencl_spirv:BuildRequires:	SPIRV-LLVM-Translator-devel >= 8.0.1.3}
+Source0:	https://archive.mesa3d.org/mesa-%{version}.tar.xz
+# Source0-md5:	a95c1528b2a5cb4d6a1a0b77554de1a6
+URL:		https://www.mesa3d.org/
+%if %{with opencl_spirv} || %{with gallium_rusticl}
+BuildRequires:	SPIRV-LLVM-Translator-devel >= 8.0.1.3
+%endif
 %{?with_gallium_zink:BuildRequires:	Vulkan-Loader-devel}
 BuildRequires:	bison > 2.3
 %{?with_opencl:BuildRequires:	clang-devel >= %{llvm_ver}}
@@ -88,20 +92,25 @@ BuildRequires:	elfutils-devel
 BuildRequires:	expat-devel >= 1.95
 BuildRequires:	flex
 BuildRequires:	gcc >= %{gcc_ver}
+%ifarch %{armv6}
+BuildRequires:	libatomic-devel
+%endif
 BuildRequires:	libdrm-devel >= %{libdrm_ver}
-%{?with_glvnd:BuildRequires:	libglvnd-devel >= 1.3.2}
+%{?with_glvnd:BuildRequires:	libglvnd-devel >= %{libglvnd_ver}}
 BuildRequires:	libselinux-devel
 BuildRequires:	libstdc++-devel >= %{gcc_ver}
 BuildRequires:	libunwind-devel
 %{?with_va:BuildRequires:	libva-devel}
-%{?with_va:BuildRequires:	pkgconfig(libva) >= 0.39.0}
+%{?with_va:BuildRequires:	pkgconfig(libva) >= 1.8.0}
 %{?with_vdpau:BuildRequires:	libvdpau-devel >= 1.1}
 BuildRequires:	libxcb-devel >= 1.13
 %{?with_gallium:BuildRequires:	llvm-devel >= %{llvm_ver}}
 %{?with_radv:BuildRequires:	llvm-devel >= %{llvm_ver}}
-%{?with_opencl:BuildRequires:	llvm-libclc}
+%if %{with opencl} || %{with gallium_rusticl}
+BuildRequires:	llvm-libclc
+%endif
 %{?with_omx:BuildRequires:	libomxil-bellagio-devel}
-BuildRequires:	meson >= 0.52
+BuildRequires:	meson >= 1.0.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(talloc) >= 2.0.1
@@ -112,25 +121,30 @@ BuildRequires:	pkgconfig(xcb-present) >= 1.13
 BuildRequires:	pkgconfig(xcb-randr) >= 1.12
 BuildRequires:	python3 >= 1:3.2
 BuildRequires:	python3-Mako >= 0.8.0
-BuildRequires:	rpmbuild(macros) >= 1.736
+BuildRequires:	rpmbuild(macros) >= 2.007
+%{?with_gallium_rusticl:BuildRequires:	rust >= 1.59}
+%{?with_gallium_rusticl:BuildRequires:	rust-bindgen >= 0.58.0}
 BuildRequires:	sed >= 4.0
-%{?with_opencl_spirv:BuildRequires:	spirv-tools-devel >= 2018.0}
+%if %{with opencl_spirv} || %{with gallium_rusticl}
+BuildRequires:	spirv-tools-devel >= 2018.0
+%endif
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	udev-devel
 # wayland-{client,server}
 %{?with_wayland:BuildRequires:	wayland-devel >= %{wayland_ver}}
-%{?with_wayland:BuildRequires:	wayland-protocols >= 1.8}
+%{?with_wayland:BuildRequires:	wayland-protocols >= 1.24}
 %{?with_wayland:BuildRequires:	wayland-egl-devel >= %{wayland_ver}}
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel >= 1.0.5
 BuildRequires:	xorg-lib-libXfixes-devel >= 2.0
 BuildRequires:	xorg-lib-libXrandr-devel >= 1.3
-BuildRequires:	xorg-lib-libXv-devel
-%{?with_xvmc:BuildRequires:	xorg-lib-libXvMC-devel >= 1.0.6}
 BuildRequires:	xorg-lib-libXxf86vm-devel
 BuildRequires:	xorg-lib-libxshmfence-devel >= 1.1
 BuildRequires:	xorg-proto-dri2proto-devel >= %{dri2proto_ver}
 BuildRequires:	xorg-proto-glproto-devel >= %{glproto_ver}
 %if %{with gallium}
 %{?with_lm_sensors:BuildRequires:	lm_sensors-devel}
+BuildRequires:	xz
 %endif
 BuildRequires:	zlib-devel >= %{zlib_ver}
 BuildRequires:	zstd-devel
@@ -138,7 +152,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # libGLESv1_CM, libGLESv2, libGL, libOSMesa:
 #  _glapi_tls_Dispatch is defined in libglapi, but it's some kind of symbol ldd -r doesn't notice(?)
-%define		skip_post_check_so      libGLESv1_CM.so.1.* libGLESv2.so.2.* libGL.so.1.* libOSMesa.so.* libGLX_mesa.so.0.*
+%define		skip_post_check_so	libGLESv1_CM.so.1.* libGLESv2.so.2.* libGL.so.1.* libOSMesa.so.* libGLX_mesa.so.0.*
 
 %description
 Mesa is a 3-D graphics library with an API which is very similar to
@@ -169,6 +183,9 @@ Requires:	libxcb >= 1.13
 %if %{with gbm}
 Requires:	%{name}-libgbm = %{version}-%{release}
 %endif
+%if %{with glvnd}
+Requires:	libglvnd-libEGL >= %{libglvnd_ver}
+%endif
 Provides:	EGL = 1.5
 
 %description libEGL
@@ -187,18 +204,24 @@ Summary:	Header files for Mesa implementation of EGL library
 Summary(pl.UTF-8):	Pliki nagłówkowe implementacji Mesa biblioteki EGL
 License:	MIT
 Group:		Development/Libraries
-Requires:	%{name}-khrplatform-devel = %{version}-%{release}
 Requires:	%{name}-libEGL = %{version}-%{release}
-Requires:	libdrm-devel >= %{libdrm_ver}
 Requires:	xorg-lib-libX11-devel
+%if %{with glvnd}
+Requires:	libglvnd-libEGL-devel >= %{libglvnd_ver}
+%else
+Requires:	%{name}-khrplatform-devel = %{version}-%{release}
+Requires:	libdrm-devel >= %{libdrm_ver}
+Requires:	libxcb-devel >= 1.13
+Requires:	pkgconfig(xcb-dri2) >= 1.8
+Requires:	pkgconfig(xcb-glx) >= 1.8.1
 Requires:	xorg-lib-libXext-devel >= 1.0.5
 Requires:	xorg-lib-libXfixes-devel >= 2.0
 Requires:	xorg-lib-libXxf86vm-devel
-Requires:	xorg-proto-dri2proto-devel >= %{dri2proto_ver}
-Requires:	xorg-proto-glproto-devel >= %{glproto_ver}
+%endif
 %if %{without glvnd}
 Provides:	EGL-devel = 1.5
 %endif
+Obsoletes:	Mesa-libEGL-static < 18.3
 
 %description libEGL-devel
 Header files for Mesa implementation of EGL library.
@@ -206,20 +229,6 @@ Header files for Mesa implementation of EGL library.
 %description libEGL-devel -l pl.UTF-8
 Pliki nagłówkowe implementacji Mesa biblioteki EGL.
 
-%package libEGL-static
-Summary:	Static Mesa EGL library
-Summary(pl.UTF-8):	Statyczna biblioteka Mesa EGL
-License:	MIT
-Group:		Development/Libraries
-Requires:	%{name}-libEGL-devel = %{version}-%{release}
-Provides:	EGL-static = 1.5
-
-%description libEGL-static
-Static Mesa EGL library.
-
-%description libEGL-static -l pl.UTF-8
-Statyczna biblioteka Mesa EGL.
-
 %package libGL
 Summary:	Free Mesa3D implementation of libGL OpenGL library
 Summary(pl.UTF-8):	Wolnodostępna implementacja Mesa3D biblioteki libGL ze standardu OpenGL
@@ -228,11 +237,15 @@ Group:		X11/Libraries
 Requires:	%{name}-libglapi = %{version}-%{release}
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	libxcb >= 1.13
+%if %{with glvnd}
+Requires:	libglvnd-libGL >= %{libglvnd_ver}
+%endif
 Provides:	OpenGL = 4.6
 Provides:	OpenGL-GLX = 1.4
-Obsoletes:	Mesa
-Obsoletes:	Mesa-dri
+Obsoletes:	Mesa < 6.4-2
+Obsoletes:	Mesa-dri < 6.4.1-3
 Obsoletes:	Mesa-dri-core < 10.0.0
+Obsoletes:	Mesa-swr < 22
 Obsoletes:	X11-OpenGL-libGL < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-libGL < 1:7.0.0
 
@@ -262,24 +275,34 @@ Summary:	Header files for Mesa3D libGL library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libGL z projektu Mesa3D
 License:	MIT
 Group:		X11/Development/Libraries
-# loose dependency on libGL to use with other libGL binaries
-Requires:	OpenGL >= 1.5
+%if %{with glvnd}
+Requires:	libglvnd-libGL-devel >= %{libglvnd_ver}
+%else
+Requires:	%{name}-khrplatform-devel = %{version}-%{release}
+Requires:	%{name}-libGL = %{version}-%{release}
 Requires:	libdrm-devel >= %{libdrm_ver}
+Requires:	libxcb-devel >= 1.13
+Requires:	pkgconfig(xcb-dri2) >= 1.8
+Requires:	pkgconfig(xcb-glx) >= 1.8.1
 Requires:	xorg-lib-libX11-devel
 Requires:	xorg-lib-libXext-devel >= 1.0.5
+Requires:	xorg-lib-libXfixes-devel >= 2.0
 Requires:	xorg-lib-libXxf86vm-devel
-Requires:	xorg-proto-dri2proto-devel >= %{dri2proto_ver}
-Requires:	xorg-proto-glproto-devel >= %{glproto_ver}
+%endif
 Suggests:	OpenGL-doc-man
 %if %{without glvnd}
 Provides:	OpenGL-GLX-devel = 1.4
 Provides:	OpenGL-devel = 4.6
 %endif
-Obsoletes:	Mesa-devel
+Obsoletes:	Mesa-devel < 6.4-2
+Obsoletes:	Mesa-libGL-static < 18.3
+Obsoletes:	Mesa-static < 6.4-2
 Obsoletes:	X11-OpenGL-devel < 1:7.0.0
 Obsoletes:	X11-OpenGL-devel-base < 1:7.0.0
+Obsoletes:	X11-OpenGL-static < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-devel < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-devel-base < 1:7.0.0
+Obsoletes:	XFree86-OpenGL-static < 1:7.0.0
 
 %description libGL-devel
 Header files for Mesa3D libGL library.
@@ -287,29 +310,14 @@ Header files for Mesa3D libGL library.
 %description libGL-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki libGL z projektu Mesa3D.
 
-%package libGL-static
-Summary:	Static Mesa3D libGL library
-Summary(pl.UTF-8):	Statyczna biblioteka libGL z projektu Mesa3D
-License:	MIT
-Group:		X11/Development/Libraries
-Requires:	%{name}-libGL-devel = %{version}-%{release}
-Provides:	OpenGL-static = 4.6
-Obsoletes:	Mesa-static
-Obsoletes:	X11-OpenGL-static < 1:7.0.0
-Obsoletes:	XFree86-OpenGL-static < 1:7.0.0
-
-%description libGL-static
-Static Mesa3D libGL library. It uses software renderer.
-
-%description libGL-static -l pl.UTF-8
-Statyczna biblioteka libGL z projektu Mesa3D. Używa programowego
-renderingu.
-
 %package libGLES
 Summary:	Mesa implementation of GLES (OpenGL ES) libraries
 Summary(pl.UTF-8):	Implementacja Mesa bibliotek GLES (OpenGL ES)
 Group:		Libraries
 Requires:	%{name}-libglapi = %{version}-%{release}
+%if %{with glvnd}
+Requires:	libglvnd-libGLES >= %{libglvnd_ver}
+%endif
 Provides:	OpenGLES
 Provides:	OpenGLESv1 = 1.1
 Provides:	OpenGLESv2 = 2.0
@@ -334,10 +342,14 @@ ES 1.1 i 2.0/3.2.
 Summary:	Header files for Mesa GLES libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek Mesa GLES
 Group:		Development/Libraries
+Requires:	%{name}-libGLES = %{version}-%{release}
+%if %{with glvnd}
+Requires:	libglvnd-libGLES-devel >= %{libglvnd_ver}
+%else
 Requires:	%{name}-khrplatform-devel = %{version}-%{release}
 # <EGL/egl.h> for <GLES/egl.h>
 Requires:	%{name}-libEGL-devel = %{version}-%{release}
-Requires:	%{name}-libGLES = %{version}-%{release}
+%endif
 %if %{without glvnd}
 Provides:	OpenGLES-devel
 Provides:	OpenGLESv1-devel = 1.1
@@ -356,7 +368,6 @@ Summary:	OSMesa (off-screen renderer) library
 Summary(pl.UTF-8):	Biblioteka OSMesa (renderująca bitmapy w pamięci)
 License:	MIT
 Group:		Libraries
-%{?with_swr:Requires:	cpuinfo(avx)}
 Requires:	zlib >= %{zlib_ver}
 
 %description libOSMesa
@@ -374,6 +385,7 @@ Requires:	%{name}-libOSMesa = %{version}-%{release}
 # for <GL/gl.h> only
 Requires:	OpenGL-devel
 Requires:	libselinux-devel
+Obsoletes:	Mesa-libOSMesa-static < 18.3
 
 %description libOSMesa-devel
 Header file for OSMesa (off-screen renderer) library.
@@ -381,21 +393,6 @@ Header file for OSMesa (off-screen renderer) library.
 %description libOSMesa-devel -l pl.UTF-8
 Plik nagłówkowy biblioteki OSMesa (renderującej bitmapy w pamięci).
 
-%package libOSMesa-static
-Summary:	Static OSMesa (off-screen renderer) library
-Summary(pl.UTF-8):	Biblioteka statyczna OSMesa (renderująca bitmapy w pamięci)
-License:	MIT
-Group:		Development/Libraries
-Requires:	%{name}-libOSMesa-devel = %{version}-%{release}
-# this static build of OSMesa needs static non-dri Mesa implementation
-Requires:	%{name}-libGL-static = %{version}-%{release}
-
-%description libOSMesa-static
-Static OSMesa (off-screen renderer) library.
-
-%description libOSMesa-static -l pl.UTF-8
-Biblioteka statyczna OSMesa (renderująca bitmapy w pamięci).
-
 %package OpenCL-icd
 Summary:	Mesa implementation of OpenCL (Compuing Language) API ICD
 Summary(pl.UTF-8):	Implementacja Mesa API OpenCL (języka obliczeń) ICD
@@ -426,8 +423,8 @@ oraz urządzeniach przenośnych/wbudowanych. Specyfikację OpenCL można
 znaleźć na stronie Khronos Group: <http://www.khronos.org/opencl/>.
 Mesa zawiera implementację OpenCL w wersji 1.1.
 
-Implementacja dostarczona jest w postaci instalowalnego sterownika klienta
-(ICD), który może być użyty z loaderem ocl-icd.
+Implementacja dostarczona jest w postaci instalowalnego sterownika
+klienta (ICD), który może być użyty z loaderem ocl-icd.
 
 %package libOpenCL
 Summary:	Mesa implementation of OpenCL (Compuing Language) API
@@ -467,97 +464,38 @@ Header files for Mesa OpenCL library.
 %description libOpenCL-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki Mesa OpenCL.
 
-%package libXvMC-nouveau
-Summary:	Mesa implementation of XvMC API for NVidia adapters
-Summary(pl.UTF-8):	Implementacja Mesa API XvMC dla kart NVidia
-License:	MIT
-Group:		Libraries
-Requires:	libdrm >= %{libdrm_ver}
-Requires:	xorg-lib-libXvMC >= 1.0.6
-Requires:	zlib >= %{zlib_ver}
-Conflicts:	Mesa-libXvMC
-
-%description libXvMC-nouveau
-Mesa implementation of XvMC API for NVidia adapters (NV40-NV96, NVa0).
-
-%description libXvMC-nouveau -l pl.UTF-8
-Implementacja Mesa API XvMC dla kart NVidia (NV40-NV96, NVa0).
-
-%package libXvMC-r600
-Summary:	Mesa implementation of XvMC API for ATI Radeon R600 series adapters
-Summary(pl.UTF-8):	Implementacja Mesa API XvMC dla kart ATI Radeon z serii R600
+%package Rusticl-icd
+Summary:	Rusticl implementation of OpenCL (Compuing Language) API ICD
+Summary(pl.UTF-8):	Implementacja Rusticl API OpenCL (języka obliczeń) ICD
 License:	MIT
 Group:		Libraries
+Requires:	filesystem >= 4.0-29
 Requires:	libdrm >= %{libdrm_ver}
-Requires:	xorg-lib-libXvMC >= 1.0.6
-Requires:	zlib >= %{zlib_ver}
-Conflicts:	Mesa-libXvMC
-
-%description libXvMC-r600
-Mesa implementation of XvMC API for ATI Radeon adapters based on
-R600/R700 chips.
-
-%description libXvMC-r600 -l pl.UTF-8
-Implementacja Mesa API XvMC dla kart ATI Radeon opartych na układach
-R600/R700.
-
-%package -n libva-driver-gallium
-Summary:	VA driver for Gallium State Tracker
-Summary(pl.UTF-8):	Sterowniki VA do Gallium
-Group:		Libraries
-%if %{with gallium_radeon}
-Requires:	libva-driver-r600
-Requires:	libva-driver-radeonsi
-%endif
-%if %{with gallium_nouveau}
-Requires:	libva-driver-nouveau
-%endif
-
-%description -n libva-driver-gallium
-VA drivers for Gallium State Tracker (r600, radeonsi & nouveau).
-
-%description -n libva-driver-gallium -l pl.UTF-8
-Sterowniki VA do Gallium (r600, radeonsi & nouveau).
-
-%package -n libva-driver-r600
-Summary:	VA driver for ATI Radeon R600 series adapters
-Summary(pl.UTF-8):	Sterownik VA dla kart ATI Radeon z serii R600
-Group:		Libraries
-Requires:	libva >= 1.6.0
-Requires:	zlib >= %{zlib_ver}
-
-%description -n libva-driver-r600
-VA driver for ATI Radeon R600 series adapters.
-
-%description -n libva-driver-r600 -l pl.UTF-8
-Sterownik VA dla kart ATI Radeon z serii R600.
-
-%package -n libva-driver-radeonsi
-Summary:	VA driver for ATI Radeon SI adapters
-Summary(pl.UTF-8):	Sterownik VA dla kart ATI Radeon SI
-Group:		Libraries
-Requires:	libva >= 1.6.0
+Requires:	llvm-libclc
 Requires:	zlib >= %{zlib_ver}
+Provides:	OpenCL = 3.0
+Provides:	ocl-icd-driver
 
-%description -n libva-driver-radeonsi
-VA driver for ATI Radeon adapters based on Southern Islands chips.
-
-%description -n libva-driver-radeonsi -l pl.UTF-8
-Sterownik VA dla kart ATI Radeon opartych na układach Southern
-Islands.
+%description Rusticl-icd
+This package contains Rusticl implementation of OpenCL - standard for
+cross-platform, parallel programming of modern processors found in
+personal computers, servers and handheld/embedded devices. OpenCL
+specification can be found on Khronos Group site:
+<http://www.khronos.org/opencl/>. Rusticl implements OpenCL 3.0.
 
-%package -n libva-driver-nouveau
-Summary:	VA driver for NVidia adapters
-Summary(pl.UTF-8):	Sterownik VA dla kart NVidia
-Group:		Libraries
-Requires:	libva >= 1.6.0
-Requires:	zlib >= %{zlib_ver}
+The implementation is provided as an installable client driver (ICD)
+for use with the ocl-icd loader.
 
-%description -n libva-driver-nouveau
-VA driver for NVidia adapters.
+%description Rusticl-icd -l pl.UTF-8
+Ten pakiet zawiera implementację Rusticl standardu OpenCL - standardu
+wieloplatformowego, równoległego programowania nowoczesnych
+procesorów, jakie znajdują się w komputerach osobistych, serwerach
+oraz urządzeniach przenośnych/wbudowanych. Specyfikację OpenCL można
+znaleźć na stronie Khronos Group: <http://www.khronos.org/opencl/>.
+Rusticl zawiera implementację OpenCL w wersji 3.0.
 
-%description -n libva-driver-nouveau -l pl.UTF-8
-Sterownik VA dla kart NVidia.
+Implementacja dostarczona jest w postaci instalowalnego sterownika
+klienta (ICD), który może być użyty z loaderem ocl-icd.
 
 %package libgbm
 Summary:	Mesa Graphics Buffer Manager library
@@ -629,6 +567,7 @@ Pliki nagłówkowe biblioteki akceleracji Gallium3D dla Xorg.
 Summary:	Khronos platform header file
 Summary(pl.UTF-8):	Plik nagłówkowy platformy Khronos
 Group:		Development/Libraries
+Provides:	khrplatform-devel
 Conflicts:	Mesa-libEGL-devel < 8.0.1-2
 
 %description khrplatform-devel
@@ -637,55 +576,61 @@ Khronos platform header file.
 %description khrplatform-devel -l pl.UTF-8
 Plik nagłówkowy platformy Khronos.
 
-%package dri-driver-ati-radeon-R100
-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
+%package dri-devel
+Summary:	Direct Rendering Infrastructure interface header file
+Summary(pl.UTF-8):	Plik nagłówkowy interfejsu DRI (Direct Rendering Infrastructure)
+Group:		Development/Libraries
+Requires:	libdrm-devel >= %{libdrm_ver}
+# <GL/gl.h>
+%if %{with glvnd}
+Requires:	libglvnd-libGL-devel >= %{libglvnd_ver}
+Conflicts:	Mesa-libGL-devel < 21.1.0-2
+%else
+Requires:	Mesa-libGL-devel = %{version}-%{release}
+%endif
 
-%description dri-driver-ati-radeon-R100
-X.org DRI driver for ATI R100 card family (Radeon 7000-7500). It
-supports R100, RV100, RS100, RV200, RS200, RS250.
+%description dri-devel
+Direct Rendering Infrastructure interface header file.
 
-%description dri-driver-ati-radeon-R100 -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart ATI R100 (Radeon 7000-7500).
-Obsługuje układy R100, RV100, RS100, RV200, RS200, RS250.
+%description dri-devel -l pl.UTF-8
+Plik nagłówkowy interfejsu DRI (Direct Rendering Infrastructure).
 
-%package dri-driver-ati-radeon-R200
-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}
+%package d3d
+Summary:	Nine Direct3D9 driver (for Wine)
+Summary(pl.UTF-8):	Sterownik Direct3D9 Nine (dla Wine)
+Group:		Libraries
+Requires:	libdrm >= %{libdrm_ver}
 Requires:	zlib >= %{zlib_ver}
-Obsoletes:	X11-driver-radeon-dri < 1:7.0.0
 
-%description dri-driver-ati-radeon-R200
-X.org DRI driver for ATI R200 card family (Radeon 8500-92xx). It
-supports R200, RV250, RV280, RS300, RS350 chips.
+%description d3d
+Nine Direct3D9 driver (for Wine).
 
-%description dri-driver-ati-radeon-R200 -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart ATI R200 (Radeon 8500-92xx).
-Obsługuje układy R200, RV250, RV280, RS300, RS350.
+%description d3d -l pl.UTF-8
+Sterownik Direct3D9 Nine (dla Wine).
+
+%package d3d-devel
+Summary:	Nine Direct3D9 driver API
+Summary(pl.UTF-8):	API sterownika Direct3D9 Nine
+Group:		Development/Libraries
+Requires:	libdrm-devel >= %{libdrm_ver}
+
+%description d3d-devel
+Nine Direct3D9 driver API.
+
+%description d3d-devel -l pl.UTF-8
+API sterownika Direct3D9 Nine.
 
 %package dri-driver-ati-radeon-R300
 Summary:	X.org DRI driver for ATI R300 card family
 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}
+Suggests:	xorg-driver-video-amdgpu
+Suggests:	xorg-driver-video-ati
 Obsoletes:	X11-driver-radeon-dri < 1:7.0.0
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-ati-radeon-R300
 X.org Gallium DRI driver for ATI R300/R400/RS690/R500 card family
@@ -706,12 +651,12 @@ Summary:	X.org DRI driver for ATI R600 card family
 Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart ATI R600
 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
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-ati-radeon-R600
 X.org Gallium DRI driver for ATI R600/R700 card family (Radeon HD
@@ -732,12 +677,12 @@ Summary:	X.org DRI driver for ATI Southern Islands card family
 Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart ATI Southern Islands
 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
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-ati-radeon-SI
 X.org Gallium DRI driver for ATI Southern Islands card family (Radeon
@@ -756,11 +701,10 @@ Summary:	X.org DRI driver for Vivante 3D chips
 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-?
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-etnaviv
 X.org Gallium DRI driver for Vivante 3D chips.
@@ -773,11 +717,10 @@ Summary:	X.org DRI driver for Adreno chips
 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
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-freedreno
 X.org Gallium DRI driver for Adreno chips.
@@ -785,19 +728,32 @@ X.org Gallium DRI driver for Adreno chips.
 %description dri-driver-freedreno -l pl.UTF-8
 Sterownik X.org DRI Gallium dla układów Adreno.
 
+%package dri-driver-intel-crocus
+Summary:	X.org DRI driver for Intel Gen4-Gen7 chips
+Summary(pl.UTF-8):	Sterownik X.org DRI dla układów Intel Gen4-Gen7
+License:	MIT
+Group:		X11/Libraries
+Requires:	zlib >= %{zlib_ver}
+Obsoletes:	Mesa-dri-driver-intel-i965 < 22.0.0
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
+
+%description dri-driver-intel-crocus
+X.org Gallium DRI driver for Intel Gen4/Gen5/Gen6/Gen7 chips.
+
+%description dri-driver-intel-crocus -l pl.UTF-8
+Sterownik X.org DRI dla układów Intel Gen4/Gen5/Gen6/Gen7.
+
 %package dri-driver-intel-i915
 Summary:	X.org DRI driver for Intel i915 card family
 Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart Intel i915
 License:	MIT
 Group:		X11/Libraries
-%if %{with gallium_i915}
-%{?with_swr:Requires:	cpuinfo(avx)}
-%endif
-Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
-Requires:	xorg-xserver-server >= %{xserver_ver}
 Requires:	zlib >= %{zlib_ver}
-Obsoletes:	Mesa-dri-driver-intel-i830
+Obsoletes:	Mesa-dri-driver-intel-i830 < 6.5
 Obsoletes:	X11-driver-i810-dri < 1:7.0.0
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-intel-i915
 X.org DRI driver for Intel i915 card family (830, 845, 852/855, 865,
@@ -807,42 +763,14 @@ X.org DRI driver for Intel i915 card family (830, 845, 852/855, 865,
 Sterownik X.org DRI dla rodziny kart Intel i915 (830, 845, 852/855,
 865, 915, 945, G33, Q33, Q35, Pineview).
 
-%package dri-driver-intel-i965
-Summary:	X.org DRI driver for Intel i965 card family
-Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart Intel i965
-License:	MIT
-Group:		X11/Libraries
-Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
-Requires:	xorg-xserver-server >= %{xserver_ver}
-Requires:	zlib >= %{zlib_ver}
-Obsoletes:	Mesa-dri-driver-intel-i830
-Obsoletes:	X11-driver-i810-dri < 1:7.0.0
-
-%description dri-driver-intel-i965
-X.org (non-Gallium) DRI driver for Intel i965 card family (946GZ,
-965G, 965Q, 965GM, 965GME, GM45, G41, B43, Q45/Q43, G45/G43, Ironlake,
-Sandybridge, Ivybridge, Haswell, Ray Trail, Broadwell, Cherrytrail,
-Braswell, Cherryview, Skylake, Broxton, Kabylake, Coffeelake,
-Geminilake, Whiskey Lake, Comet Lake, Cannonlake, Ice Lake, Elkhart
-Lake).
-
-%description dri-driver-intel-i965 -l pl.UTF-8
-Sterownik X.org DRI (nie Gallium) dla rodziny kart Intel i965 (946GZ,
-965G, 965Q, 965GM, 965GME, GM45, G41, B43, Q45/Q43, G45/G43, Ironlake,
-Sandybridge, Ivybridge, Haswell, Ray Trail, Broadwell, Cherrytrail,
-Braswell, Cherryview, Skylake, Broxton, Kabylake, Coffeelake,
-Geminilake, Whiskey Lake, Comet Lake, Cannonlake, Ice Lake, Elkhart
-Lake).
-
 %package dri-driver-intel-iris
 Summary:	X.org DRI driver for Intel Iris (Gen8+) card family
 Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart Intel Iris (Gen8+)
 License:	MIT
 Group:		X11/Libraries
-%{?with_swr:Requires:	cpuinfo(avx)}
-Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
-Requires:	xorg-xserver-server >= %{xserver_ver}
 Requires:	zlib >= %{zlib_ver}
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-intel-iris
 X.org Gallium DRI driver for Intel Iris (Gen8+) card family
@@ -859,11 +787,10 @@ Summary:	X.org Gallium DRI driver using KMS Render-Only architecture
 Summary(pl.UTF-8):	Sterownik X.org DRI Gallium wykorzystujący architekturę KMS Render-Only
 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-?
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-kmsro
 X.org Gallium DRI driver using KMS Render-Only architecture.
@@ -877,11 +804,10 @@ Summary:	X.org DRI driver for Mali Utgard chips
 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-???
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-lima
 X.org Gallium DRI driver for Mali Utgard chips.
@@ -894,13 +820,10 @@ Summary:	X.org DRI driver for NVIDIA card family
 Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart NVIDIA
 License:	MIT
 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
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-nouveau
 X.org DRI drivers for NVIDIA card family.
@@ -913,11 +836,10 @@ Summary:	X.org DRI driver for Mali Midgard/Bifrost chips
 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-???
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-panfrost
 X.org Gallium DRI driver for Mali Midgard/Bifrost chips.
@@ -930,10 +852,9 @@ Summary:	X.org DRI software rasterizer driver
 Summary(pl.UTF-8):	Sterownik X.org DRI obsługujący rysowanie programowe
 License:	MIT
 Group:		X11/Libraries
-%{?with_swr:Requires:	cpuinfo(avx)}
-Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
-Requires:	xorg-xserver-server >= %{xserver_ver}
 Requires:	zlib >= %{zlib_ver}
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-swrast
 X.org DRI software rasterizer driver.
@@ -946,11 +867,10 @@ Summary:	X.org DRI driver for Tegra SoC chips
 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-???
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-tegra
 X.org Gallium DRI driver for Tegra SoC chips.
@@ -963,11 +883,10 @@ Summary:	X.org DRI driver for Broadcom VC5 chips
 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
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-v3d
 X.org Gallium DRI driver for Broadcom VC5 chips.
@@ -980,11 +899,10 @@ Summary:	X.org DRI driver for Broadcom VC4 chips
 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
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-vc4
 X.org Gallium DRI driver for Broadcom VC4 chips.
@@ -997,10 +915,9 @@ Summary:	X.org DRI driver for QEMU VirGL
 Summary(pl.UTF-8):	Sterownik X.org DRI dla QEMU VirGL
 License:	MIT
 Group:		X11/Libraries
-%{?with_swr:Requires:	cpuinfo(avx)}
-Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
-Requires:	xorg-xserver-server >= %{xserver_ver}
 Requires:	zlib >= %{zlib_ver}
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-virgl
 X.org Gallium DRI driver for QEMU VirGL.
@@ -1013,11 +930,10 @@ Summary:	X.org DRI driver for VMware
 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
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-vmwgfx
 X.org Gallium DRI driver for VMWare.
@@ -1030,9 +946,9 @@ Summary:	X.org DRI driver based on Vulkan
 Summary(pl.UTF-8):	Sterownik X.org DRI oparty na Vulkanie
 License:	MIT
 Group:		X11/Libraries
-Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
-Requires:	xorg-xserver-server >= %{xserver_ver}
 Requires:	zlib >= %{zlib_ver}
+Conflicts:	xorg-xserver-libglx(glapi) > %{glapi_ver}
+Conflicts:	xorg-xserver-libglx(glapi) < %{glapi_ver}
 
 %description dri-driver-zink
 X.org Gallium DRI driver based on Vulkan.
@@ -1040,13 +956,27 @@ X.org Gallium DRI driver based on Vulkan.
 %description dri-driver-zink -l pl.UTF-8
 Sterownik X.org DRI Gallium oparty na Vulkanie.
 
+%package pipe-driver-crocus
+Summary:	crocus driver for Mesa Gallium dynamic pipe loader
+Summary(pl.UTF-8):	Sterownik crocus dla dynamicznego systemu potoków szkieletu Mesa Gallium
+Group:		Libraries
+Requires:	zlib >= %{zlib_ver}
+
+%description pipe-driver-crocus
+crocus driver for Mesa Gallium dynamic pipe loader. It supports Intel
+Gen4/Gen5/Gen6/Gen7 chips.
+
+%description pipe-driver-crocus -l pl.UTF-8
+Sterownik crocus dla dynamicznego systemu potoków szkieletu Mesa
+Gallium. Obsługuje układy Intela Gen4/Gen5/Gen6/Gen7.
+
 %package pipe-driver-i915
-Summary:       i915 driver for Mesa Gallium dynamic pipe loader
-Summary(pl.UTF-8):     Sterownik i915 dla dynamicznego systemu potoków szkieletu Mesa Gallium
-Group:	       Libraries
-Requires:      zlib >= %{zlib_ver}
-Obsoletes:     Mesa-gbm-driver-i915
-Obsoletes:     Mesa-opencl-driver-i915
+Summary:	i915 driver for Mesa Gallium dynamic pipe loader
+Summary(pl.UTF-8):	Sterownik i915 dla dynamicznego systemu potoków szkieletu Mesa Gallium
+Group:		Libraries
+Requires:	zlib >= %{zlib_ver}
+Obsoletes:	Mesa-gbm-driver-i915 < 11.1.1
+Obsoletes:	Mesa-opencl-driver-i915 < 9.1
 
 %description pipe-driver-i915
 i915 driver for Mesa Gallium dynamic pipe loader. It supports Intel
@@ -1057,10 +987,10 @@ Sterownik i915 dla dynamicznego systemu potoków szkieletu Mesa
 Gallium. Obsługuje układy Intela z serii 915/945/G33/Q33/Q35/Pineview.
 
 %package pipe-driver-iris
-Summary:       iris driver for Mesa Gallium dynamic pipe loader
-Summary(pl.UTF-8):     Sterownik iris dla dynamicznego systemu potoków szkieletu Mesa Gallium
-Group:	       Libraries
-Requires:      zlib >= %{zlib_ver}
+Summary:	iris driver for Mesa Gallium dynamic pipe loader
+Summary(pl.UTF-8):	Sterownik iris dla dynamicznego systemu potoków szkieletu Mesa Gallium
+Group:		Libraries
+Requires:	zlib >= %{zlib_ver}
 
 %description pipe-driver-iris
 iris driver for Mesa Gallium dynamic pipe loader. It supports Intel
@@ -1074,6 +1004,19 @@ Gallium. Obsługuje układy Intela z rodziny kart Intel Iris (Gen8+:
 Broadwell, Skylake, Broxton, Kabylake, Coffeelake, Geminilake, Whiskey
 Lake, Comet Lake, Cannonlake, Ice Lake, Elkhart Lake).
 
+%package pipe-driver-kmsro
+Summary:	kmsro driver for Mesa Gallium dynamic pipe loader
+Summary(pl.UTF-8):	Sterownik kmsro dla dynamicznego systemu potoków szkieletu Mesa Gallium
+Group:		Libraries
+Requires:	zlib >= %{zlib_ver}
+
+%description pipe-driver-kmsro
+kmsro driver for Mesa Gallium dynamic pipe loader.
+
+%description pipe-driver-kmsro -l pl.UTF-8
+Sterownik kmsro dla dynamicznego systemu potoków szkieletu Mesa
+Gallium.
+
 %package pipe-driver-msm
 Summary:	msm (freedreno) driver for Mesa Gallium dynamic pipe loader
 Summary(pl.UTF-8):	Sterownik msm (freedreno) dla dynamicznego systemu potoków szkieletu Mesa Gallium
@@ -1093,8 +1036,8 @@ Summary:	nouveau driver for Mesa Gallium dynamic pipe loader
 Summary(pl.UTF-8):	Sterownik nouveau dla dynamicznego systemu potoków szkieletu Mesa Gallium
 Group:		Libraries
 Requires:	zlib >= %{zlib_ver}
-Obsoletes:	Mesa-gbm-driver-nouveau
-Obsoletes:	Mesa-opencl-driver-nouveau
+Obsoletes:	Mesa-gbm-driver-nouveau < 11.1.1
+Obsoletes:	Mesa-opencl-driver-nouveau < 9.1
 
 %description pipe-driver-nouveau
 nouveau driver for Mesa Gallium dynamic pipe loader. It supports
@@ -1109,8 +1052,8 @@ Summary:	r300 driver for Mesa Gallium dynamic pipe loader
 Summary(pl.UTF-8):	Sterownik r300 dla dynamicznego systemu potoków szkieletu Mesa Gallium
 Group:		Libraries
 Requires:	zlib >= %{zlib_ver}
-Obsoletes:	Mesa-gbm-driver-r300
-Obsoletes:	Mesa-opencl-driver-r300
+Obsoletes:	Mesa-gbm-driver-r300 < 11.1.1
+Obsoletes:	Mesa-opencl-driver-r300 < 9.1
 
 %description pipe-driver-r300
 r300 driver for Mesa Gallium dynamic pipe loader. It supports ATI
@@ -1126,9 +1069,9 @@ Summary:	r600 driver for Mesa Gallium dynamic pipe loader
 Summary(pl.UTF-8):	Sterownik r600 dla dynamicznego systemu potoków szkieletu Mesa Gallium
 Group:		Libraries
 Requires:	zlib >= %{zlib_ver}
-Obsoletes:	Mesa-gbm-driver-r600
-Obsoletes:	Mesa-libllvmradeon
-Obsoletes:	Mesa-opencl-driver-r600
+Obsoletes:	Mesa-gbm-driver-r600 < 11.1.1
+Obsoletes:	Mesa-libllvmradeon < 9.2
+Obsoletes:	Mesa-opencl-driver-r600 < 9.1
 
 %description pipe-driver-r600
 r600 driver for Mesa Gallium dynamic pipe loader. It supports ATI
@@ -1144,9 +1087,9 @@ Summary:	radeonsi driver for Mesa Gallium dynamic pipe loader
 Summary(pl.UTF-8):	Sterownik radeonsi dla dynamicznego systemu potoków szkieletu Mesa Gallium
 Group:		Libraries
 Requires:	zlib >= %{zlib_ver}
-Obsoletes:	Mesa-gbm-driver-radeonsi
-Obsoletes:	Mesa-libllvmradeon
-Obsoletes:	Mesa-opencl-driver-radeonsi
+Obsoletes:	Mesa-gbm-driver-radeonsi < 11.1.1
+Obsoletes:	Mesa-libllvmradeon < 9.2
+Obsoletes:	Mesa-opencl-driver-radeonsi < 9.1
 
 %description pipe-driver-radeonsi
 radeonsi driver for Mesa Gallium dynamic pipe loader. It supports ATI
@@ -1161,10 +1104,9 @@ Southern Islands.
 Summary:	Software (swrast) driver for Mesa Gallium dynamic pipe loader
 Summary(pl.UTF-8):	Sterownik programowy (swrast) dla dynamicznego systemu potoków szkieletu Mesa Gallium
 Group:		Libraries
-%{?with_swr:Requires:	cpuinfo(avx)}
 Requires:	zlib >= %{zlib_ver}
-Obsoletes:	Mesa-gbm-driver-swrast
-Obsoletes:	Mesa-opencl-driver-swrast
+Obsoletes:	Mesa-gbm-driver-swrast < 11.1.1
+Obsoletes:	Mesa-opencl-driver-swrast < 9.1
 
 %description pipe-driver-swrast
 Software (swrast) driver for Mesa Gallium dynamic pipe loader.
@@ -1178,8 +1120,8 @@ Summary:	vmwgfx driver for Mesa Gallium dynamic pipe loader
 Summary(pl.UTF-8):	Sterownik vmwgfx dla dynamicznego systemu potoków szkieletu Mesa Gallium
 Group:		Libraries
 Requires:	zlib >= %{zlib_ver}
-Obsoletes:	Mesa-gbm-driver-vmwgfx
-Obsoletes:	Mesa-opencl-driver-vmwgfx
+Obsoletes:	Mesa-gbm-driver-vmwgfx < 11.1.1
+Obsoletes:	Mesa-opencl-driver-vmwgfx < 9.1
 
 %description pipe-driver-vmwgfx
 vmwgfx driver for Mesa Gallium dynamic pipe loader. It supports VMware
@@ -1189,47 +1131,76 @@ virtual video adapter.
 Sterownik vmwgfx dla dynamicznego systemu potoków szkieletu Mesa
 Gallium. Obsługuje wirtualną kartę graficzną VMware.
 
-%package swr
-Summary:	OpenSWR software rasterizer modules for Mesa
-Summary(pl.UTF-8):	Moduły programowego rasteryzera OpenSWR dla Mesy
+%package -n libva-driver-gallium
+Summary:	VA driver for Gallium State Tracker
+Summary(pl.UTF-8):	Sterowniki VA do Gallium
 Group:		Libraries
-Requires:	cpuinfo(avx)
+%if %{with gallium_radeon}
+Requires:	libva-driver-r600 = %{version}-%{release}
+Requires:	libva-driver-radeonsi = %{version}-%{release}
+%endif
+%if %{with gallium_nouveau}
+Requires:	libva-driver-nouveau = %{version}-%{release}
+%endif
+
+%description -n libva-driver-gallium
+VA drivers for Gallium State Tracker (r600, radeonsi & nouveau).
+
+%description -n libva-driver-gallium -l pl.UTF-8
+Sterowniki VA do Gallium (r600, radeonsi & nouveau).
+
+%package -n libva-driver-r600
+Summary:	VA driver for ATI Radeon R600 series adapters
+Summary(pl.UTF-8):	Sterownik VA dla kart ATI Radeon z serii R600
+Group:		Libraries
+Requires:	libva >= 1.8.0
 Requires:	zlib >= %{zlib_ver}
 
-%description swr
-OpenSWR software rasterizer modules for Mesa, utilizing x86 AVX or
-VX2 instruction sets. They can be loaded by swrast pipe driver or
-OSMesa library.
+%description -n libva-driver-r600
+VA driver for ATI Radeon R600 series adapters.
 
-%description swr -l pl.UTF-8
-Moduły programowego rasteryzera OpenSWR dla Mesy, wykorzystujące
-zestawy instrukcji x86 AVX lub AVX2. Mogą być wczytywane przez
-sterownik potoków swrast lub bibliotekę OSMesa.
+%description -n libva-driver-r600 -l pl.UTF-8
+Sterownik VA dla kart ATI Radeon z serii R600.
 
-%package d3d
-Summary:	Nine Direct3D9 driver (for Wine)
-Summary(pl.UTF-8):	Sterownik Direct3D9 Nine (dla Wine)
+%package -n libva-driver-radeonsi
+Summary:	VA driver for ATI Radeon SI adapters
+Summary(pl.UTF-8):	Sterownik VA dla kart ATI Radeon SI
 Group:		Libraries
-Requires:	libdrm >= %{libdrm_ver}
+Requires:	libva >= 1.8.0
 Requires:	zlib >= %{zlib_ver}
 
-%description d3d
-Nine Direct3D9 driver (for Wine).
+%description -n libva-driver-radeonsi
+VA driver for ATI Radeon adapters based on Southern Islands chips.
 
-%description d3d -l pl.UTF-8
-Sterownik Direct3D9 Nine (dla Wine).
+%description -n libva-driver-radeonsi -l pl.UTF-8
+Sterownik VA dla kart ATI Radeon opartych na układach Southern
+Islands.
 
-%package d3d-devel
-Summary:	Nine Direct3D9 driver API
-Summary(pl.UTF-8):	API sterownika Direct3D9 Nine
-Group:		Development/Libraries
-Requires:	libdrm-devel >= %{libdrm_ver}
+%package -n libva-driver-nouveau
+Summary:	VA driver for NVidia adapters
+Summary(pl.UTF-8):	Sterownik VA dla kart NVidia
+Group:		Libraries
+Requires:	libva >= 1.8.0
+Requires:	zlib >= %{zlib_ver}
 
-%description d3d-devel
-Nine Direct3D9 driver API.
+%description -n libva-driver-nouveau
+VA driver for NVidia adapters.
 
-%description d3d-devel -l pl.UTF-8
-API sterownika Direct3D9 Nine.
+%description -n libva-driver-nouveau -l pl.UTF-8
+Sterownik VA dla kart NVidia.
+
+%package -n libva-driver-virtio
+Summary:	VA driver for VirtIO adapters
+Summary(pl.UTF-8):	Sterownik VA dla kart VirtIO
+Group:		Libraries
+Requires:	libva >= 1.8.0
+Requires:	zlib >= %{zlib_ver}
+
+%description -n libva-driver-virtio
+VA driver for VirtIO adapters.
+
+%description -n libva-driver-virtio -l pl.UTF-8
+Sterownik VA dla kart VirtIO.
 
 %package -n libvdpau-driver-mesa-nouveau
 Summary:	Mesa nouveau driver for the vdpau API
@@ -1293,8 +1264,8 @@ Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	libvdpau >= 1.1
 Requires:	zlib >= %{zlib_ver}
+Obsoletes:	Mesa-libllvmradeon < 9.2
 Conflicts:	libvdpau-driver-mesa
-Obsoletes:	Mesa-libllvmradeon
 
 %description -n libvdpau-driver-mesa-radeonsi
 Mesa radeonsi driver for the vdpau API. It supports ATI Radeon
@@ -1304,18 +1275,33 @@ adapters based on Southern Islands chips.
 Sterownik Mesa radeonsi dla API vdpau. Obsługuje karty ATI Radeon
 oparte na układach Southern Islands.
 
+%package -n libvdpau-driver-mesa-virtio
+Summary:	Mesa virtio driver for the vdpau API
+Summary(pl.UTF-8):	Sterownik Mesa virtio dla API vdpau
+License:	MIT
+Group:		X11/Libraries
+Requires:	libdrm >= %{libdrm_ver}
+Requires:	libvdpau >= 1.1
+Requires:	zlib >= %{zlib_ver}
+
+%description -n libvdpau-driver-mesa-virtio
+Mesa virtio driver for the vdpau API.
+
+%description -n libvdpau-driver-mesa-virtio -l pl.UTF-8
+Sterownik Mesa virtio dla API vdpau.
+
 %package -n omxil-mesa
 Summary:	Mesa driver for Bellagio OpenMAX IL API
 Summary(pl.UTF-8):	Sterownik Mesa nouveau dla API Bellagio OpenMAX IL
 License:	MIT
 Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
-Requires:	libxcb >= 1.13
 Requires:	libomxil-bellagio
+Requires:	libxcb >= 1.13
 Requires:	zlib >= %{zlib_ver}
-Obsoletes:	omxil-mesa-nouveau
-Obsoletes:	omxil-mesa-r600
-Obsoletes:	omxil-mesa-radeonsi
+Obsoletes:	omxil-mesa-nouveau < 10.3
+Obsoletes:	omxil-mesa-r600 < 10.3
+Obsoletes:	omxil-mesa-radeonsi < 10.3
 
 %description -n omxil-mesa
 Mesa driver for Bellagio OpenMAX IL API.
@@ -1336,7 +1322,7 @@ Requires:	xorg-lib-libxshmfence >= 1.1
 Requires:	wayland >= %{wayland_ver}
 Requires:	zlib >= %{zlib_ver}
 Suggests:	vulkan(loader)
-Provides:	vulkan(icd) = 1.0.3
+Provides:	vulkan(icd) = 1.1.204
 
 %description vulkan-icd-broadcom
 v3dv - Mesa Vulkan driver for Raspberry Pi 4.
@@ -1357,7 +1343,7 @@ Requires:	xorg-lib-libxshmfence >= 1.1
 Requires:	wayland >= %{wayland_ver}
 Requires:	zlib >= %{zlib_ver}
 Suggests:	vulkan(loader)
-Provides:	vulkan(icd) = 1.0.3
+Provides:	vulkan(icd) = 1.1.204
 
 %description vulkan-icd-freedreno
 turnip - Mesa Vulkan driver for Adreno chips.
@@ -1365,6 +1351,27 @@ turnip - Mesa Vulkan driver for Adreno chips.
 %description vulkan-icd-freedreno -l pl.UTF-8
 turnip - sterownik Vulkan dla układów Adreno.
 
+%package vulkan-icd-powervr
+Summary:	powervr - Mesa Vulkan driver for Imagination Technologies Rogue GPUs
+Summary(pl.UTF-8):	powervr - sterownik Vulkan dla układów Imagination Technologies Rogue
+License:	MIT
+Group:		Libraries
+Requires:	libdrm >= %{libdrm_ver}
+Requires:	libxcb >= 1.13
+Requires:	xorg-lib-libXrandr >= 1.3
+Requires:	xorg-lib-libxshmfence >= 1.1
+# wayland-client
+Requires:	wayland >= %{wayland_ver}
+Requires:	zlib >= %{zlib_ver}
+Suggests:	vulkan(loader)
+Provides:	vulkan(icd) = 1.1.204
+
+%description vulkan-icd-powervr
+powervr - Mesa Vulkan driver for Imagination Technologies Rogue GPUs.
+
+%description vulkan-icd-powervr -l pl.UTF-8
+powervr - sterownik Vulkan dla układów Imagination Technologies Rogue.
+
 %package vulkan-icd-intel
 Summary:	Mesa Vulkan driver for Intel GPUs
 Summary(pl.UTF-8):	Sterownik Vulkan dla GPU firmy Intel
@@ -1378,7 +1385,8 @@ Requires:	xorg-lib-libxshmfence >= 1.1
 Requires:	wayland >= %{wayland_ver}
 Requires:	zlib >= %{zlib_ver}
 Suggests:	vulkan(loader)
-Provides:	vulkan(icd) = 1.0.3
+Provides:	vulkan(icd) = 1.3.204
+Obsoletes:	Mesa-vulkan-icd-intel-devel < 21.1.0
 
 %description vulkan-icd-intel
 Mesa Vulkan driver for Intel GPUs.
@@ -1386,19 +1394,6 @@ Mesa Vulkan driver for Intel GPUs.
 %description vulkan-icd-intel -l pl.UTF-8
 Sterownik Vulkan dla GPU Intela.
 
-%package vulkan-icd-intel-devel
-Summary:	Header files for Mesa Intel GPU Vulkan driver
-Summary(pl.UTF-8):	Pliki nagłówkowe sterownika Vulkan dla GPU Intela
-License:	MIT
-Group:		Development/Libraries
-Requires:	%{name}-vulkan-icd-intel = %{version}-%{release}
-
-%description vulkan-icd-intel-devel
-eader files for Mesa Intel GPU Vulkan driver.
-
-%description vulkan-icd-intel-devel -l pl.UTF-8
-Pliki nagłówkowe sterownika Vulkan dla GPU Intel.
-
 %package vulkan-icd-lavapipe
 Summary:	lavapipe - Mesa software Vulkan driver
 Summary(pl.UTF-8):	lavapipe - programowy sterownik Vulkan
@@ -1412,7 +1407,7 @@ Requires:	xorg-lib-libxshmfence >= 1.1
 Requires:	wayland >= %{wayland_ver}
 Requires:	zlib >= %{zlib_ver}
 Suggests:	vulkan(loader)
-Provides:	vulkan(icd) = 1.0.3
+Provides:	vulkan(icd) = 1.1.204
 
 %description vulkan-icd-lavapipe
 lavapipe - Mesa software Vulkan driver.
@@ -1420,6 +1415,27 @@ lavapipe - Mesa software Vulkan driver.
 %description vulkan-icd-lavapipe -l pl.UTF-8
 lavapipe - programowy sterownik Vulkan.
 
+%package vulkan-icd-panfrost
+Summary:	panfrost - Mesa Vulkan driver for Mali Midgard and Bifrost GPUs
+Summary(pl.UTF-8):	panfrost - sterownik Vulkan dla układów Mali Midgard i Bifrost
+License:	MIT
+Group:		Libraries
+Requires:	libdrm >= %{libdrm_ver}
+Requires:	libxcb >= 1.13
+Requires:	xorg-lib-libXrandr >= 1.3
+Requires:	xorg-lib-libxshmfence >= 1.1
+# wayland-client
+Requires:	wayland >= %{wayland_ver}
+Requires:	zlib >= %{zlib_ver}
+Suggests:	vulkan(loader)
+Provides:	vulkan(icd) = 1.1.204
+
+%description vulkan-icd-panfrost
+panfrost - Mesa Vulkan driver for Mali Midgard and Bifrost GPUs.
+
+%description vulkan-icd-panfrost -l pl.UTF-8
+panfrost - sterownik Vulkan dla układów Mali Midgard i Bifrost.
+
 %package vulkan-icd-radeon
 Summary:	radv - experimental Mesa Vulkan driver for AMD Radeon GPUs
 Summary(pl.UTF-8):	radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD
@@ -1433,7 +1449,7 @@ Requires:	xorg-lib-libxshmfence >= 1.1
 Requires:	wayland >= %{wayland_ver}
 Requires:	zlib >= %{zlib_ver}
 Suggests:	vulkan(loader)
-Provides:	vulkan(icd) = 1.0.3
+Provides:	vulkan(icd) = 1.3.204
 
 %description vulkan-icd-radeon
 radv - experimental Mesa Vulkan driver for AMD Radeon GPUs.
@@ -1442,9 +1458,7 @@ radv - experimental Mesa Vulkan driver for AMD Radeon GPUs.
 radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD.
 
 %prep
-%setup -q -n mesa-mesa-%{version}
-%patch0 -p1
-%patch1 -p1
+%setup -q -n mesa-%{version}
 
 %build
 %if %{with opencl}
@@ -1454,20 +1468,10 @@ if [ "$(llvm-config --has-rtti)" != "YES" ] ; then
 fi
 %endif
 
-dri_drivers="nouveau r100 r200 \
-%if %{without gallium}
-swrast
-%endif
-%ifarch %{ix86} %{x8664} x32
-i965 %{!?with_gallium_i915:i915} \
-%endif
-"
-
-dri_drivers=$(echo $dri_drivers | xargs | tr ' ' ',')
 
 gallium_drivers="virgl swrast %{?with_gallium_zink:zink} \
 %ifarch %{ix86} %{x8664} x32
-svga iris %{?with_swr:swr} %{?with_gallium_i915:i915} \
+svga iris %{?with_gallium_i915:i915} crocus \
 %endif
 %if %{with gallium_radeon}
 r300 r600 radeonsi \
@@ -1478,7 +1482,6 @@ nouveau
 %ifarch %{arm} aarch64
 etnaviv \
 freedreno \
-kmsro \
 lima \
 panfrost \
 %{?with_gallium_nouveau:tegra} \
@@ -1486,6 +1489,7 @@ v3d \
 vc4 \
 %endif
 "
+# TODO: asahi (Apple Silicon) - arm/aarch64?
 
 gallium_drivers=$(echo $gallium_drivers | xargs | tr ' ' ',')
 
@@ -1494,16 +1498,21 @@ vulkan_drivers="swrast %{?with_radv:amd} \
 intel \
 %endif
 %ifarch %{arm} aarch64
-freedreno broadcom \
+freedreno broadcom imagination-experimental panfrost \
 %endif
 "
 
 vulkan_drivers=$(echo $vulkan_drivers | xargs | tr ' ' ',')
 
+%if %{with gallium_rusticl}
+%ifarch %{arm32_with_hf}
+export BINDGEN_EXTRA_CLANG_ARGS="-mfloat-abi=hard"
+%endif
+%endif
+
 %meson build \
 	-Dplatforms=x11%{?with_wayland:,wayland} \
 	-Ddri3=enabled \
-	-Ddri-drivers=${dri_drivers} \
 	-Ddri-drivers-path=%{_libdir}/xorg/modules/dri \
 	-Degl=%{?with_egl:enabled}%{!?with_egl:disabled} \
 	-Dgallium-drivers=${gallium_drivers} \
@@ -1516,12 +1525,12 @@ vulkan_drivers=$(echo $vulkan_drivers | xargs | tr ' ' ',')
 %else
 	-Dgallium-opencl=standalone \
 %endif
+	%{?with_gallium_rusticl:-Dgallium-rusticl=true -Drust_std=2021} \
 %else
 	-Dgallium-opencl=disabled \
 %endif
 	-Dgallium-va=%{?with_va:enabled}%{!?with_va:disabled} \
 	%{?with_vdpau:-Dgallium-vdpau=enabled} \
-	%{?with_xvmc:-Dgallium-xvmc=enabled} \
 	-Dgallium-xa=%{?with_xa:enabled}%{!?with_xa:disabled} \
 	-Dgbm=%{?with_gbm:enabled}%{!?with_gbm:disabled} \
 	-Dglvnd=%{?with_glvnd:true}%{!?with_glvnd:false} \
@@ -1530,9 +1539,15 @@ vulkan_drivers=$(echo $vulkan_drivers | xargs | tr ' ' ',')
 	%{?with_opencl_spirv:-Dopencl-spirv=true} \
 	-Dosmesa=true \
 	-Dselinux=true \
+	-Dsse2=%{__true_false sse2} \
 	-Dva-libs-path=%{_libdir}/libva/dri \
+	-Dvideo-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec \
 	-Dvulkan-drivers=${vulkan_drivers} \
-	-Dvulkan-icd-dir=/usr/share/vulkan/icd.d
+	-Dvulkan-icd-dir=/usr/share/vulkan/icd.d \
+%ifarch %{arm} aarch64
+	-Dfreedreno-virtio=true \
+	-Dimagination-srv=true
+%endif
 
 %ninja_build -C build
 
@@ -1543,6 +1558,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %ninja_install -C build
 
+install -d $RPM_BUILD_ROOT%{_libdir}/gbm
+
 # not used externally
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libglapi.so
 
@@ -1555,9 +1572,6 @@ strip -R .note.ABI-tag $RPM_BUILD_ROOT%{_libdir}/libGL.so.*.*
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	OpenCL-icd -p /sbin/ldconfig
-%postun	OpenCL-icd -p /sbin/ldconfig
-
 %post	libEGL -p /sbin/ldconfig
 %postun	libEGL -p /sbin/ldconfig
 
@@ -1570,14 +1584,15 @@ rm -rf $RPM_BUILD_ROOT
 %post	libOSMesa -p /sbin/ldconfig
 %postun	libOSMesa -p /sbin/ldconfig
 
+%post	OpenCL-icd -p /sbin/ldconfig
+%postun	OpenCL-icd -p /sbin/ldconfig
+
+%post	Rusticl-icd -p /sbin/ldconfig
+%postun	Rusticl-icd -p /sbin/ldconfig
+
 %post	libOpenCL -p /sbin/ldconfig
 %postun	libOpenCL -p /sbin/ldconfig
 
-%post	libXvMC-nouveau -p /sbin/ldconfig
-%postun	libXvMC-nouveau -p /sbin/ldconfig
-%post	libXvMC-r600 -p /sbin/ldconfig
-%postun	libXvMC-r600 -p /sbin/ldconfig
-
 %post	libgbm -p /sbin/ldconfig
 %postun	libgbm -p /sbin/ldconfig
 
@@ -1587,6 +1602,8 @@ rm -rf $RPM_BUILD_ROOT
 %post	libxatracker -p /sbin/ldconfig
 %postun	libxatracker -p /sbin/ldconfig
 
+### libraries
+
 %if %{with egl}
 %files libEGL
 %defattr(644,root,root,755)
@@ -1611,7 +1628,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/EGL/eglplatform.h
 %{_pkgconfigdir}/egl.pc
 %endif
-%{_includedir}/EGL/eglextchromium.h
+%{_includedir}/EGL/eglext_angle.h
 %{_includedir}/EGL/eglmesaext.h
 %endif
 
@@ -1643,9 +1660,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/GL/glxext.h
 %{_pkgconfigdir}/gl.pc
 %endif
-%dir %{_includedir}/GL/internal
-%{_includedir}/GL/internal/dri_interface.h
-%{_pkgconfigdir}/dri.pc
 
 %files libGLES
 %defattr(644,root,root,755)
@@ -1680,6 +1694,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/osmesa.pc
 
 %if %{with opencl}
+%if %{with gallium_rusticl}
+%files Rusticl-icd
+%defattr(644,root,root,755)
+/etc/OpenCL/vendors/rusticl.icd
+%attr(755,root,root) %{_libdir}/libRusticlOpenCL.so
+%attr(755,root,root) %{_libdir}/libRusticlOpenCL.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libRusticlOpenCL.so.1
+%endif
 %if %{with ocl_icd}
 %files OpenCL-icd
 %defattr(644,root,root,755)
@@ -1704,50 +1726,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
-%if %{with gallium}
-%if %{with gallium_nouveau}
-%files libXvMC-nouveau
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXvMCnouveau.so.1.*.*
-%attr(755,root,root) %ghost %{_libdir}/libXvMCnouveau.so.1
-%attr(755,root,root) %{_libdir}/libXvMCnouveau.so
-%endif
-
-%if %{with gallium_radeon}
-%files libXvMC-r600
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXvMCr600.so.1.*.*
-%attr(755,root,root) %ghost %{_libdir}/libXvMCr600.so.1
-%attr(755,root,root) %{_libdir}/libXvMCr600.so
-%endif
-
-%if %{with va}
-%files -n libva-driver-gallium
-%defattr(644,root,root,755)
-
-%if %{with gallium_radeon}
-%files -n libva-driver-r600
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libva/dri/r600_drv_video.so
-
-%files -n libva-driver-radeonsi
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libva/dri/radeonsi_drv_video.so
-%endif
-
-%if %{with gallium_nouveau}
-%files -n libva-driver-nouveau
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libva/dri/nouveau_drv_video.so
-%endif
-%endif
-%endif
-
 %if %{with gbm}
 %files libgbm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgbm.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgbm.so.1
+%dir %{_libdir}/gbm
 
 %files libgbm-devel
 %defattr(644,root,root,755)
@@ -1778,24 +1762,35 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/xatracker.pc
 %endif
 
-%if %{with egl}
-%if %{without glvnd}
+%if %{with egl} && %{without glvnd}
 %files khrplatform-devel
 %defattr(644,root,root,755)
 %dir %{_includedir}/KHR
 %{_includedir}/KHR/khrplatform.h
 %endif
-%endif
 
-%files dri-driver-ati-radeon-R100
+%files dri-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/radeon_dri.so
+%dir %{_includedir}/GL/internal
+%{_includedir}/GL/internal/dri_interface.h
+%{_pkgconfigdir}/dri.pc
+
+### drivers: d3d
 
-%files dri-driver-ati-radeon-R200
+%if %{with nine}
+%files d3d
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/r200_dri.so
+%dir %{_libdir}/d3d
+%attr(755,root,root) %{_libdir}/d3d/d3dadapter9.so*
+
+%files d3d-devel
+%defattr(644,root,root,755)
+%{_includedir}/d3dadapter
+%{_pkgconfigdir}/d3d.pc
+%endif
+
+### drivers: dri
 
-%if %{with gallium}
 %if %{with gallium_radeon}
 %files dri-driver-ati-radeon-R300
 %defattr(644,root,root,755)
@@ -1809,18 +1804,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/radeonsi_dri.so
 %endif
-%endif
 
 %ifarch %{ix86} %{x8664} x32
 %files dri-driver-intel-i915
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/i915_dri.so
 
-%files dri-driver-intel-i965
+%if %{with gallium}
+%files dri-driver-intel-crocus
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/i965_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/crocus_dri.so
 
-%if %{with gallium}
 %files dri-driver-intel-iris
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/iris_dri.so
@@ -1829,7 +1823,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dri-driver-nouveau
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_vieux_dri.so
 %if %{with gallium_nouveau}
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/nouveau_dri.so
 %endif
@@ -1861,13 +1854,18 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/ili9341_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/imx-dcss_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/imx-drm_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/imx-lcdif_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/ingenic-drm_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/kirin_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/komeda_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/mali-dp_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/mcde_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/mediatek_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/meson_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/mi0283qt_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/mxsfb-drm_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/pl111_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/rcar-du_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/repaper_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/rockchip_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/st7586_dri.so
@@ -1915,9 +1913,15 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
+### drivers: pipe
+
 %if %{with gallium}
 %if %{with opencl}
 %ifarch %{ix86} %{x8664} x32
+%files pipe-driver-crocus
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_crocus.so
+
 %if %{with gallium_i915}
 %files pipe-driver-i915
 %defattr(644,root,root,755)
@@ -1929,7 +1933,11 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/gallium-pipe/pipe_iris.so
 %endif
 
-%ifarch %{arm}
+%ifarch %{arm} aarch64
+%files pipe-driver-kmsro
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_kmsro.so
+
 %files pipe-driver-msm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gallium-pipe/pipe_msm.so
@@ -1959,33 +1967,44 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gallium-pipe/pipe_swrast.so
 
+%ifarch %{ix86} %{x8664} x32
 %files pipe-driver-vmwgfx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gallium-pipe/pipe_vmwgfx.so
 %endif
+%endif
+%endif
 
-# currently disabled as cannot be built with swrast
-%if %{with swr}
-%files swr
+### drivers: va
+
+%if %{with va}
+%files -n libva-driver-gallium
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libswrAVX.so*
-%attr(755,root,root) %{_libdir}/libswrAVX2.so*
-%endif
+
+%if %{with gallium_radeon}
+%files -n libva-driver-r600
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libva/dri/r600_drv_video.so
+
+%files -n libva-driver-radeonsi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libva/dri/radeonsi_drv_video.so
 %endif
 
-%if %{with nine}
-%files d3d
+%if %{with gallium_nouveau}
+%files -n libva-driver-nouveau
 %defattr(644,root,root,755)
-%dir %{_libdir}/d3d
-%attr(755,root,root) %{_libdir}/d3d/d3dadapter9.so*
+%attr(755,root,root) %{_libdir}/libva/dri/nouveau_drv_video.so
+%endif
 
-%files d3d-devel
+%files -n libva-driver-virtio
 %defattr(644,root,root,755)
-%{_includedir}/d3dadapter
-%{_pkgconfigdir}/d3d.pc
+%attr(755,root,root) %{_libdir}/libva/dri/virtio_gpu_drv_video.so
 %endif
 
-%if %{with gallium}
+### drivers: vdpau
+
+%if %{with vdpau}
 # ldconfig is not used in vdpau tree, so package all symlinks
 %if %{with gallium_nouveau}
 %files -n libvdpau-driver-mesa-nouveau
@@ -2018,14 +2037,25 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_radeonsi.so.1
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_radeonsi.so
 %endif
+
+%files -n libvdpau-driver-mesa-virtio
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/vdpau/libvdpau_virtio_gpu.so.1.0.0
+%attr(755,root,root) %{_libdir}/vdpau/libvdpau_virtio_gpu.so.1.0
+%attr(755,root,root) %{_libdir}/vdpau/libvdpau_virtio_gpu.so.1
+%attr(755,root,root) %{_libdir}/vdpau/libvdpau_virtio_gpu.so
 %endif
 
-%if %{with gallium} && %{with omx}
+### drivers: omxil
+
+%if %{with omx}
 %files -n omxil-mesa
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/bellagio/libomx_mesa.so
 %endif
 
+### drivers: vulkan
+
 %ifarch %{arm} aarch64
 %files vulkan-icd-broadcom
 %defattr(644,root,root,755)
@@ -2036,6 +2066,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvulkan_freedreno.so
 %{_datadir}/vulkan/icd.d/freedreno_icd.*.json
+
+%files vulkan-icd-powervr
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libpowervr_rogue.so
+%attr(755,root,root) %{_libdir}/libvulkan_powervr_mesa.so
+%{_datadir}/vulkan/icd.d/powervr_mesa_icd.*.json
+
+%files vulkan-icd-panfrost
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libvulkan_panfrost.so
+%{_datadir}/vulkan/icd.d/panfrost_icd.*.json
 %endif
 
 %ifarch %{ix86} %{x8664} x32
@@ -2043,10 +2084,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvulkan_intel.so
 %{_datadir}/vulkan/icd.d/intel_icd.*.json
-
-%files vulkan-icd-intel-devel
-%defattr(644,root,root,755)
-%{_includedir}/vulkan/vulkan_intel.h
 %endif
 
 %files vulkan-icd-lavapipe