X-Git-Url: http://git.pld-linux.org/?p=packages%2FMesa.git;a=blobdiff_plain;f=Mesa.spec;h=436448f329469a5f457f1bf3989af90f2b2c8871;hp=2a5141c06f72392d82064cdb2d6b638811ba16ff;hb=d3c2b28;hpb=86c1a065ee6a471e272ae7af04e382ebb583db96

diff --git a/Mesa.spec b/Mesa.spec
index 2a5141c..436448f 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1,23 +1,33 @@
 #
 # TODO:
-# - check if gallium_intel note is still valid, switch the bcond if not
+# - 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
-%bcond_with	gallium_intel	# gallium i915 driver (instead of plain dri; doesn't work with AIGLX)
+%bcond_with	gallium_i915	# gallium i915 Intel driver (instead of plain dri; doesn't work with AIGLX)
 %bcond_without	gallium_nouveau	# gallium nouveau driver
+%bcond_without	gallium_radeon	# gallium radeon drivers
 %bcond_without	egl		# EGL libraries
+%bcond_with	openvg		# OpenVG library [not building since 10.4, dropped in 10.6]
 %bcond_without	gbm		# Graphics Buffer Manager
+%bcond_without	nine		# Nine Direct3D 9+ state tracker (for Wine)
 %bcond_without	opencl		# OpenCL support
 %bcond_without	ocl_icd		# OpenCL as ICD (installable client driver)
+%bcond_with	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_with	hud_extra	# HUD block/NIC I/O HUD stats support
+%bcond_with	lm_sensors	# HUD lm_sensors support
+%bcond_with	texture_float	# floating-point textures and renderbuffers (SGI patent in US)
 %bcond_with	static_libs	# static libraries [not supported for DRI, thus broken currently]
 %bcond_with	tests		# tests
+%bcond_without	shared_llvm	# disable use of the shared LLVM libs
 #
 # glapi version (glapi tables in dri drivers and libglx must be in sync);
 # set to current Mesa version on ABI break, when xserver tables get regenerated
@@ -26,38 +36,61 @@
 # minimal supported xserver version
 %define		xserver_ver		1.5.0
 # other packages
-%define		libdrm_ver		2.4.54
+%define		libdrm_ver		2.4.71
 %define		dri2proto_ver		2.6
 %define		dri3proto_ver		1.0
 %define		glproto_ver		1.4.14
 %define		presentproto_ver	1.0
 
+%if %{without gallium}
+%undefine	with_gallium_i915
+%undefine	with_gallium_nouveau
+%undefine	with_gallium_radeon
+%undefine	with_nine
+%undefine	with_ocl_icd
+%undefine	with_omx
+%undefine	with_opencl
+%undefine	with_xa
+%endif
+
+%if %{without egl}
+%undefine	with_gbm
+%undefine	with_wayland
+%endif
+
+%define	rel	2
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	10.2.7
-Release:	1
+Version:	13.0.0
+Release:	2
 License:	MIT (core) and others - see license.html file
 Group:		X11/Libraries
-Source0:	ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
-# Source0-md5:	b54b793d5b60b9da31ba1f86a6f82bf8
+Source0:	ftp://ftp.freedesktop.org/pub/mesa/%{version}/mesa-%{version}.tar.xz
+# Source0-md5:	8c4ca7da1be2b8f9a877db09304335a4
 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:	gcc >= 5:3.3
+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}
 BuildRequires:	libselinux-devel
-BuildRequires:	libstdc++-devel >= 5:3.3.0
+BuildRequires:	libstdc++-devel >= 6:4.2.0
 BuildRequires:	libtalloc-devel >= 2:2.0.1
 BuildRequires:	libtool >= 2:2.2
-BuildRequires:	libvdpau-devel >= 0.4.1
+%{?with_va:BuildRequires:	libva-devel >= 1.6.0}
+%{?with_va:BuildRequires:	pkgconfig(libva) >= 0.38.0}
+BuildRequires:	libvdpau-devel >= 1.1
 BuildRequires:	libxcb-devel >= 1.10
-BuildRequires:	llvm-devel >= 3.3
+%{?with_gallium_radeon:BuildRequires:	llvm-devel >= 3.8}
 %{?with_opencl:BuildRequires:	llvm-libclc}
+# for SHA1 (could use also libmd/libsha1/libgcrypt/openssl instead)
+BuildRequires:	nettle-devel
 %{?with_ocl_icd:BuildRequires:	ocl-icd-devel}
 %{?with_omx:BuildRequires:	libomxil-bellagio-devel}
 BuildRequires:	perl-base
@@ -67,10 +100,10 @@ BuildRequires:	pkgconfig(talloc) >= 2.0.1
 BuildRequires:	pkgconfig(xcb-dri3)
 BuildRequires:	pkgconfig(xcb-present)
 BuildRequires:	python >= 2
+BuildRequires:	python-Mako >= 0.8.0
 BuildRequires:	python-modules >= 2
 BuildRequires:	rpmbuild(macros) >= 1.470
 BuildRequires:	sed >= 4.0
