X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=Mesa.spec;h=2384a2462f1fcc44c35008459aa22ac018ed94cd;hb=9ea66b5e1e7c1451cada7f6c8ef47145d8d2c021;hp=36d0245b2dddb3c146443f760b2f790f994e3a2a;hpb=175718fb30a3e113a27a158cdac32ab5643c6400;p=packages%2FMesa.git

diff --git a/Mesa.spec b/Mesa.spec
index 36d0245..2384a24 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -11,18 +11,23 @@
 %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 builind since 10.4, dropped in 10.6]
+%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
+%bcond_without	radv		# disable build of the radeon Vulkan driver
 #
 # 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
@@ -31,7 +36,11 @@
 # minimal supported xserver version
 %define		xserver_ver		1.5.0
 # other packages
-%define		libdrm_ver		2.4.66
+%ifarch %{arm}
+%define		libdrm_ver		2.4.74
+%else
+%define		libdrm_ver		2.4.71
+%endif
 %define		dri2proto_ver		2.6
 %define		dri3proto_ver		1.0
 %define		glproto_ver		1.4.14
@@ -53,30 +62,27 @@
 %undefine	with_wayland
 %endif
 
-%define snap	20160418
-%define	rel	1
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	11.3.0
-Release:	0.s%{snap}.%{rel}
+Version:	17.0.2
+Release:	1
 License:	MIT (core) and others - see license.html file
 Group:		X11/Libraries
-# git archive --format=tar --prefix=Mesa-s20160418/ master | xz > ../Mesa-s20160418.tar.xz
-Source0:	Mesa-s%{snap}.tar.xz
-# Source0-md5:	9837de67444fdf54ab837788ef342076
-Patch0:		missing-type.patch
-Patch1:		keep_git_sha.patch
-Patch2:		vulkan_icd-DESTDIR.patch
+Source0:	ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz
+# Source0-md5:	8f808e92b893d412fbd6510e1d16f5c5
+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}
 BuildRequires:	libselinux-devel
 BuildRequires:	libstdc++-devel >= 6:4.2.0
 BuildRequires:	libtalloc-devel >= 2:2.0.1
@@ -85,7 +91,8 @@ BuildRequires:	libtool >= 2:2.2
 %{?with_va:BuildRequires:	pkgconfig(libva) >= 0.38.0}
 BuildRequires:	libvdpau-devel >= 1.1
 BuildRequires:	libxcb-devel >= 1.10
-%{?with_gallium_radeon:BuildRequires:	llvm-devel >= 3.6}
+%{?with_gallium_radeon:BuildRequires:	llvm-devel >= 3.8}
+%{?with_radv:BuildRequires:	llvm-devel >= 3.9}
 %{?with_opencl:BuildRequires:	llvm-libclc}
 # for SHA1 (could use also libmd/libsha1/libgcrypt/openssl instead)
 BuildRequires:	nettle-devel
@@ -98,13 +105,12 @@ BuildRequires:	pkgconfig(talloc) >= 2.0.1
 BuildRequires:	pkgconfig(xcb-dri3)
 BuildRequires:	pkgconfig(xcb-present)
 BuildRequires:	python >= 2
-BuildRequires:	python-Mako >= 0.3.4
+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}
+%{?with_wayland:BuildRequires:	wayland-devel >= 1.11.0}
 BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXext-devel >= 1.0.5
 BuildRequires:	xorg-lib-libXfixes-devel
@@ -118,6 +124,7 @@ 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}
 BuildRequires:	xorg-proto-xextproto-devel >= 7.0.99.1
 BuildRequires:	xorg-xserver-server-devel >= %{xserver_ver}
 %endif
@@ -156,10 +163,7 @@ Requires:	%{name}-libglapi = %{version}-%{release}
 Requires:	OpenGL >= 1.2
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	libxcb >= 1.9
-%{?with_wayland:Requires:	wayland >= 1.2.0}
-%if %{with gallium}
-Requires:	udev-libs >= 1:151
-%endif
+%{?with_wayland:Requires:	wayland >= 1.11.0}
 %if %{with gbm}
 Requires:	%{name}-libgbm = %{version}-%{release}
 %endif
