X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=Mesa.spec;h=6ecf60d307cec4955ebc4ec632e5652faa478ecf;hb=3f1476f6da2540103be93014461823d1947f7154;hp=53855e608558ae1e76c68821b568325a17e2011d;hpb=39fc61907aa4399f2fa1d35c673d68b61c58f2bd;p=packages%2FMesa.git

diff --git a/Mesa.spec b/Mesa.spec
index 53855e6..6ecf60d 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -37,7 +37,7 @@
 %define		zlib_ver		1.2.8
 %define		wayland_ver		1.18
 %define		libglvnd_ver		1.3.4-2
-%define		llvm_ver		11.0.0
+%define		llvm_ver		15.0.0
 %define		gcc_ver 		6:5
 
 %if %{without gallium}
@@ -70,15 +70,20 @@
 %define		with_sse2	1
 %endif
 
+%ifarch %{ix86} %{x8664} x32
+%define		with_intel_vk	1
+%endif
+
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	23.1.7
+Version:	23.3.2
 Release:	1
 License:	MIT (core) and others - see license.html file
 Group:		X11/Libraries
 Source0:	https://archive.mesa3d.org/mesa-%{version}.tar.xz
-# Source0-md5:	1b95b46eb977b2b34cd9c02e93ca4659
+# Source0-md5:	3cd40c998ae1ad51e5aec5381072bcae
+Patch0:		no-rust-proc-macro-link.patch
 URL:		https://www.mesa3d.org/
 %if %{with opencl_spirv} || %{with gallium_rusticl}
 BuildRequires:	SPIRV-LLVM-Translator-devel >= 8.0.1.3
@@ -90,6 +95,9 @@ BuildRequires:	elfutils-devel
 BuildRequires:	expat-devel >= 1.95
 BuildRequires:	flex
 BuildRequires:	gcc >= %{gcc_ver}
+%if %{with radv} || %{with intel_vk}
+BuildRequires:	glslang
+%endif
 %ifarch %{armv6}
 BuildRequires:	libatomic-devel
 %endif
@@ -108,7 +116,7 @@ BuildRequires:	libxcb-devel >= 1.13
 BuildRequires:	llvm-libclc
 %endif
 %{?with_omx:BuildRequires:	libomxil-bellagio-devel}
-BuildRequires:	meson >= 1.0.0
+BuildRequires:	meson >= 1.2.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig(talloc) >= 2.0.1
@@ -130,8 +138,9 @@ BuildRequires:	tar >= 1:1.22
 BuildRequires:	udev-devel
 # wayland-{client,server}
 %{?with_wayland:BuildRequires:	wayland-devel >= %{wayland_ver}}
-%{?with_wayland:BuildRequires:	wayland-protocols >= 1.24}
+%{?with_wayland:BuildRequires:	wayland-protocols >= 1.30}
 %{?with_wayland:BuildRequires:	wayland-egl-devel >= %{wayland_ver}}
+BuildRequires:	xcb-util-keysyms-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel >= 1.0.5
 BuildRequires:	xorg-lib-libXfixes-devel >= 2.0
@@ -1553,6 +1562,7 @@ radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD.
 
 %prep
 %setup -q -n mesa-%{version}
+%patch0 -p1
 
 %build
 %if %{with opencl}
@@ -1588,9 +1598,7 @@ vc4 \
 gallium_drivers=$(echo $gallium_drivers | xargs | tr ' ' ',')
 
 vulkan_drivers="swrast %{?with_radv:amd} \
-%ifarch %{ix86} %{x8664} x32
-intel \
-%endif
+%{?with_intel_vk:intel} \
 %ifarch %{arm} aarch64
 freedreno broadcom imagination-experimental panfrost \
 %endif
@@ -1742,7 +1750,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libGL-devel
 %defattr(644,root,root,755)
-%doc docs/_extra/specs/*
+%doc docs/_static/specs/*
 %if %{without glvnd}
 %dir %{_includedir}/GL
 %{_includedir}/GL/gl.h
@@ -1941,6 +1949,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/armada-drm_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/exynos_dri.so
+%attr(755,root,root) %{_libdir}/xorg/modules/dri/hdlcd_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/hx8357d_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/ili9225_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/ili9341_dri.so