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 1b2ec86255beb787ef03464a94f572e3b79520bf..0000000000000000000000000000000000000000 --- 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 872470c2f737879e01b054c1bb74c36092c9be4c..bbe6f0a216bf6e7d1299c29be476ddf5fc1601cc 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 22.3.0 +VERSION ?= 23.1.4 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/download b/download index 2b3c872d74e6d946cdcbc408640dd424f4d66ce7..637acb55f1ae5232063f69b9031f0a722a119818 100644 --- a/download +++ b/download @@ -1 +1,3 @@ -fc8d8ec2b5e05cc17533df1adff3a29e mesa-22.3.0.tar.xz +c9a52e322ada1406bfde9ebe3cdbbcca dataclasses-0.8.tar.gz +e577128f9f8e5ce395eb38b293aa9438 mesa-23.1.4.tar.xz +e894ff3492fd8a1ab4587b4f8e91f28f meson-0.61.4.tar.gz diff --git a/fix-py-ver.patch b/fix-py-ver.patch new file mode 100644 index 0000000000000000000000000000000000000000..053ab54e6b24976caa44d37eeaa85b11b210368e --- /dev/null +++ b/fix-py-ver.patch @@ -0,0 +1,12 @@ +diff -up mesa-23.1.4/meson.build.dma mesa-23.1.4/meson.build +--- mesa-23.1.4/meson.build.dma 2023-07-28 10:15:41.807945483 +1000 ++++ mesa-23.1.4/meson.build 2023-07-28 10:15:46.465030794 +1000 +@@ -835,7 +835,7 @@ if get_option('allow-kcmp') \ + pre_args += '-DALLOW_KCMP' + endif + +-prog_python = import('python').find_installation('python3') ++prog_python = import('python').find_installation('python3.6') + has_mako = run_command( + prog_python, '-c', + ''' diff --git a/mesa.spec b/mesa.spec index c7a8653cb5849a2832d2ba4d064860819645483e..0e03d5ddebaec22578e5b07e3c76a26dfc1a3709 100644 --- a/mesa.spec +++ b/mesa.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.4 %global llvm_toolset %{nil} %global llvm_pkg_prefix %{nil} @@ -38,8 +37,8 @@ Name: mesa Summary: Mesa graphics libraries -Version: 22.3.0 -Release: 2%{?rctag:.%{rctag}}%{anolis_release}%{?dist} +Version: 23.1.4 +Release: 1%{?rctag:.%{rctag}}%{?dist} License: MIT URL: http://www.mesa3d.org @@ -53,16 +52,21 @@ 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 +Patch1: fix-py-ver.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 +BuildRequires: libzstd-devel %if %{with_hardware} BuildRequires: kernel-headers %endif @@ -316,15 +320,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=/usr/lib/python3.6/site-packages/:%{buildroot}/usr/lib/python3.6/site-packages/ +%meson -Dcpp_std=gnu++17 \ -Db_ndebug=true \ -Dplatforms=x11,wayland \ -Ddri3=enabled \ @@ -356,12 +372,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 @@ -555,17 +584,11 @@ done %endif %changelog -* Mon Dec 11 2023 Zhao Hang - 22.3.0-2.0.4 -- Rebuild for Anolis OS - -* Fri Aug 04 2023 Hong Wei Qin - 22.3.0-2.0.3 -- Rebuild with llvm - -* Wed Aug 03 2023 Zhao Hang - 22.3.0-2.0.2 -- Rebuild for Anolis OS +* Thu Jul 27 2023 Dave Airlie - 23.1.4-1 +- Update to 23.1.4 -* Mon Jul 31 2023 Zhao Hang - 22.3.0-2.0.1 -- Rebuild with llvm15 +* 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)