X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=Mesa.spec;h=2719e508c08e4fa6a8cdf8fcb3c2405746f5d581;hb=f6b72a7b4f7b8dbd57a1dbde9d455083786ab93c;hp=74d41a4593768ec12da4afa5a8297d63b11af708;hpb=eec044ae4fd9db3a5f159eb1d7667961d781a755;p=packages%2FMesa.git

diff --git a/Mesa.spec b/Mesa.spec
index 74d41a4..2719e50 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1,10 +1,6 @@
 #
 # TODO:
 # - check if gallium_i915 note is still valid, switch the bcond if not
-# - consider:
-# - subpackage with non-dri libGL for use with X-servers with missing GLX extension?
-# - resurrect static if it's useful (using plain xorg target? DRI doesn't support static)
-# - libglvnd?
 #
 # Conditional build:
 %bcond_without	gallium		# gallium drivers
@@ -37,11 +33,13 @@
 # minimal supported xserver version
 %define		xserver_ver		1.5.0
 # other packages
-%define		libdrm_ver		2.4.71
-%define		dri2proto_ver		2.6
+%define		libdrm_ver		2.4.92
+%define		dri2proto_ver		2.8
 %define		dri3proto_ver		1.0
 %define		glproto_ver		1.4.14
 %define		presentproto_ver	1.0
+%define		zlib_ver		1.2.8
+%define		wayland_ver		1.11
 
 %if %{without gallium}
 %undefine	with_gallium_i915
@@ -62,33 +60,35 @@
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	13.0.0
-Release:	4
+Version:	18.2.6
+Release:	1
 License:	MIT (core) and others - see license.html file
 Group:		X11/Libraries
-Source0:	ftp://ftp.freedesktop.org/pub/mesa/%{version}/mesa-%{version}.tar.xz
-# Source0-md5:	8c4ca7da1be2b8f9a877db09304335a4
+Source0:	ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz
+# Source0-md5:	7c61a801311fb8d2f7b3cceb7b5cf308
+Patch0:		%{name}-link.patch
 URL:		http://www.mesa3d.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
 %{?with_opencl:BuildRequires:	clang-devel >= 3.1}
 BuildRequires:	elfutils-devel
-BuildRequires:	expat-devel
+BuildRequires:	expat-devel >= 1.95
 BuildRequires:	gcc >= 6:4.2.0
 %{?with_nine:BuildRequires:	gcc-c++ >= 6:4.6}
 %{?with_opencl:BuildRequires:	gcc-c++ >= 6:4.7}
 BuildRequires:	libdrm-devel >= %{libdrm_ver}
-%{?with_glvnd:BuildRequires:	libglvnd-devel >= 0.1.0}
+%{?with_glvnd:BuildRequires:	libglvnd-devel >= 0.2.0}
 BuildRequires:	libselinux-devel
 BuildRequires:	libstdc++-devel >= 6:4.2.0
 BuildRequires:	libtalloc-devel >= 2:2.0.1
 BuildRequires:	libtool >= 2:2.2
 %{?with_va:BuildRequires:	libva-devel >= 1.6.0}
-%{?with_va:BuildRequires:	pkgconfig(libva) >= 0.38.0}
+%{?with_va:BuildRequires:	pkgconfig(libva) >= 0.39.0}
 BuildRequires:	libvdpau-devel >= 1.1
-BuildRequires:	libxcb-devel >= 1.10
-%{?with_gallium_radeon:BuildRequires:	llvm-devel >= 3.8}
-%{?with_radv:BuildRequires:	llvm-devel >= 3.9}
+BuildRequires:	libxcb-devel >= 1.13
+# gallium core requires 3.3.0, OpenCL/r600 require 3.9.0, swr/radeonsi/radv 4.0.0
+%{?with_gallium:BuildRequires:	llvm-devel >= 5.0}
+%{?with_radv:BuildRequires:	llvm-devel >= 5.0}
 %{?with_opencl:BuildRequires:	llvm-libclc}
 # for SHA1 (could use also libmd/libsha1/libgcrypt/openssl instead)
 BuildRequires:	nettle-devel
@@ -98,16 +98,20 @@ BuildRequires:	perl-base
 BuildRequires:	pixman-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(talloc) >= 2.0.1
-BuildRequires:	pkgconfig(xcb-dri3)
-BuildRequires:	pkgconfig(xcb-present)
+BuildRequires:	pkgconfig(xcb-dri2) >= 1.8
+BuildRequires:	pkgconfig(xcb-dri3) >= 1.13
+BuildRequires:	pkgconfig(xcb-glx) >= 1.8.1
+BuildRequires:	pkgconfig(xcb-present) >= 1.13
 BuildRequires:	python >= 2
 BuildRequires:	python-Mako >= 0.8.0
 BuildRequires:	python-modules >= 2
 BuildRequires:	rpmbuild(macros) >= 1.470
 BuildRequires:	sed >= 4.0
 # wayland-{client,server}