@@ -220,7 +224,7 @@ License:	MIT
 Group:		X11/Libraries
 Requires:	%{name}-libglapi = %{version}-%{release}
 Requires:	libdrm >= %{libdrm_ver}
-Provides:	OpenGL = 4.1
+Provides:	OpenGL = 4.5
 Provides:	OpenGL-GLX = 1.4
 Obsoletes:	Mesa
 Obsoletes:	Mesa-dri
@@ -236,7 +240,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 +250,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
@@ -265,7 +269,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 = 4.1
+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
@@ -284,7 +288,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 = 4.1
+Provides:	OpenGL-static = 4.5
 Obsoletes:	Mesa-static
 Obsoletes:	X11-OpenGL-static < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-static < 1:7.0.0
@@ -304,7 +308,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 +336,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.
@@ -391,7 +395,6 @@ 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
 
@@ -423,7 +426,6 @@ License:	MIT
 Group:		Libraries
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	llvm-libclc
-Requires:	udev-libs >= 1:151
 Provides:	OpenCL = 1.1
 
 %description libOpenCL
@@ -526,22 +528,64 @@ R600/R700.
 
 %package -n libva-driver-gallium
 Summary:	VA driver for Gallium State Tracker
-Summary(pl.UTF-8):	Sterownik VA do Gallium
+Summary(pl.UTF-8):	Sterowniki VA do Gallium
 Group:		Libraries
-Requires:	libva >= 1.3.0
+%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 driver for Gallium State Tracker.
+VA drivers for Gallium State Tracker (r600, radeonsi & nouveau).
 
 %description -n libva-driver-gallium -l pl.UTF-8
-Sterownik VA do Gallium.
+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
@@ -555,7 +599,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.
@@ -651,10 +694,12 @@ Requires:	xorg-xserver-server >= %{xserver_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
@@ -667,10 +712,12 @@ Requires:	xorg-xserver-server >= %{xserver_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
@@ -683,10 +730,18 @@ Requires:	xorg-xserver-server >= %{xserver_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
@@ -699,10 +754,18 @@ Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_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
@@ -715,10 +778,31 @@ Requires:	xorg-xserver-libglx(glapi) = %{glapi_ver}
 Requires:	xorg-xserver-server >= %{xserver_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}
+
+%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
@@ -740,45 +824,46 @@ 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
 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
 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
 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).
+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-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}
 
@@ -1000,6 +1085,22 @@ 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)
+
+%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)
@@ -1164,7 +1265,7 @@ 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 Intel
+Summary(pl.UTF-8):	Sterownik Vulkan dla GPU firmy Intel
 License:	MIT
 Group:		Libraries
 Suggests:	vulkan(loader)
@@ -1179,7 +1280,7 @@ 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 Intel
+Summary(pl.UTF-8):	Pliki nagłówkowe sterownika Vulkan dla GPU Intela
 License:	MIT
 Group:		Development/Libraries
 Requires:	%{name}-vulkan-icd-intel = %{version}-%{release}
@@ -1190,11 +1291,23 @@ eader files for Mesa Intel GPU Vulkan driver.
 %description vulkan-icd-intel-devel -l pl.UTF-8
 Pliki nagłówkowe sterownika Vulkan dla GPU Intel.
 
+%package vulkan-icd-radeon
+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
+Suggests:	vulkan(loader)
+Provides:	vulkan(icd) = 1.0.3
+
+%description vulkan-icd-radeon
+radv - experimental Mesa Vulkan driver for AMD Radeon GPUs.
+
+%description vulkan-icd-radeon -l pl.UTF-8
+radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD.
+
 %prep