-%{?with_egl:BuildRequires:	udev-devel >= 1:151}
 # wayland-{client,server}
 %{?with_wayland:BuildRequires:	wayland-devel >= 1.2.0}
 BuildRequires:	xorg-lib-libXdamage-devel
@@ -85,26 +118,13 @@ BuildRequires:	xorg-proto-dri3proto-devel >= %{dri3proto_ver}
 BuildRequires:	xorg-proto-glproto-devel >= %{glproto_ver}
 BuildRequires:	xorg-proto-presentproto-devel >= %{presentproto_ver}
 BuildRequires:	xorg-util-makedepend
-BuildRequires:	xorg-xserver-server-devel >= %{xserver_ver}
 %if %{with gallium}
+%{?with_lm_sensors:BuildRequires:	lm_sensors-devel >= 3.4}
 BuildRequires:	xorg-proto-xextproto-devel >= 7.0.99.1
-BuildRequires:	xorg-xserver-server-devel >= 1.6.0
+BuildRequires:	xorg-xserver-server-devel >= %{xserver_ver}
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%if %{without gallium}
-%undefine	with_gallium_intel
-%undefine	with_gallium_nouveau
-%undefine	with_ocl_icd
-%undefine	with_opencl
-%undefine	with_xa
-%endif
-
-%if %{without egl}
-%undefine	with_gbm
-%undefine	with_wayland
-%endif
-
 # 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)
@@ -139,15 +159,10 @@ Requires:	OpenGL >= 1.2
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	libxcb >= 1.9
 %{?with_wayland:Requires:	wayland >= 1.2.0}
-%if %{with gallium}
-# for egl_gallium.so
-Requires:	%{name}-libOpenVG = %{version}-%{release}
-Requires:	udev-libs >= 1:151
-%endif
 %if %{with gbm}
 Requires:	%{name}-libgbm = %{version}-%{release}
 %endif
-Provides:	EGL = 1.4
+Provides:	EGL = 1.5
 
 %description libEGL
 This package contains shared libEGL - Mesa implementation of EGL
@@ -175,7 +190,7 @@ Requires:	xorg-lib-libXfixes-devel
 Requires:	xorg-lib-libXxf86vm-devel
 Requires:	xorg-proto-dri2proto-devel >= %{dri2proto_ver}
 Requires:	xorg-proto-glproto-devel >= %{glproto_ver}
-Provides:	EGL-devel = 1.4
+Provides:	EGL-devel = 1.5
 
 %description libEGL-devel
 Header files for Mesa implementation of EGL library.
@@ -189,7 +204,7 @@ Summary(pl.UTF-8):	Statyczna biblioteka Mesa EGL
 License:	MIT
 Group:		Development/Libraries
 Requires:	%{name}-libEGL-devel = %{version}-%{release}
-Provides:	EGL-static = 1.4
+Provides:	EGL-static = 1.5
 
 %description libEGL-static
 Static Mesa EGL library.
@@ -204,7 +219,7 @@ License:	MIT
 Group:		X11/Libraries
 Requires:	%{name}-libglapi = %{version}-%{release}
 Requires:	libdrm >= %{libdrm_ver}
-Provides:	OpenGL = 3.3
+Provides:	OpenGL = 4.5
 Provides:	OpenGL-GLX = 1.4
 Obsoletes:	Mesa
 Obsoletes:	Mesa-dri
@@ -249,7 +264,7 @@ Requires:	xorg-proto-dri2proto-devel >= %{dri2proto_ver}
 Requires:	xorg-proto-glproto-devel >= %{glproto_ver}
 Suggests:	OpenGL-doc-man
 Provides:	OpenGL-GLX-devel = 1.4
-Provides:	OpenGL-devel = 3.3
+Provides:	OpenGL-devel = 4.5
 Obsoletes:	Mesa-devel
 Obsoletes:	X11-OpenGL-devel < 1:7.0.0
 Obsoletes:	X11-OpenGL-devel-base < 1:7.0.0
@@ -268,7 +283,7 @@ 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 = 3.3
+Provides:	OpenGL-static = 4.5
 Obsoletes:	Mesa-static
 Obsoletes:	X11-OpenGL-static < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-static < 1:7.0.0
@@ -288,6 +303,7 @@ Requires:	%{name}-libglapi = %{version}-%{release}
 Provides:	OpenGLES
 Provides:	OpenGLESv1 = 1.1
 Provides:	OpenGLESv2 = 2.0
+Provides:	OpenGLESv3 = 3.1
 
 %description libGLES
 This package contains shared libraries of Mesa implementation of GLES
@@ -315,6 +331,7 @@ Requires:	%{name}-libGLES = %{version}-%{release}
 Provides:	OpenGLES-devel
 Provides:	OpenGLESv1-devel = 1.1
 Provides:	OpenGLESv2-devel = 2.0
+Provides:	OpenGLESv3-devel = 3.1
 
 %description libGLES-devel
 Header files for Mesa GLES libraries.
@@ -373,8 +390,8 @@ Group:		Libraries
 Requires:	filesystem >= 4.0-29
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	llvm-libclc
-Requires:	udev-libs >= 1:151
 Provides:	OpenCL = 1.1