-%{?with_wayland:BuildRequires:	wayland-devel >= 1.2.0}
-BuildRequires:	xorg-lib-libXdamage-devel
+%{?with_wayland:BuildRequires:	wayland-devel >= %{wayland_ver}}
+%{?with_wayland:BuildRequires:	wayland-protocols >= 1.8}
+%{?with_wayland:BuildRequires:	wayland-egl-devel >= %{wayland_ver}}
+BuildRequires:	xorg-lib-libXdamage-devel >= 1.1
 BuildRequires:	xorg-lib-libXext-devel >= 1.0.5
 BuildRequires:	xorg-lib-libXfixes-devel
 BuildRequires:	xorg-lib-libXt-devel
@@ -120,16 +124,17 @@ BuildRequires:	xorg-proto-glproto-devel >= %{glproto_ver}
 BuildRequires:	xorg-proto-presentproto-devel >= %{presentproto_ver}
 BuildRequires:	xorg-util-makedepend
 %if %{with gallium}
-%{?with_lm_sensors:BuildRequires:	lm_sensors-devel >= 3.4}
+%{?with_lm_sensors:BuildRequires:	lm_sensors-devel >= 4.0}
 BuildRequires:	xorg-proto-xextproto-devel >= 7.0.99.1
 BuildRequires:	xorg-xserver-server-devel >= %{xserver_ver}
 %endif
+BuildRequires:	zlib-devel >= %{zlib_ver}
 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(?)
 # libgbm: circular dependency with libEGL (wayland_buffer_is_drm symbol)
-%define		skip_post_check_so      libGLESv1_CM.so.1.* libGLESv2.so.2.* libGL.so.1.* libOSMesa.so.* libgbm.*.so.*
+%define		skip_post_check_so      libGLESv1_CM.so.1.* libGLESv2.so.2.* libGL.so.1.* libOSMesa.so.* libgbm.*.so.* libGLX_mesa.so.0.*
 
 # llvm build broken
 %define		filterout_ld    -Wl,--as-needed
@@ -158,8 +163,8 @@ Requires:	%{name}-libglapi = %{version}-%{release}
 # glx driver in libEGL dlopens libGL.so
 Requires:	OpenGL >= 1.2
 Requires:	libdrm >= %{libdrm_ver}
-Requires:	libxcb >= 1.9
-%{?with_wayland:Requires:	wayland >= 1.2.0}
+Requires:	libxcb >= 1.13
+%{?with_wayland:Requires:	wayland >= 1.11.0}
 %if %{with gbm}
 Requires:	%{name}-libgbm = %{version}-%{release}
 %endif
@@ -185,7 +190,7 @@ Requires:	%{name}-khrplatform-devel = %{version}-%{release}
 Requires:	%{name}-libEGL = %{version}-%{release}
 Requires:	libdrm-devel >= %{libdrm_ver}
 Requires:	xorg-lib-libX11-devel
-Requires:	xorg-lib-libXdamage-devel
+Requires:	xorg-lib-libXdamage-devel >= 1.1
 Requires:	xorg-lib-libXext-devel >= 1.0.5
 Requires:	xorg-lib-libXfixes-devel
 Requires:	xorg-lib-libXxf86vm-devel
@@ -220,6 +225,8 @@ License:	MIT
 Group:		X11/Libraries
 Requires:	%{name}-libglapi = %{version}-%{release}
 Requires:	libdrm >= %{libdrm_ver}
+Requires:	libxcb >= 1.13
+Requires:	xorg-lib-libXdamage >= 1.1
 Provides:	OpenGL = 4.5
 Provides:	OpenGL-GLX = 1.4
 Obsoletes:	Mesa
@@ -236,7 +243,7 @@ Silicon Graphics, Inc. However, the author does not possess an OpenGL
 license from SGI, and makes no claim that Mesa is in any way a
 compatible replacement for OpenGL or associated with SGI.
 
-This package contains libGL which implements OpenGL 1.5 and GLX 1.4
+This package contains libGL which implements OpenGL 4.5 and GLX 1.4
 specifications. It uses DRI for rendering.
 
 %description libGL -l pl.UTF-8
@@ -246,7 +253,7 @@ autoryzacją Silicon Graphics, Inc. Jednak autor nie posiada licencji
 OpenGL od SGI i nie twierdzi, że Mesa jest kompatybilnym zamiennikiem
 OpenGL ani powiązana z SGI.
 
