X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=Mesa.spec;h=dd2996839f2c45b0d7b98adaaaa378c6f5890a2d;hb=fcf94429dead440f1e703483912b1dfc2a233f11;hp=4e505f2fe12d873b5852a8bee28981fd5eeab733;hpb=6a25fd68614188dad8473bda1f7fcb61823f27dc;p=packages%2FMesa.git

diff --git a/Mesa.spec b/Mesa.spec
index 4e505f2..dd29968 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1,9 +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)
 #
 # Conditional build:
 %bcond_without	gallium		# gallium drivers
@@ -36,15 +33,12 @@
 # minimal supported xserver version
 %define		xserver_ver		1.5.0
 # other packages
-%ifarch %{arm}
-%define		libdrm_ver		2.4.74
-%else
-%define		libdrm_ver		2.4.71
-%endif
-%define		dri2proto_ver		2.6
+%define		libdrm_ver		2.4.91
+%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
 
 %if %{without gallium}
 %undefine	with_gallium_i915
@@ -65,12 +59,12 @@
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	17.0.4
+Version:	18.1.8
 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:	4a16cfc1c6d034cc17314b866eada628
+# Source0-md5:	d2d1de1e338e63877f753ab9d66ba597
 Patch0:		%{name}-link.patch
 URL:		http://www.mesa3d.org/
 BuildRequires:	autoconf >= 2.60
@@ -82,17 +76,18 @@ 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 >= 4.0}
+%{?with_radv:BuildRequires:	llvm-devel >= 4.0}
 %{?with_opencl:BuildRequires:	llvm-libclc}
 # for SHA1 (could use also libmd/libsha1/libgcrypt/openssl instead)
 BuildRequires:	nettle-devel
@@ -111,7 +106,8 @@ BuildRequires:	rpmbuild(macros) >= 1.470
 BuildRequires:	sed >= 4.0
 # wayland-{client,server}
 %{?with_wayland:BuildRequires:	wayland-devel >= 1.11.0}
-BuildRequires:	xorg-lib-libXdamage-devel
+%{?with_wayland:BuildRequires:	wayland-protocols >= 1.8}
+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
@@ -124,16 +120,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
@@ -189,7 +186,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
@@ -224,6 +221,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
@@ -262,7 +261,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}
@@ -349,6 +348,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.
@@ -395,6 +395,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
 
@@ -501,6 +502,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
@@ -516,6 +518,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
@@ -549,6 +552,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.
@@ -561,6 +565,7 @@ 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.
@@ -574,6 +579,7 @@ 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.
@@ -650,6 +656,7 @@ 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).
@@ -691,6 +698,7 @@ 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
@@ -709,6 +717,7 @@ 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
@@ -727,6 +736,7 @@ 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
@@ -752,6 +762,7 @@ 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 Gallium DRI driver for ATI R600/R700 card family (Radeon HD
@@ -776,6 +787,7 @@ 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 Gallium DRI driver for ATI Southern Islands card family (Radeon
@@ -797,6 +809,7 @@ 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.
@@ -812,6 +825,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.
@@ -826,6 +840,7 @@ 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
 
@@ -844,6 +859,7 @@ 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
 
@@ -859,22 +875,6 @@ Sterownik X.org DRI (nie Gallium) dla rodziny kart Intel i965 (946GZ,
 Sandybridge, Ivybridge, Haswell, Ray Trail, Broadwell, Cherrytrail,
 Braswell, Cherryview, Skylake, Broxton, Kabylake, Geminilake);
 
-%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-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.
-
 %package dri-driver-nouveau
 Summary:	X.org DRI driver for NVIDIA card family
 Summary(pl.UTF-8):	Sterownik X.org DRI dla rodziny kart NVIDIA
@@ -883,6 +883,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.
@@ -897,6 +898,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.
@@ -912,6 +914,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.
@@ -926,6 +929,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.
@@ -941,6 +945,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.
@@ -952,6 +957,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
 
@@ -963,25 +969,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
@@ -995,6 +987,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
 
@@ -1010,6 +1003,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
 
@@ -1026,6 +1020,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
@@ -1043,6 +1038,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
@@ -1060,6 +1056,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
 
@@ -1074,6 +1071,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
 
@@ -1090,6 +1088,7 @@ 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
@@ -1106,6 +1105,7 @@ 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).
@@ -1132,6 +1132,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
@@ -1149,6 +1150,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
@@ -1166,6 +1168,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
@@ -1183,6 +1186,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
 
@@ -1202,6 +1206,7 @@ Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	libxcb >= 1.8
 Requires:	libomxil-bellagio
+Requires:	zlib >= %{zlib_ver}
 Obsoletes:	omxil-mesa-nouveau
 Obsoletes:	omxil-mesa-r600
 Obsoletes:	omxil-mesa-radeonsi
@@ -1212,64 +1217,14 @@ 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:	zlib >= %{zlib_ver}
+Suggests:	vulkan(loader)
 Provides:	vulkan(icd) = 1.0.3
 
 %description vulkan-icd-intel
@@ -1296,6 +1251,7 @@ 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:	zlib >= %{zlib_ver}
 Suggests:	vulkan(loader)
 Provides:	vulkan(icd) = 1.0.3
 
@@ -1325,7 +1281,7 @@ dri_drivers=$(echo $dri_drivers | xargs | tr ' ' ',')
 
 gallium_drivers="svga swrast virgl \
 %ifarch %{ix86} %{x8664} x32
-swr ilo %{?with_gallium_i915:i915} \
+swr %{?with_gallium_i915:i915} \
 %endif
 %if %{with gallium_radeon}
 r300 r600 radeonsi \
@@ -1366,11 +1322,11 @@ vulkan_drivers=$(echo $vulkan_drivers | xargs | tr ' ' ',')
 	--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} \
@@ -1378,7 +1334,7 @@ vulkan_drivers=$(echo $vulkan_drivers | xargs | tr ' ' ',')
 	%{__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} \
@@ -1463,12 +1419,22 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -1707,10 +1673,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
@@ -1768,10 +1730,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)