+Provides:	ocl-icd-driver
 
 %description OpenCL-icd
 This package contains Mesa implementation of OpenCL - standard for
@@ -404,7 +421,6 @@ License:	MIT
 Group:		Libraries
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	llvm-libclc
-Requires:	udev-libs >= 1:151
 Provides:	OpenCL = 1.1
 
 %description libOpenCL
@@ -428,7 +444,7 @@ Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Mesa OpenCL
 License:	MIT
 Group:		Development/Libraries
 Requires:	%{name}-libOpenCL = %{version}-%{release}
-Provides:	OpenCL-devel = 1.1
+Provides:	OpenCL-devel = 1.2
 
 %description libOpenCL-devel
 Header files for Mesa OpenCL library.
@@ -505,12 +521,65 @@ R600/R700 chips.
 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
+
+%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
+
+%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.
+
+%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
+
+%description -n libva-driver-nouveau
+VA driver for NVidia adapters.
+
+%description -n libva-driver-nouveau -l pl.UTF-8
+Sterownik VA dla kart NVidia.
+
 %package libgbm
 Summary:	Mesa Graphics Buffer Manager library
 Summary(pl.UTF-8):	Biblioteka Mesa Graphics Buffer Manager
 Group:		Libraries
 Requires:	%{name}-libglapi = %{version}-%{release}
-Requires:	udev-libs >= 1:151
 Conflicts:	Mesa-libEGL < 8.0.1-2
 
 %description libgbm
@@ -524,7 +593,6 @@ Summary:	Header file for Mesa Graphics Buffer Manager library
 Summary(pl.UTF-8):	Plik nagłówkowy biblioteki Mesa Graphics Buffer Manager
 Group:		Development/Libraries
 Requires:	%{name}-libgbm = %{version}-%{release}
-Requires:	udev-devel >= 1:151
 
 %description libgbm-devel
 Header file for Mesa Graphics Buffer Manager library.
@@ -533,116 +601,6 @@ Header file for Mesa Graphics Buffer Manager library.
 Plik nagłówkowy biblioteki Mesa Graphics Buffer Manager (zarządcy
 bufora graficznego).
 
-%package gbm-driver-i915
-Summary:	i915 driver for Mesa GBM framework
-Summary(pl.UTF-8):	Sterownik i915 dla szkieletu Mesa GBM
-Group:		Libraries
-Requires:	%{name}-libgbm = %{version}-%{release}
-Obsoletes:	Mesa-opencl-driver-i915
-
-%description gbm-driver-i915
-i915 driver for Mesa Graphics Buffer Manager. It supports Intel
-915/945/G33/Q33/Q35/Pineview chips.
-
-%description gbm-driver-i915 -l pl.UTF-8
-Sterownik i915 dla szkieletu Mesa Graphics Buffer Manager (zarządcy
-bufora graficznego). Obsługuje układy Intela z serii
-915/945/G33/Q33/Q35/Pineview.
-
-%package gbm-driver-nouveau
-Summary:	nouveau driver for Mesa GBM framework
-Summary(pl.UTF-8):	Sterownik nouveau dla szkieletu Mesa GBM
-Group:		Libraries
-Requires:	%{name}-libgbm = %{version}-%{release}
-Obsoletes:	Mesa-opencl-driver-nouveau
-
-%description gbm-driver-nouveau
-nouveau driver for Mesa Graphics Buffer Manager. It supports NVidia
-adapters.
-
-%description gbm-driver-nouveau -l pl.UTF-8
-Sterownik nouveau dla szkieletu Mesa Graphics Buffer Manager (zarządcy
-bufora graficznego). Obsługuje karty graficzne firmy NVidia.
-
-%package gbm-driver-r300
-Summary:	r300 driver for Mesa GBM framework
-Summary(pl.UTF-8):	Sterownik r300 dla szkieletu Mesa GBM
-Group:		Libraries
-Requires:	%{name}-libgbm = %{version}-%{release}
-Obsoletes:	Mesa-opencl-driver-r300
-
-%description gbm-driver-r300
-r300 driver for Mesa Graphics Buffer Manager. It supports ATI Radeon
-adapters based on R300/R400/RS690/R500 chips.
-
-%description gbm-driver-r300 -l pl.UTF-8
-Sterownik r300 dla szkieletu Mesa Graphics Buffer Manager (zarządcy
-bufora graficznego). Obsługuje karty graficzne ATI Radeon oparte na
-układach R300/R400/RS690/R500.
-
-%package gbm-driver-r600
-Summary:	r600 driver for Mesa GBM framework
-Summary(pl.UTF-8):	Sterownik r600 dla szkieletu Mesa GBM
-Group:		Libraries
-Requires:	%{name}-libgbm = %{version}-%{release}
-Obsoletes:	Mesa-libllvmradeon
-Obsoletes:	Mesa-opencl-driver-r600
-
-%description gbm-driver-r600
-r600 driver for Mesa Graphics Buffer Manager. It supports ATI Radeon
-adapters based on R600/R700 chips.
-
-%description gbm-driver-r600 -l pl.UTF-8
-Sterownik r600 dla szkieletu Mesa Graphics Buffer Manager (zarządcy
-bufora graficznego). Obsługuje karty graficzne ATI Radeon oparte na
-układach R600/R700.
-
-%package gbm-driver-radeonsi
-Summary:	radeonsi driver for Mesa GBM framework
-Summary(pl.UTF-8):	Sterownik radeonsi dla szkieletu Mesa GBM
-Group:		Libraries
-Requires:	%{name}-libgbm = %{version}-%{release}
-Obsoletes:	Mesa-libllvmradeon
-Obsoletes:	Mesa-opencl-driver-radeonsi
-
-%description gbm-driver-radeonsi
-radeonsi driver for Mesa Graphics Buffer Manager. It supports ATI
-Radeon adapters based on Southern Islands chips.
-
-%description gbm-driver-radeonsi -l pl.UTF-8
-Sterownik radeonsi dla szkieletu Mesa Graphics Buffer Manager
-(zarządcy bufora graficznego). Obsługuje karty graficzne ATI Radeon
-oparte na układach Southern Islands.
-
-%package gbm-driver-swrast
-Summary:	Software (swrast) driver for Mesa GBM framework
-Summary(pl.UTF-8):	Sterownik programowy (swrast) dla szkieletu Mesa GBM
-Group:		Libraries
-Requires:	%{name}-libgbm = %{version}-%{release}
-Obsoletes:	Mesa-opencl-driver-swrast
-
-%description gbm-driver-swrast
-Software (swrast) driver for Mesa Graphics Buffer Manager.
-
-%description gbm-driver-swrast -l pl.UTF-8
-Sterownik programowy (swrast) dla szkieletu Mesa Graphics Buffer
-Manager (zarządcy bufora graficznego).
-
-%package gbm-driver-vmwgfx
-Summary:	vmwgfx driver for Mesa GBM framework
-Summary(pl.UTF-8):	Sterownik vmwgfx dla szkieletu Mesa GBM
-Group:		Libraries
-Requires:	%{name}-libgbm = %{version}-%{release}
-Obsoletes:	Mesa-opencl-driver-vmwgfx
-
-%description gbm-driver-vmwgfx
-vmwgfx driver for Mesa Graphics Buffer Manager. It supports VMware
-virtual video adapter.
-
-%description gbm-driver-vmwgfx -l pl.UTF-8
-Sterownik vmwgfx dla szkieletu Mesa Graphics Buffer Manager (zarządcy
-bufora graficznego). Obsługuje wirtualną kartę graficzną VMware.
-
 %package libglapi
 Summary:	Mesa GL API shared library
 Summary(pl.UTF-8):	Biblioteka współdzielona Mesa GL API