-Ten pakiet zawiera libGL implementującą specyfikacje OpenGL 1.5 oraz
+Ten pakiet zawiera libGL implementującą specyfikacje OpenGL 4.5 oraz
 GLX 1.4. Używa DRI do renderowania.
 
 %package libGL-devel
@@ -258,7 +265,7 @@ Group:		X11/Development/Libraries
 Requires:	OpenGL >= 1.5
 Requires:	libdrm-devel >= %{libdrm_ver}
 Requires:	xorg-lib-libX11-devel
-Requires:	xorg-lib-libXdamage-devel
+Requires:	xorg-lib-libXdamage-devel >= 1.1
 Requires:	xorg-lib-libXext-devel >= 1.0.5
 Requires:	xorg-lib-libXxf86vm-devel
 Requires:	xorg-proto-dri2proto-devel >= %{dri2proto_ver}
@@ -304,7 +311,7 @@ Requires:	%{name}-libglapi = %{version}-%{release}
 Provides:	OpenGLES
 Provides:	OpenGLESv1 = 1.1
 Provides:	OpenGLESv2 = 2.0
-Provides:	OpenGLESv3 = 3.1
+Provides:	OpenGLESv3 = 3.2
 
 %description libGLES
 This package contains shared libraries of Mesa implementation of GLES
@@ -332,7 +339,7 @@ Requires:	%{name}-libGLES = %{version}-%{release}
 Provides:	OpenGLES-devel
 Provides:	OpenGLESv1-devel = 1.1
 Provides:	OpenGLESv2-devel = 2.0
-Provides:	OpenGLESv3-devel = 3.1
+Provides:	OpenGLESv3-devel = 3.2
 
 %description libGLES-devel
 Header files for Mesa GLES libraries.
@@ -345,6 +352,7 @@ Summary:	OSMesa (off-screen renderer) library
 Summary(pl.UTF-8):	Biblioteka OSMesa (renderująca bitmapy w pamięci)
 License:	MIT
 Group:		Libraries
+Requires:	zlib >= %{zlib_ver}
 
 %description libOSMesa
 OSMesa (off-screen renderer) library.
@@ -391,6 +399,7 @@ Group:		Libraries
 Requires:	filesystem >= 4.0-29
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	llvm-libclc
+Requires:	zlib >= %{zlib_ver}
 Provides:	OpenCL = 1.1
 Provides:	ocl-icd-driver
 
@@ -497,6 +506,7 @@ 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
@@ -512,6 +522,7 @@ License:	MIT
 Group:		Libraries
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	xorg-lib-libXvMC >= 1.0.6
+Requires:	zlib >= %{zlib_ver}
 Conflicts:	Mesa-libXvMC
 
 %description libXvMC-r600
@@ -545,6 +556,7 @@ 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.
@@ -557,18 +569,21 @@ 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:	zlib >= %{zlib_ver}
 
 %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.
+Sterownik VA dla kart ATI Radeon opartych na układach Southern
+Islands.
 
 %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}
 
 %description -n libva-driver-nouveau
 VA driver for NVidia adapters.
@@ -615,36 +630,12 @@ Mesa GL API shared library, common for various APIs (EGL, GL, GLES).
 Biblioteka współdzielona Mesa GL API, wspólna dla różnych API (EGL,
 GL, GLES).
 
-%package libwayland-egl
-Summary:	Wayland EGL library
-Summary(pl.UTF-8):	Biblioteka Wayland EGL
-Group:		Libraries
-Requires:	libdrm >= %{libdrm_ver}
-
-%description libwayland-egl
-Wayland EGL platform library.
-
-%description libwayland-egl -l pl.UTF-8
-Biblioteka platformy EGL Wayland.
-
-%package libwayland-egl-devel
-Summary:	Development files for Wayland EGL library
-Summary(pl.UTF-8):	Pliki programistyczne biblioteki Wayland EGL
-Group:		Development/Libraries
-Requires:	%{name}-libwayland-egl = %{version}-%{release}
-Requires:	libdrm-devel >= %{libdrm_ver}
-
-%description libwayland-egl-devel
-Development files for Wayland EGL platform library.
-
-%description libwayland-egl-devel -l pl.UTF-8
-Pliki programistyczne biblioteki platformy EGL Wayland.
-
 %package libxatracker
 Summary:	Xorg Gallium3D accelleration library
 Summary(pl.UTF-8):	Biblioteka akceleracji Gallium3D dla Xorg
 Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
+Requires:	zlib >= %{zlib_ver}
 
 %description libxatracker
 Xorg Gallium3D accelleration library (used by new vmwgfx driver).
