diff --git a/.gitignore b/.gitignore index c0fe1c9..4a44c22 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ SOURCES/mesa-22.3.0.tar.xz /mesa-23.1.0.tar.xz /meson-0.61.4.tar.gz /dataclasses-0.8.tar.gz +/mesa-23.1.4.tar.xz diff --git a/Makefile b/Makefile index f758907..bbe6f0a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 23.1.0 +VERSION ?= 23.1.4 SANITIZE ?= 1 DIRNAME = mesa-${VERSION} diff --git a/fix-py-ver.patch b/fix-py-ver.patch new file mode 100644 index 0000000..053ab54 --- /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 0173af0..1f3a078 100644 --- a/mesa.spec +++ b/mesa.spec @@ -37,7 +37,7 @@ Name: mesa Summary: Mesa graphics libraries -Version: 23.1.0 +Version: 23.1.4 Release: 1%{?rctag:.%{rctag}}%{?dist} License: MIT @@ -58,6 +58,7 @@ Source6: dataclasses-0.8.tar.gz Patch0: lavapipe-disable-env-var.patch +Patch1: fix-py-ver.patch Patch10: gnome-shell-glthread-disable.patch Patch12: radeonsi-turn-off-glthread.patch @@ -337,7 +338,7 @@ cd dataclasses-0.8 cd - export ASFLAGS="--generate-missing-build-notes=yes" %global __meson %{buildroot}/usr/bin/meson -export PYTHONPATH=%{buildroot}/usr/lib/python3.6/site-packages/ +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 \ @@ -582,7 +583,10 @@ done %endif %changelog -* Mon May 22 2023 Dave Airlie - 23.1.0-1} +* Thu Jul 27 2023 Dave Airlie - 23.1.4-1 +- Update to 23.1.4 + +* 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 diff --git a/sources b/sources index bb6fc7a..9f71469 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (meson-0.61.4.tar.gz) = 005f52c678016f3183d36b69254cceab16c682d2389ec9cae41889955a13cb643aea03f2247f3473cfeca9c4dd6c1cc8b9b8b9906dc324c08016c72380a5f195 -SHA512 (mesa-23.1.0.tar.xz) = 2c417b9930ca15c064214c7e6516e37c1c648dc2709bfb9099508b592a95c7515f90d53ac37eb80fc16b5e874b128be51a52a7e33e769ad1565db48996d57d6e SHA512 (dataclasses-0.8.tar.gz) = 81b27dd10077084ca82b0a3cbbcee428a5c5cb2e6ade5de46a39731507c2d6f93f9038b704e6555c850044683516a0d130b95a14c91881d04b0bd2c496ca8d6a +SHA512 (mesa-23.1.4.tar.xz) = 00f39028af6dddcff4521fc1cd9bee5355d7a0d1f54cfeef3d735422bec8074db4ed958e5482000e0911afc72a3d0002c3e9fed90553ce87c1e2c58cb651c371