@@ -799,12 +757,26 @@ X.org DRI driver for ATI Southern Islands card family.
 %description dri-driver-ati-radeon-SI -l pl.UTF-8
 Sterownik X.org DRI dla rodziny kart ATI Southern Islands.
 
+%package dri-driver-freedreno
+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
+Requires:	xorg-driver-video-freedreno
+Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
+Requires:	xorg-xserver-server >= %{xserver_ver}
+
+%description dri-driver-freedreno
+X.org DRI driver for Adreno chips.
+
+%description dri-driver-freedreno -l pl.UTF-8
+Sterownik X.org DRI dla układów Adreno.
+
 %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
-Requires:	xorg-driver-video-intel
 Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_ver}
 Obsoletes:	Mesa-dri-driver-intel-i830
@@ -823,7 +795,6 @@ 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-driver-video-intel
 Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_ver}
 Obsoletes:	Mesa-dri-driver-intel-i830
@@ -837,6 +808,23 @@ X.org DRI driver for Intel i965 card family (946GZ, 965G, 965Q, 965GM,
 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.
+
 %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
@@ -866,6 +854,35 @@ X.org DRI software rasterizer driver.
 %description dri-driver-swrast -l pl.UTF-8
 Sterownik X.org DRI obsługujący rysowanie programowe.
 
+%package dri-driver-vc4
+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
+Requires:	xorg-driver-video-modesetting
+Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
+Requires:	xorg-xserver-server >= %{xserver_ver}
+
+%description dri-driver-vc4
+X.org DRI driver for Broadcom VC4 chips.
+
+%description dri-driver-vc4 -l pl.UTF-8
+Sterownik X.org DRI dla układów Broadcom VC4.
+
+%package dri-driver-virgl
+Summary:	X.org DRI driver for QEMU VirGL
+Summary(pl.UTF-8):	Sterownik X.org DRI dla QEMU VirGL
+License:	MIT
+Group:		X11/Libraries
+Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
+Requires:	xorg-xserver-server >= %{xserver_ver}
+
+%description dri-driver-virgl
+X.org DRI driver for QEMU VirGL.
+
+%description dri-driver-virgl -l pl.UTF-8
+Sterownik X.org DRI dla QEMU VirGL.
+
 %package dri-driver-vmwgfx
 Summary:	X.org DRI driver for VMware
 Summary(pl.UTF-8):	Sterownik X.org DRI dla VMware
@@ -881,13 +898,174 @@ X.org DRI driver for VMWare.
 %description dri-driver-vmwgfx -l pl.UTF-8
 Sterownik X.org DRI dla VMware.
 
+%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
+Obsoletes:	Mesa-gbm-driver-i915
+Obsoletes:	Mesa-opencl-driver-i915
+
+%description pipe-driver-i915
+i915 driver for Mesa Gallium dynamic pipe loader. It supports Intel
+915/945/G33/Q33/Q35/Pineview chips.
+
+%description pipe-driver-i915 -l pl.UTF-8
+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
+
+%description pipe-driver-msm
+msm (freedreno) driver for Mesa Gallium dynamic pipe loader. It
+supports Adreno chips.
+
+%description pipe-driver-msm -l pl.UTF-8
+Sterownik msm (freedreno) dla dynamicznego systemu potoków szkieletu
+Mesa Gallium. Obsługuje układy Adreno.
+
+%package pipe-driver-nouveau
+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
+Obsoletes:	Mesa-gbm-driver-nouveau
+Obsoletes:	Mesa-opencl-driver-nouveau
+
+%description pipe-driver-nouveau
+nouveau driver for Mesa Gallium dynamic pipe loader. It supports
+NVidia adapters.
+
+%description pipe-driver-nouveau -l pl.UTF-8
+Sterownik nouveau dla dynamicznego systemu potoków szkieletu Mesa
+Gallium. Obsługuje karty graficzne firmy NVidia.
+
+%package pipe-driver-r300
+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
+Obsoletes:	Mesa-gbm-driver-r300
+Obsoletes:	Mesa-opencl-driver-r300
+
+%description pipe-driver-r300
+r300 driver for Mesa Gallium dynamic pipe loader. It supports ATI
+Radeon adapters based on R300/R400/RS690/R500 chips.
+
+%description pipe-driver-r300 -l pl.UTF-8
+Sterownik r300 dla dynamicznego systemu potoków szkieletu Mesa
+Gallium. Obsługuje karty graficzne ATI Radeon oparte na układach
+R300/R400/RS690/R500.
+
+%package pipe-driver-r600
+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
+Obsoletes:	Mesa-gbm-driver-r600
+Obsoletes:	Mesa-libllvmradeon
+Obsoletes:	Mesa-opencl-driver-r600
+
+%description pipe-driver-r600
+r600 driver for Mesa Gallium dynamic pipe loader. It supports ATI
+Radeon adapters based on R600/R700 chips.
+
+%description pipe-driver-r600 -l pl.UTF-8
+Sterownik r600 dla dynamicznego systemu potoków szkieletu Mesa
+Gallium. Obsługuje karty graficzne ATI Radeon oparte na układach
+R600/R700.
+
+%package pipe-driver-radeonsi
+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
+Obsoletes:	Mesa-gbm-driver-radeonsi
+Obsoletes:	Mesa-libllvmradeon
+Obsoletes:	Mesa-opencl-driver-radeonsi
+
+%description pipe-driver-radeonsi
+radeonsi driver for Mesa Gallium dynamic pipe loader. It supports ATI
+Radeon adapters based on Southern Islands chips.
+
+%description pipe-driver-radeonsi -l pl.UTF-8
+Sterownik radeonsi dla dynamicznego systemu potoków szkieletu Mesa
+Gallium. Obsługuje karty graficzne ATI Radeon oparte na układach
+Southern Islands.
+
+%package pipe-driver-swrast
+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
+Obsoletes:	Mesa-gbm-driver-swrast
+Obsoletes:	Mesa-opencl-driver-swrast
+
+%description pipe-driver-swrast
+Software (swrast) driver for Mesa Gallium dynamic pipe loader.
+
+%description pipe-driver-swrast -l pl.UTF-8
+Sterownik programowy (swrast) dla dynamicznego systemu potoków
+szkieletu Mesa Gallium.
+
+%package pipe-driver-vmwgfx
+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
+Obsoletes:	Mesa-gbm-driver-vmwgfx
+Obsoletes:	Mesa-opencl-driver-vmwgfx
+
+%description pipe-driver-vmwgfx
+vmwgfx driver for Mesa Gallium dynamic pipe loader. It supports VMware
+virtual video adapter.
+
+%description pipe-driver-vmwgfx -l pl.UTF-8
+Sterownik vmwgfx dla dynamicznego systemu potoków szkieletu Mesa
+Gallium. Obsługuje wirtualną kartę graficzną VMware.
+
+%package d3d
+Summary:	Nine Direct3D9 driver (for Wine)
+Summary(pl.UTF-8):	Sterownik Direct3D9 Nine (dla Wine)
+Group:		Libraries
+Requires:	libdrm >= %{libdrm_ver}
+
+%description d3d
+Nine Direct3D9 driver (for Wine).
+
+%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 -n libvdpau-driver-mesa-nouveau
 Summary:	Mesa nouveau driver for the vdpau API
 Summary(pl.UTF-8):	Sterownik Mesa nouveau dla API vdpau
 License:	MIT
 Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
-Requires:	libvdpau >= 0.4.1
+Requires:	libvdpau >= 1.1
 Conflicts:	libvdpau-driver-mesa
 
 %description -n libvdpau-driver-mesa-nouveau
@@ -898,13 +1076,30 @@ Mesa nouveau driver for the vdpau API. It supports NVidia adapters
 Sterownik Mesa nouveau dla API vdpau. Obsługuje karty NVidia
 (NV40-NV96, NVa0).
 
+%package -n libvdpau-driver-mesa-r300
+Summary:	Mesa r300 driver for the vdpau API
+Summary(pl.UTF-8):	Sterownik Mesa r300 dla API vdpau
+License:	MIT
+Group:		X11/Libraries
+Requires:	libdrm >= %{libdrm_ver}
+Requires:	libvdpau >= 1.1
+Conflicts:	libvdpau-driver-mesa
+
+%description -n libvdpau-driver-mesa-r300
+Mesa r300 driver for the vdpau API. It supports ATI Radeon adapters
+based on R300 chips.
+
+%description -n libvdpau-driver-mesa-r300 -l pl.UTF-8
+Sterownik Mesa r300 dla API vdpau. Obsługuje karty ATI Radeon oparte
+na układach R300.
+
 %package -n libvdpau-driver-mesa-r600
 Summary:	Mesa r600 driver for the vdpau API
 Summary(pl.UTF-8):	Sterownik Mesa r600 dla API vdpau
 License:	MIT
 Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
-Requires:	libvdpau >= 0.4.1
+Requires:	libvdpau >= 1.1
 Conflicts:	libvdpau-driver-mesa
 
 %description -n libvdpau-driver-mesa-r600
@@ -921,7 +1116,7 @@ Summary(pl.UTF-8):	Sterownik Mesa radeonsi dla API vdpau
 License:	MIT
 Group:		X11/Libraries
 Requires:	libdrm >= %{libdrm_ver}
-Requires:	libvdpau >= 0.4.1
+Requires:	libvdpau >= 1.1
 Conflicts:	libvdpau-driver-mesa
 Obsoletes:	Mesa-libllvmradeon
 
@@ -933,6 +1128,24 @@ 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 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.8
+Requires:	libomxil-bellagio
+Obsoletes:	omxil-mesa-nouveau
+Obsoletes:	omxil-mesa-r600
+Obsoletes:	omxil-mesa-radeonsi
+
+%description -n omxil-mesa
+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
@@ -984,8 +1197,36 @@ Radeon adapters based on Southern Islands chips.
 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}