@@ -686,13 +677,16 @@ 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
 
 %description dri-driver-ati-radeon-R100
-X.org DRI driver for ATI R100 card family (Radeon 7000-7500).
+X.org DRI driver for ATI R100 card family (Radeon 7000-7500). It
+supports R100, RV100, RS100, RV200, RS200, RS250.
 
 %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.
 
 %package dri-driver-ati-radeon-R200
 Summary:	X.org DRI driver for ATI R200 card family
@@ -702,13 +696,16 @@ 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
 
 %description dri-driver-ati-radeon-R200
-X.org DRI driver for ATI R200 card family (Radeon 8500-92xx)
+X.org DRI driver for ATI R200 card family (Radeon 8500-92xx). It
+supports R200, RV250, RV280, RS300, RS350 chips.
 
 %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.
 
 %package dri-driver-ati-radeon-R300
 Summary:	X.org DRI driver for ATI R300 card family
@@ -718,13 +715,22 @@ 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
 
 %description dri-driver-ati-radeon-R300
-X.org DRI driver for ATI R300/R400/RS690/R500 card family.
+X.org Gallium DRI driver for ATI R300/R400/RS690/R500 card family
+(Radeon 9600-9800, X300-X2300). It supports R300, R350, R360, RV350,
+RV370, RV380, R420, R423, R430, R480, R481, RV410, RS400, RC410,
+RS480, RS482, R520, RV515, RV530, RV560, RV570, R580, RS600, RS690,
+RS740 chips.
 
 %description dri-driver-ati-radeon-R300 -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart ATI R300/R400/RS690/R500.
+Sterownik X.org DRI Gallium dla rodziny kart ATI R300/R400/RS690/R500
+(Radeon 9600-9800, X300-X2300). Obsługuje układy R300, R350, R360,
+RV350, RV370, RV380, R420, R423, R430, R480, R481, RV410, RS400,
+RC410, RS480, RS482, R520, RV515, RV530, RV560, RV570, R580, RS600,
+RS690, RS740.
 
 %package dri-driver-ati-radeon-R600
 Summary:	X.org DRI driver for ATI R600 card family
@@ -735,12 +741,21 @@ 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}
 
 %description dri-driver-ati-radeon-R600
-X.org DRI driver for ATI R600/R700 card family.
+X.org Gallium DRI driver for ATI R600/R700 card family (Radeon HD
+2400-7000). It supports R600, RV610, RV630, RV670, RV620, RV635,
+RS780, RS880, RV770, RV730, RV710, RV740, CEDAR, REDWOOD, JUNIPER,
+CYPRESS, HEMLOCK, PALM, SUMO/SUMO2, CAYMAN, BARTS, TURKS, CAICOS,
+ARUBA chips.
 
 %description dri-driver-ati-radeon-R600 -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart ATI R600/R700.
+Sterownik X.org DRI Gallium dla rodziny kart ATI R600/R700 (Radeon HD
+2400-7000). Obsługuje układy R600, RV610, RV630, RV670, RV620, RV635,
+RS780, RS880, RV770, RV730, RV710, RV740, CEDAR, REDWOOD, JUNIPER,
+CYPRESS, HEMLOCK, PALM, SUMO/SUMO2, CAYMAN, BARTS, TURKS, CAICOS,
+ARUBA.
 
 %package dri-driver-ati-radeon-SI
 Summary:	X.org DRI driver for ATI Southern Islands card family
@@ -751,12 +766,35 @@ 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}
 
 %description dri-driver-ati-radeon-SI
-X.org DRI driver for ATI Southern Islands card family.
+X.org Gallium DRI driver for ATI Southern Islands card family (Radeon
+HD 7700-8000, R9, APU). It supports TAHITI, PITCAIRN, VERDE, OLAND,
+HAINAN, BONAIRE, KABINI, MULLINS, KAVERI, HAWAII, ICELAND, TONGA,
+CARRIZO, FIJI, POLARIS, STONEY chips.
 
 %description dri-driver-ati-radeon-SI -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart ATI Southern Islands.
+Sterownik X.org DRI Gallium dla rodziny kart ATI Southern Islands
+(Radeon HD 7700-8000, R9, APU). Obsługuje układy TAHITI, PITCAIRN,
+VERDE, OLAND, HAINAN, BONAIRE, KABINI, MULLINS, KAVERI, HAWAII,
+ICELAND, TONGA, CARRIZO, FIJI, POLARIS, STONEY.
+
+%package dri-driver-etnaviv
+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
+#Requires:	xorg-driver-video-?
+Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
+Requires:	xorg-xserver-server >= %{xserver_ver}
+Requires:	zlib >= %{zlib_ver}
+
+%description dri-driver-etnaviv
+X.org DRI driver for Vivante 3D chips.
+
+%description dri-driver-etnaviv -l pl.UTF-8
+Sterownik X.org DRI dla układów Vivante 3D.
 
 %package dri-driver-freedreno
 Summary:	X.org DRI driver for Adreno chips