-%setup -q -n Mesa-s%{snap}
+%setup -q -n mesa-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -1202,47 +1315,47 @@ Pliki nagłówkowe sterownika Vulkan dla GPU Intel.
 %{__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 %{ix86} %{x8664} x32
+swr ilo %{?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
+%ifarch %{arm}
+etnaviv \
 freedreno \
+imx \
 vc4 \
 %endif
 "
 
 gallium_drivers=$(echo $gallium_drivers | xargs | tr ' ' ',')
 
-vulkan_drivers="intel"
+vulkan_drivers="%{?with_radv:radeon} \
+%ifarch %{ix86} %{x8664} x32
+intel \
+%endif
+"
+
+vulkan_drivers=$(echo $vulkan_drivers | xargs | tr ' ' ',')
 
 %configure \
 	--disable-silent-rules \
 	%{__enable gbm} \
 	--enable-glx-tls \
+	%{?with_glvnd:--enable-libglvnd} \
 	--enable-osmesa \
 	--enable-selinux \
 	--enable-shared \
@@ -1256,11 +1369,11 @@ vulkan_drivers="intel"
 	--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} \
+	%{?with_lm_sensors:--enable-lmsensors} \
 	%{?with_nine:--enable-nine} \
 	%{__enable opencl} \
 	%{__enable va} \
@@ -1279,8 +1392,6 @@ vulkan_drivers="intel"
 	--with-sha1=libnettle \
 	--with-va-libdir=%{_libdir}/libva/dri
 
-echo "#define MESA_GIT_SHA1 \"$(xzcat %{SOURCE0}|git get-tar-commit-id|cut -c-7)\"" > src/mesa/main/git_sha1.h
-
 %{__make}
 
 %{?with_tests:%{__make} check}
@@ -1291,8 +1402,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# strip out undesirable headers
-%{__rm} $RPM_BUILD_ROOT%{_includedir}/GL/wglext.h
 # dlopened by soname
 %{?with_gallium:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libXvMC*.so}
 %{?with_gallium:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libXvMC*.so.1.0}
@@ -1306,16 +1415,12 @@ rm -rf $RPM_BUILD_ROOT
 %{?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
-%if %{with va}
-%{?with_gallium:%{__rm} $RPM_BUILD_ROOT%{_libdir}/libva/dri/gallium_drv_video.la}
-%endif
-
-# 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
@@ -1382,11 +1487,17 @@ rm -rf $RPM_BUILD_ROOT
 %files libGL
 %defattr(644,root,root,755)
 %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
@@ -1501,7 +1612,22 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with va}
 %files -n libva-driver-gallium
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libva/dri/gallium_drv_video.so
+
+%if %{with gallium_radeon}
+%files -n libva-driver-r600
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libva/dri/r600_drv_video.so
+
+%files -n libva-driver-radeonsi
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libva/dri/radeonsi_drv_video.so
+%endif
+
+%if %{with gallium_nouveau}
+%files -n libva-driver-nouveau
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libva/dri/nouveau_drv_video.so
+%endif
 %endif
 %endif
 
@@ -1610,7 +1736,17 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/swrast_dri.so
 
 %if %{with gallium}
-%ifarch arm
+%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
@@ -1636,7 +1772,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gallium-pipe/pipe_i965.so
 
-%ifarch arm
+%ifarch %{arm}
 %files pipe-driver-msm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/gallium-pipe/pipe_msm.so
@@ -1669,6 +1805,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 %{ix86} %{x8664} x32
+%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}
@@ -1722,9 +1865,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %files vulkan-icd-intel
 %defattr(644,root,root,755)
-%{_libdir}/libvulkan_intel.so
-%{_datadir}/vulkan/icd.d/*.json
+%attr(755,root,root) %{_libdir}/libvulkan_intel.so
+%{_datadir}/vulkan/icd.d/intel_icd.*.json
 
 %files vulkan-icd-intel-devel
 %defattr(644,root,root,755)
 %{_includedir}/vulkan/vulkan_intel.h
+
+%if %{with radv}
+%files vulkan-icd-radeon
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libvulkan_radeon.so
+%{_datadir}/vulkan/icd.d/radeon_icd.*.json
+%endif