+Provides:	vulkan(icd) = 1.0.3
+
+%description vulkan-icd-intel
+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.
+
 %prep
-%setup -q
+%setup -q -n mesa-%{version}
 
 %build
 %{__libtoolize}
@@ -994,7 +1235,7 @@ ATI Radeon oparte na układach Southern Islands.
 %{__automake}
 
 dri_drivers="r200 radeon \
-%if %{without gallium_intel}
+%if %{without gallium_i915}
 i915 \
 %endif
 i965 \
@@ -1007,28 +1248,40 @@ swrast"
 dri_drivers=$(echo $dri_drivers | xargs | tr ' ' ',')
 
 gallium_drivers="svga swrast \
-%if %{with gallium_intel}
+%if %{with gallium_i915}
 i915 \
 %endif
+%if %{with gallium_radeon}
 r300 \
 r600 \
 radeonsi \
+%endif
 %if %{with gallium_nouveau}
 nouveau
 %endif
+ilo \
+virgl \
+%ifarch %{arm}
+freedreno \
+vc4 \
+%endif
 "
 
 gallium_drivers=$(echo $gallium_drivers | xargs | tr ' ' ',')
 
+vulkan_drivers="intel"
+
 %configure \
 	--disable-silent-rules \
-	--enable-shared \
-	--enable-glx-tls \
-	--enable-selinux \
-	%{?with_static_libs:--enable-static} \
 	%{__enable gbm} \