@@ -766,6 +804,7 @@ Group:		X11/Libraries
 Requires:	xorg-driver-video-freedreno
 Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_ver}
+Requires:	zlib >= %{zlib_ver}
 
 %description dri-driver-freedreno
 X.org DRI driver for Adreno chips.
@@ -780,16 +819,17 @@ 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-i915
-X.org DRI driver for Intel i915 card family (915, 945, G33, Q33, Q35,
-Pineview).
+X.org DRI driver for Intel i915 card family (830, 845, 852/855, 865,
+915, 945, G33, Q33, Q35, Pineview).
 
 %description dri-driver-intel-i915 -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart Intel i915 (915, 945, G33, Q33,
-Q35, Pineview).
+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
@@ -798,33 +838,21 @@ 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 DRI driver for Intel i965 card family (946GZ, 965G, 965Q, 965GM,
-965GME, GM45, G41, B43, Q45, G45);
+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, Geminilake);
 
 %description dri-driver-intel-i965 -l pl.UTF-8
-Sterownik X.org DRI dla rodziny kart Intel i965 (946GZ, 965G, 965Q,
-965GM, 965GME, GM45, G41, B43, Q45, G45).
-
-%package dri-driver-intel-ilo
-Summary:	X.org DRI driver for Intel chips family
-Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny układów firmy Intel
-License:	MIT
-Group:		X11/Libraries
-Requires:	xorg-driver-video-intel
-Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
-Requires:	xorg-xserver-server >= %{xserver_ver}
-
-%description dri-driver-intel-ilo
-X.org DRI driver for Intel chips family. It supports Cherryview/
-Broadwell/Bay Trail/Haswell/Ivybridge/Sandybridge chips.
-
-%description dri-driver-intel-ilo -l pl.UTF-8
-Sterownik X.org DRI dla rodziny układów firmy Intel. Obsługuje układy
-Cherryview/Broadwell/Bay Trail/Haswell/Ivybdidge/Sandybridge.
+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, Geminilake);
 
 %package dri-driver-nouveau
 Summary:	X.org DRI driver for NVIDIA card family
@@ -834,6 +862,7 @@ Group:		X11/Libraries
 Requires:	xorg-driver-video-nouveau
 Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_ver}
+Requires:	zlib >= %{zlib_ver}
 
 %description dri-driver-nouveau
 X.org DRI drivers for NVIDIA card family.
@@ -848,6 +877,7 @@ License:	MIT
 Group:		X11/Libraries
 Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_ver}
+Requires:	zlib >= %{zlib_ver}
 
 %description dri-driver-swrast
 X.org DRI software rasterizer driver.
@@ -863,6 +893,7 @@ Group:		X11/Libraries
 Requires:	xorg-driver-video-modesetting
 Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_ver}
+Requires:	zlib >= %{zlib_ver}
 
 %description dri-driver-vc4
 X.org DRI driver for Broadcom VC4 chips.
@@ -877,6 +908,7 @@ License:	MIT
 Group:		X11/Libraries
 Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_ver}
+Requires:	zlib >= %{zlib_ver}
 
 %description dri-driver-virgl
 X.org DRI driver for QEMU VirGL.
@@ -892,6 +924,7 @@ Group:		X11/Libraries
 Requires:	xorg-driver-video-vmware
 Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_ver}
+Requires:	zlib >= %{zlib_ver}
 
 %description dri-driver-vmwgfx
 X.org DRI driver for VMWare.
@@ -903,6 +936,7 @@ Sterownik X.org DRI dla VMware.
 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
 
@@ -914,25 +948,11 @@ i915 driver for Mesa Gallium dynamic pipe loader. It supports Intel
 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-i965
-Summary:	i965 (ilo) driver for Mesa Gallium dynamic pipe loader
-Summary(pl.UTF-8):	Sterownik i965 (ilo) dla dynamicznego systemu potoków szkieletu Mesa Gallium
-Group:		Libraries
-
-%description pipe-driver-i965
-i965 (ilo) driver for Mesa Gallium dynamic pipe loader. It supports
-Intel Cherryview/Broadwell/Bay Trail/Haswell/Ivybridge/Sandybridge
-chips.
-
-%description pipe-driver-i965 -l pl.UTF-8
-Sterownik i965 (ilo) dla dynamicznego systemu potoków szkieletu Mesa
-Gallium. Obsługuje układy Intela Cherryview/Broadwell/Bay Trail/
-Haswell/Ivybdidge/Sandybridge.
-
 %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
 Group:		Libraries
