From e4edbe8f9b5165ee9661ed60f1eb7f0c17c1d5d3 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Mon, 22 May 2023 07:36:22 +1000 Subject: [PATCH] Update to 23.1.0 Resolves: rhbz#2160691 --- .gitignore | 3 ++ ...x-fix-xshm-check-to-init-xshm_opcode.patch | 27 ------------ Makefile | 2 +- mesa.spec | 43 ++++++++++++++++--- sources | 4 +- 5 files changed, 44 insertions(+), 35 deletions(-) delete mode 100644 0001-glx-fix-xshm-check-to-init-xshm_opcode.patch diff --git a/.gitignore b/.gitignore index f22d508..c0fe1c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ SOURCES/mesa-22.3.0.tar.xz /mesa-22.3.0.tar.xz +/mesa-23.1.0.tar.xz +/meson-0.61.4.tar.gz +/dataclasses-0.8.tar.gz diff --git a/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch b/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch deleted file mode 100644 index 1b2ec86..0000000 --- a/0001-glx-fix-xshm-check-to-init-xshm_opcode.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 808c054a42fd24a1aaefaeb1d95195fea9fb6e84 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Wed, 7 Dec 2022 05:11:47 +1000 -Subject: [PATCH] glx: fix xshm check to init xshm_opcode. - -Found and proposed by Ray Strode (halfline) - -Fixes: 68e89401140d ("glx/drisw: use xcb instead of X to query connection") ---- - src/glx/drisw_glx.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c -index c0d1e85fdc4..d7658eaf7c1 100644 ---- a/src/glx/drisw_glx.c -+++ b/src/glx/drisw_glx.c -@@ -874,6 +874,7 @@ check_xshm(Display *dpy) - - shm_cookie = xcb_query_extension(c, 7, "MIT-SHM"); - shm_reply = xcb_query_extension_reply(c, shm_cookie, NULL); -+ xshm_opcode = shm_reply->major_opcode; - - has_mit_shm = shm_reply->present; - free(shm_reply); --- -2.38.1 - diff --git a/Makefile b/Makefile index 872470c..f758907 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 22.3.0 +VERSION ?= 23.1.0 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/mesa.spec b/mesa.spec index 94626be..0173af0 100644 --- a/mesa.spec +++ b/mesa.spec @@ -37,8 +37,8 @@ Name: mesa Summary: Mesa graphics libraries -Version: 22.3.0 -Release: 2%{?rctag:.%{rctag}}%{?dist} +Version: 23.1.0 +Release: 1%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -52,16 +52,19 @@ Source3: Makefile # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD. Source4: Mesa-MLAA-License-Clarification-Email.txt +# build our own newer meson +Source5: meson-0.61.4.tar.gz +Source6: dataclasses-0.8.tar.gz + Patch0: lavapipe-disable-env-var.patch Patch10: gnome-shell-glthread-disable.patch -Patch11: 0001-glx-fix-xshm-check-to-init-xshm_opcode.patch Patch12: radeonsi-turn-off-glthread.patch BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: meson >= 0.45 +BuildRequires: meson %if %{with_hardware} BuildRequires: kernel-headers %endif @@ -315,15 +318,27 @@ Headers for development with the Vulkan API. cp %{SOURCE4} docs/ +tar -xvf %{SOURCE5} +tar -xvf %{SOURCE6} + pathfix.py -i %{__python3} -pn bin/*.py src/egl/generate/*.py \ src/gallium/tools/trace/*.py \ src/compiler/glsl/tests/*.py \ src/compiler/glsl/glcpp/tests/*.py %build - +cd meson-0.61.4 +%py3_build +%py3_install +cd - +cd dataclasses-0.8 +%py3_build +%py3_install +cd - export ASFLAGS="--generate-missing-build-notes=yes" -%meson -Dcpp_std=gnu++14 \ +%global __meson %{buildroot}/usr/bin/meson +export PYTHONPATH=%{buildroot}/usr/lib/python3.6/site-packages/ +%meson -Dcpp_std=gnu++17 \ -Db_ndebug=true \ -Dplatforms=x11,wayland \ -Ddri3=enabled \ @@ -355,12 +370,25 @@ export ASFLAGS="--generate-missing-build-notes=yes" -Dvalgrind=%{?with_valgrind:true}%{!?with_valgrind:false} \ -Dbuild-tests=false \ -Dselinux=true \ + -Dlibunwind=disabled \ + -Dlmsensors=disabled \ + -Dandroid-libbacktrace=disabled \ %{nil} %meson_build %install +cd meson-0.61.4 +%py3_install +cd - +export PYTHONPATH=%{buildroot}/usr/lib/python3.6/site-packages/ %meson_install +#nuke the meson install bits +rm -rf %{buildroot}/usr/lib/python3.6/ +rm -f %{buildroot}/usr/bin/meson +rm -rf %{buildroot}/usr/share/man/ +rm -f %{buildroot}/usr/share/polkit-1/actions/com.mesonbuild.install.policy + # libvdpau opens the versioned name, don't bother including the unversioned rm -vf %{buildroot}%{_libdir}/vdpau/*.so # likewise glvnd @@ -554,6 +582,9 @@ done %endif %changelog +* Mon May 22 2023 Dave Airlie - 23.1.0-1} +- Update to 23.1.0 + * Fri Jan 27 2023 Dave Airlie - 22.3.0-2 - disable glthread for radeonsi (breaks totem) diff --git a/sources b/sources index 354670c..bb6fc7a 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -SHA512 (mesa-22.3.0.tar.xz) = d61ecb360cf48400ce2360611564740f90d518abfa62ab52015226bc24d4f65bb3768d08dfd48f9cb4564e430ea1fdfc0c933c06e18ba3b39cf8041fbaf430e0 +SHA512 (meson-0.61.4.tar.gz) = 005f52c678016f3183d36b69254cceab16c682d2389ec9cae41889955a13cb643aea03f2247f3473cfeca9c4dd6c1cc8b9b8b9906dc324c08016c72380a5f195 +SHA512 (mesa-23.1.0.tar.xz) = 2c417b9930ca15c064214c7e6516e37c1c648dc2709bfb9099508b592a95c7515f90d53ac37eb80fc16b5e874b128be51a52a7e33e769ad1565db48996d57d6e +SHA512 (dataclasses-0.8.tar.gz) = 81b27dd10077084ca82b0a3cbbcee428a5c5cb2e6ade5de46a39731507c2d6f93f9038b704e6555c850044683516a0d130b95a14c91881d04b0bd2c496ca8d6a