+	--enable-glx-tls \
+	%{?with_glvnd:--enable-libglvnd} \
 	--enable-osmesa \
+	--enable-selinux \
+	--enable-shared \
 	--enable-shared-glapi \
+	%{?with_static_libs:--enable-static} \
+	%{?with_texture_float:--enable-texture-float} \
 %if %{with egl}
 	--enable-egl \
 	--enable-gles1 \
@@ -1036,13 +1289,14 @@ gallium_drivers=$(echo $gallium_drivers | xargs | tr ' ' ',')
 	--with-egl-platforms=x11%{?with_gbm:,drm}%{?with_wayland:,wayland} \
 %endif
 %if %{with gallium}
+	%{?with_hud_extra:--enable-gallium-extra-hud} \
 	--enable-gallium-llvm \
-	--enable-llvm-shared-libs \
-	%{__enable egl gallium-egl} \
-	%{__enable gbm gallium-gbm} \
+	%{__enable_disable shared_llvm llvm-shared-libs} \
 	%{__enable ocl_icd opencl-icd} \
-	%{__enable opencl opencl} \
-	%{?with_egl:--enable-openvg} \
+	%{?with_lm_sensors:--enable-lmsensors} \
+	%{?with_nine:--enable-nine} \
+	%{__enable opencl} \
+	%{__enable va} \
 	--enable-vdpau \
 	%{?with_omx:--enable-omx} \
 	%{?with_xa:--enable-xa} \