+Requires:	zlib >= %{zlib_ver}
 
 %description pipe-driver-msm
 msm (freedreno) driver for Mesa Gallium dynamic pipe loader. It
@@ -946,6 +966,7 @@ Mesa Gallium. Obsługuje układy Adreno.
 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
 
@@ -961,6 +982,7 @@ Gallium. Obsługuje karty graficzne firmy NVidia.
 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
 
@@ -977,6 +999,7 @@ R300/R400/RS690/R500.
 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
@@ -994,6 +1017,7 @@ R600/R700.
 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
@@ -1011,6 +1035,7 @@ 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
+Requires:	zlib >= %{zlib_ver}
 Obsoletes:	Mesa-gbm-driver-swrast
 Obsoletes:	Mesa-opencl-driver-swrast
 
@@ -1025,6 +1050,7 @@ szkieletu Mesa Gallium.
 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
 
@@ -1036,11 +1062,29 @@ 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
+Group:		Libraries
+Requires:	cpuinfo(avx)
+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 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.
+
 %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}
 
 %description d3d
 Nine Direct3D9 driver (for Wine).
@@ -1067,6 +1111,7 @@ License:	MIT
 Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	libvdpau >= 1.1
+Requires:	zlib >= %{zlib_ver}
 Conflicts:	libvdpau-driver-mesa
 
 %description -n libvdpau-driver-mesa-nouveau
@@ -1084,6 +1129,7 @@ License:	MIT
 Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	libvdpau >= 1.1
+Requires:	zlib >= %{zlib_ver}
 Conflicts:	libvdpau-driver-mesa
 
 %description -n libvdpau-driver-mesa-r300
@@ -1101,6 +1147,7 @@ License:	MIT
 Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	libvdpau >= 1.1
+Requires:	zlib >= %{zlib_ver}
 Conflicts:	libvdpau-driver-mesa
 
 %description -n libvdpau-driver-mesa-r600
@@ -1118,6 +1165,7 @@ License:	MIT
 Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	libvdpau >= 1.1
+Requires:	zlib >= %{zlib_ver}
 Conflicts:	libvdpau-driver-mesa
 Obsoletes:	Mesa-libllvmradeon
 
@@ -1135,8 +1183,9 @@ Summary(pl.UTF-8):	Sterownik Mesa nouveau dla API Bellagio OpenMAX IL
 License:	MIT
 Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
-Requires:	libxcb >= 1.8
+Requires:	libxcb >= 1.13
 Requires:	libomxil-bellagio
+Requires:	zlib >= %{zlib_ver}
 Obsoletes:	omxil-mesa-nouveau
 Obsoletes:	omxil-mesa-r600
 Obsoletes:	omxil-mesa-radeonsi
@@ -1147,64 +1196,18 @@ Mesa driver for Bellagio OpenMAX IL API.
 %description -n omxil-mesa -l pl.UTF-8
 Sterownik Mesa dla API Bellagio OpenMAX IL.
 
-%package -n omxil-mesa-nouveau
-Summary:	Mesa nouveau 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.8
-Requires:	libomxil-bellagio
-
-%description -n omxil-mesa-nouveau
-Mesa nouveau driver for Bellagio OpenMAX IL API. It supports NVidia
-adapters (NV40-NV96, NVa0).
-
-%description -n omxil-mesa-nouveau -l pl.UTF-8
-Sterownik Mesa nouveau dla API Bellagio OpenMAX IL. Obsługuje karty
-NVidia (NV40-NV96, NVa0).
-
-%package -n omxil-mesa-r600
-Summary:	Mesa r600 driver for Bellagio OpenMAX IL API
-Summary(pl.UTF-8):	Sterownik Mesa r600 dla API Bellagio OpenMAX IL
-License:	MIT
-Group:		X11/Libraries
-Requires:	libdrm >= %{libdrm_ver}
-Requires:	libxcb >= 1.8
-Requires:	libomxil-bellagio
-
-%description -n omxil-mesa-r600
-Mesa r600 driver for Bellagio OpenMAX IL API. It supports ATI Radeon
-adapters based on R600/R700 chips.
-
-%description -n omxil-mesa-r600 -l pl.UTF-8
-Sterownik Mesa r600 dla API Bellagio OpenMAX IL. Obsługuje karty ATI
-Radeon oparte na układach R600/R700.
-
-%package -n omxil-mesa-radeonsi
-Summary:	Mesa radeonsi driver for Bellagio OpenMAX IL API
-Summary(pl.UTF-8):	Sterownik Mesa radeonsi dla API Bellagio OpenMAX IL
-License:	MIT
-Group:		X11/Libraries
-Requires:	libdrm >= %{libdrm_ver}
-Requires:	libxcb >= 1.8
-Requires:	libomxil-bellagio
-
-%description -n omxil-mesa-radeonsi
-Mesa radeonsi driver for Bellagio OpenMAX IL API. It supports ATI
-Radeon adapters based on Southern Islands chips.
-
-%description -n omxil-mesa-radeonsi -l pl.UTF-8
-Sterownik Mesa radeonsi dla API Bellagio OpenMAX IL. Obsługuje karty
-ATI Radeon oparte na układach Southern Islands.
-
 %package vulkan-icd-intel
 Summary:	Mesa Vulkan driver for Intel GPUs
 Summary(pl.UTF-8):	Sterownik Vulkan dla GPU firmy Intel
 License:	MIT
 Group:		Libraries
-Suggests:	vulkan(loader)
 Requires:	libdrm >= %{libdrm_ver}
+Requires:	libxcb >= 1.13
+Requires:	xorg-lib-libxshmfence >= 1.1
+# wayland-client
+Requires:	wayland >= %{wayland_ver}
+Requires:	zlib >= %{zlib_ver}
+Suggests:	vulkan(loader)
 Provides:	vulkan(icd) = 1.0.3
 
 %description vulkan-icd-intel
@@ -1231,6 +1234,12 @@ Summary:	radv - experimental Mesa Vulkan driver for AMD Radeon GPUs
 Summary(pl.UTF-8):	radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD
 License:	MIT
 Group:		Libraries
+Requires:	libdrm >= %{libdrm_ver}
+Requires:	libxcb >= 1.13
+Requires:	xorg-lib-libxshmfence >= 1.1
+# wayland-client
+Requires:	wayland >= %{wayland_ver}
+Requires:	zlib >= %{zlib_ver}
 Suggests:	vulkan(loader)
 Provides:	vulkan(icd) = 1.0.3
 
@@ -1242,6 +1251,7 @@ radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD.
 
 %prep
 %setup -q -n mesa-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -1249,42 +1259,44 @@ radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD.
 %{__autoconf}
 %{__automake}
 
-dri_drivers="r200 radeon \
-%if %{without gallium_i915}
-i915 \
-%endif
-i965 \
-nouveau \
-%ifarch sparc sparcv9 sparc64
-ffb \
+dri_drivers="nouveau r200 radeon swrast \
+%ifarch %{ix86} %{x8664} x32
+i965 %{!?with_gallium_i915:i915} \
 %endif
-swrast"
+"
 
 dri_drivers=$(echo $dri_drivers | xargs | tr ' ' ',')
 
-gallium_drivers="svga swrast \
-%if %{with gallium_i915}
-i915 \
+gallium_drivers="svga swrast virgl \
+%ifarch %{x8664}
+swr
+%endif
+%ifarch %{ix86} %{x8664} x32
+%{?with_gallium_i915:i915} \
 %endif
 %if %{with gallium_radeon}
-r300 \
-r600 \
-radeonsi \
+r300 r600 radeonsi \
 %endif
 %if %{with gallium_nouveau}
 nouveau
 %endif
-ilo \
-virgl \
 %ifarch %{arm}
+etnaviv \
 freedreno \
+imx \
 vc4 \
 %endif
 "
 
 gallium_drivers=$(echo $gallium_drivers | xargs | tr ' ' ',')
 
-vulkan_drivers="intel%{?with_radv:,radeon}"
+vulkan_drivers="%{?with_radv:radeon} \
+%ifarch %{ix86} %{x8664} x32
+intel \
+%endif
+"
+
+vulkan_drivers=$(echo $vulkan_drivers | xargs | tr ' ' ',')
 
 %configure \
 	--disable-silent-rules \
@@ -1301,11 +1313,11 @@ vulkan_drivers="intel%{?with_radv:,radeon}"
 	--enable-egl \
 	--enable-gles1 \
 	--enable-gles2 \
-	--with-egl-platforms=x11%{?with_gbm:,drm}%{?with_wayland:,wayland} \
+	--with-platforms=x11%{?with_gbm:,drm}%{?with_wayland:,wayland} \
 %endif
 %if %{with gallium}
 	%{?with_hud_extra:--enable-gallium-extra-hud} \
-	--enable-gallium-llvm \
+	--enable-llvm \
 	%{__enable_disable shared_llvm llvm-shared-libs} \
 	%{__enable ocl_icd opencl-icd} \
 	%{?with_lm_sensors:--enable-lmsensors} \