@@ -1052,7 +1306,11 @@ gallium_drivers=$(echo $gallium_drivers | xargs | tr ' ' ',')
 	--without-gallium-drivers \
 %endif
 	--with-dri-drivers=${dri_drivers} \
-	--with-dri-driverdir=%{_libdir}/xorg/modules/dri
+	--with-dri-driverdir=%{_libdir}/xorg/modules/dri \
+	--with-vulkan-drivers=${vulkan_drivers} \
+	--with-vulkan-icddir=/usr/share/vulkan/icd.d \
+	--with-sha1=libnettle \
+	--with-va-libdir=%{_libdir}/libva/dri
 
 %{__make}
 
@@ -1064,25 +1322,28 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# strip out undesirable headers
-%{__rm} $RPM_BUILD_ROOT%{_includedir}/GL/{wglext,wmesa}.h
 # dlopened by soname
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libXvMC*.so
+%{?with_gallium:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libXvMC*.so}
+%{?with_gallium:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libXvMC*.so.1.0}
+# dlopened by soname or .so link
+%{?with_gallium:%{__rm} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_*.so.1.0}
 # not used externally
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libglapi.so
 # dlopened
 %{?with_omx:%{__rm} $RPM_BUILD_ROOT%{_libdir}/bellagio/libomx_*.la}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/egl/egl_*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gallium-pipe/pipe_*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gbm/gbm_*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/vdpau/libvdpau_*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/dri/*.la
+%{?with_nine:%{__rm} $RPM_BUILD_ROOT%{_libdir}/d3d/d3dadapter9.la}
+%{?with_gallium:%{__rm} $RPM_BUILD_ROOT%{_libdir}/gallium-pipe/pipe_*.la}
 # 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
 strip -R .note.ABI-tag $RPM_BUILD_ROOT%{_libdir}/libGL.so.*.*
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1127,10 +1388,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libEGL.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libEGL.so.1
-%if %{with gallium}
-%dir %{_libdir}/egl
-%attr(755,root,root) %{_libdir}/egl/egl_gallium.so
-%endif
 
 %files libEGL-devel
 %defattr(644,root,root,755)
@@ -1138,6 +1395,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/EGL
 %{_includedir}/EGL/egl.h
 %{_includedir}/EGL/eglext.h
+%{_includedir}/EGL/eglextchromium.h
 %{_includedir}/EGL/eglmesaext.h
 %{_includedir}/EGL/eglplatform.h
 %{_pkgconfigdir}/egl.pc
@@ -1151,12 +1409,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libGL
 %defattr(644,root,root,755)
-%doc docs/{*.html,README.UVD,relnotes/*.html}
+%doc docs/{*.html,README.UVD,patents.txt,relnotes/*.html}
+%if %{with glvnd}
+%attr(755,root,root) %{_libdir}/libGLX_mesa.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libGLX_mesa.so.0
+%attr(755,root,root) %{_libdir}/libGLX_mesa.so
+%else
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libGL.so.1
 # symlink for binary apps which fail to conform Linux OpenGL ABI
 # (and dlopen libGL.so instead of libGL.so.1; the same does Mesa libEGL)
 %attr(755,root,root) %{_libdir}/libGL.so
+%endif
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/drirc
 
 %files libGL-devel
@@ -1164,6 +1428,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/specs/*
 %dir %{_includedir}/GL
 %{_includedir}/GL/gl.h
+%{_includedir}/GL/glcorearb.h
 %{_includedir}/GL/glext.h
 %{_includedir}/GL/gl_mangle.h
 %{_includedir}/GL/glx.h
@@ -1222,11 +1487,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libMesaOpenCL.so
 %attr(755,root,root) %{_libdir}/libMesaOpenCL.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libMesaOpenCL.so.1
+# currently only OpenCL uses dynamic pipe loader
+%dir %{_libdir}/gallium-pipe
 %else
 %files libOpenCL
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libOpenCL.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libOpenCL.so.1
+# currently only OpenCL uses dynamic pipe loader
+%dir %{_libdir}/gallium-pipe
 
 %files libOpenCL-devel
 %defattr(644,root,root,755)
@@ -1235,7 +1504,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
-%if %{with egl} && %{with gallium}
+%if %{with egl} && %{with openvg} && %{with gallium}
 %files libOpenVG
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libOpenVG.so.*.*.*
@@ -1256,62 +1525,46 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libXvMCnouveau.so.1
 %endif
 
+%if %{with gallium_radeon}
 %files libXvMC-r600
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libXvMCr600.so.1.0.0
 %attr(755,root,root) %ghost %{_libdir}/libXvMCr600.so.1
 %endif
 
-%if %{with gbm}
-%files libgbm
+%if %{with va}
+%files -n libva-driver-gallium
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgbm.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgbm.so.1
-%if %{with gallium}
-%dir %{_libdir}/gbm
-%dir %{_libdir}/gallium-pipe
-%attr(755,root,root) %{_libdir}/gbm/gbm_gallium_drm.so
-%endif
 
-%files libgbm-devel
+%if %{with gallium_radeon}
+%files -n libva-driver-r600
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libgbm.so
-%{_includedir}/gbm.h
-%{_pkgconfigdir}/gbm.pc
-%endif
+%attr(755,root,root) %{_libdir}/libva/dri/r600_drv_video.so
 
-%if %{with gallium}
-%if %{with gallium_intel}
-%files gbm-driver-i915
+%files -n libva-driver-radeonsi
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_i915.so
+%attr(755,root,root) %{_libdir}/libva/dri/radeonsi_drv_video.so
 %endif
 
 %if %{with gallium_nouveau}
-%files gbm-driver-nouveau
+%files -n libva-driver-nouveau
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_nouveau.so
+%attr(755,root,root) %{_libdir}/libva/dri/nouveau_drv_video.so
+%endif
+%endif
 %endif
 
-%files gbm-driver-r300
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_r300.so
-
-%files gbm-driver-r600
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_r600.so
-
-%files gbm-driver-radeonsi
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_radeonsi.so
-
-%files gbm-driver-swrast
+%if %{with gbm}
+%files libgbm
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_swrast.so
+%attr(755,root,root) %{_libdir}/libgbm.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgbm.so.1
 
-%files gbm-driver-vmwgfx
+%files libgbm-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_vmwgfx.so
+%attr(755,root,root) %{_libdir}/libgbm.so
+%{_includedir}/gbm.h
+%{_pkgconfigdir}/gbm.pc
 %endif
 
 %files libglapi
@@ -1364,6 +1617,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/r200_dri.so
 
 %if %{with gallium}
+%if %{with gallium_radeon}
 %files dri-driver-ati-radeon-R300
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/r300_dri.so
@@ -1371,11 +1625,16 @@ rm -rf $RPM_BUILD_ROOT
 %files dri-driver-ati-radeon-R600
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/r600_dri.so
-%endif
 
 %files dri-driver-ati-radeon-SI
 %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
 %defattr(644,root,root,755)
@@ -1394,14 +1653,85 @@ rm -rf $RPM_BUILD_ROOT
 
 %files dri-driver-swrast
 %defattr(644,root,root,755)
+%if %{with gallium}
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/kms_swrast_dri.so
+%endif
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/swrast_dri.so
 
 %if %{with gallium}
+%ifarch %{arm}
+%files dri-driver-vc4
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/vc4_dri.so
+%endif
+
+%files dri-driver-virgl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/virtio_gpu_dri.so
+
 %files dri-driver-vmwgfx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/vmwgfx_dri.so
 %endif
 
+%if %{with gallium}
+%if %{with gallium_i915}
+%files pipe-driver-i915
+%defattr(644,root,root,755)
+%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)
+%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_msm.so
+%endif
+
+%if %{with gallium_nouveau}
+%files pipe-driver-nouveau
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_nouveau.so
+%endif
+
+%if %{with gallium_radeon}
+%files pipe-driver-r300
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_r300.so
+
+%files pipe-driver-r600
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_r600.so
+
+%files pipe-driver-radeonsi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_radeonsi.so
+%endif
+
+%files pipe-driver-swrast
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_swrast.so
+
+%files pipe-driver-vmwgfx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/gallium-pipe/pipe_vmwgfx.so
+%endif
+
+%if %{with nine}
+%files d3d
+%defattr(644,root,root,755)
+%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
+
 %if %{with gallium}
 # ldconfig is not used in vdpau tree, so package all symlinks
 %if %{with gallium_nouveau}
@@ -1412,6 +1742,13 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_nouveau.so
 %endif
 
+%if %{with gallium_radeon}
+%files -n libvdpau-driver-mesa-r300
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/vdpau/libvdpau_r300.so.1.0.0
+%attr(755,root,root) %{_libdir}/vdpau/libvdpau_r300.so.1
+%attr(755,root,root) %{_libdir}/vdpau/libvdpau_r300.so
+
 %files -n libvdpau-driver-mesa-r600
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/vdpau/libvdpau_r600.so.1.0.0
@@ -1424,19 +1761,19 @@ 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
+%endif
 
 %if %{with gallium} && %{with omx}
-%if %{with gallium_nouveau}
-%files -n omxil-mesa-nouveau
+%files -n omxil-mesa
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/bellagio/libomx_nouveau.so
+%attr(755,root,root) %{_libdir}/bellagio/libomx_mesa.so
 %endif
 
-%files -n omxil-mesa-r600
+%files vulkan-icd-intel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/bellagio/libomx_r600.so
+%attr(755,root,root) %{_libdir}/libvulkan_intel.so
+%{_datadir}/vulkan/icd.d/intel_icd.*.json
 
-%files -n omxil-mesa-radeonsi
+%files vulkan-icd-intel-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/bellagio/libomx_radeonsi.so
-%endif
+%{_includedir}/vulkan/vulkan_intel.h