@@ -1313,7 +1325,7 @@ vulkan_drivers="intel%{?with_radv:,radeon}"
 	%{__enable opencl} \
 	%{__enable va} \
 	--enable-vdpau \
-	%{?with_omx:--enable-omx} \
+	%{?with_omx:--enable-omx-bellagio} \
 	%{?with_xa:--enable-xa} \
 	--enable-xvmc \
 	--with-gallium-drivers=${gallium_drivers} \
@@ -1351,9 +1363,6 @@ rm -rf $RPM_BUILD_ROOT
 # not defined by standards; and not needed, there is pkg-config support
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
-# these are provided by vulkan-devel
-%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/vulkan/{vk_platform.h,vulkan.h}
-
 %if %{without glvnd}
 # remove "OS ABI: Linux 2.4.20" tag, so private copies (nvidia or fglrx),
 # set up via /etc/ld.so.conf.d/*.conf will be preferred over this
@@ -1392,21 +1401,28 @@ rm -rf $RPM_BUILD_ROOT
 %post	libglapi -p /sbin/ldconfig
 %postun	libglapi -p /sbin/ldconfig
 
-%post	libwayland-egl -p /sbin/ldconfig
-%postun	libwayland-egl -p /sbin/ldconfig
-
 %post	libxatracker -p /sbin/ldconfig
 %postun	libxatracker -p /sbin/ldconfig
 
 %if %{with egl}
 %files libEGL
 %defattr(644,root,root,755)
+%if %{with glvnd}
+%attr(755,root,root) %{_libdir}/libEGL_mesa.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libEGL_mesa.so.0
+%{_datadir}/glvnd/egl_vendor.d/50_mesa.json
+%else
 %attr(755,root,root) %{_libdir}/libEGL.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libEGL.so.1
+%endif
 
 %files libEGL-devel
 %defattr(644,root,root,755)
+%if %{with glvnd}
+%attr(755,root,root) %{_libdir}/libEGL_mesa.so
+%else
 %attr(755,root,root) %{_libdir}/libEGL.so
+%endif
 %dir %{_includedir}/EGL
 %{_includedir}/EGL/egl.h
 %{_includedir}/EGL/eglext.h
@@ -1424,7 +1440,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libGL
 %defattr(644,root,root,755)
-%doc docs/{*.html,README.UVD,patents.txt,relnotes/*.html}
+%doc docs/{*.html,README.UVD,features.txt,relnotes/*.html}
 %if %{with glvnd}
 %attr(755,root,root) %{_libdir}/libGLX_mesa.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libGLX_mesa.so.0
@@ -1589,18 +1605,6 @@ rm -rf $RPM_BUILD_ROOT
 # libglapi-devel? nothing seems to need it atm.
 #%attr(755,root,root) %{_libdir}/libglapi.so
 
-%if %{with wayland}
-%files libwayland-egl
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwayland-egl.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwayland-egl.so.1
-
-%files libwayland-egl-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwayland-egl.so
-%{_pkgconfigdir}/wayland-egl.pc
-%endif
-
 %if %{with xa}
 %files libxatracker
 %defattr(644,root,root,755)
@@ -1645,10 +1649,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/radeonsi_dri.so
 %endif
-
-%files dri-driver-intel-ilo
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/dri/ilo_dri.so
 %endif
 
 %files dri-driver-intel-i915
@@ -1675,6 +1675,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %if %{with gallium}
 %ifarch %{arm}
+%files dri-driver-etnaviv
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/etnaviv_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/imx-drm_dri.so
+
+%files dri-driver-freedreno
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/kgsl_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/msm_dri.so
+
 %files dri-driver-vc4
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/vc4_dri.so
@@ -1696,10 +1706,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/gallium-pipe/pipe_i915.so
 %endif
 
-%files pipe-driver-i965
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_i965.so
-
 %ifarch %{arm}
 %files pipe-driver-msm
 %defattr(644,root,root,755)
@@ -1733,6 +1739,13 @@ rm -rf $RPM_BUILD_ROOT
 %files pipe-driver-vmwgfx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gallium-pipe/pipe_vmwgfx.so
+
+%ifarch %{x8664}
+%files swr
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libswrAVX.so
+%attr(755,root,root) %{_libdir}/libswrAVX2.so
+%endif
 %endif
 
 %if %{with nine}
@@ -1797,5 +1810,5 @@ rm -rf $RPM_BUILD_ROOT
 %files vulkan-icd-radeon
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libvulkan_radeon.so
-%{_datadir}/vulkan/icd.d/radeon_icd.json
+%{_datadir}/vulkan/icd.d/radeon_icd.*.json
 %endif