git: 60918185f8fa - 2024Q3 - graphics/mesa-devel: fix build on powerpc64*
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 11 Jul 2024 00:55:50 UTC
The branch 2024Q3 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=60918185f8fa055bbc418c29de1919bb64fee48e
commit 60918185f8fa055bbc418c29de1919bb64fee48e
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2024-07-09 10:00:02 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-07-11 00:54:21 +0000
graphics/mesa-devel: fix build on powerpc64*
Allow anv on powerpc64* in OPTIONS_EXCLUDE to properly pass -Dintel-rt=disabled:
meson.build:291:3: ERROR: Feature intel-rt cannot be enabled: Intel Ray Tracing is only supported on x86_64
Additionaly, add an uncommitted patch from MR for powerpc64le.
(cherry picked from commit ed9185fb6e561ee48614189cadafc552db68f175)
---
graphics/mesa-devel/Makefile | 3 ++-
graphics/mesa-devel/distinfo | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile
index 6b2ea2526a17..4adcfb7144f6 100644
--- a/graphics/mesa-devel/Makefile
+++ b/graphics/mesa-devel/Makefile
@@ -8,6 +8,7 @@ PATCH_SITES= https://github.com/mesa3d/${GL_PROJECT}/commit/:github
PATCHFILES+= 700efacda59c.patch:-p1:github
PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
PATCHFILES+= 2930dcbb3329.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22246
+PATCHFILES+= 11aaf934112c.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22941
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Bleeding edge Mesa drivers (OpenCL, OpenGL, Vulkan)
@@ -53,7 +54,7 @@ OPTIONS_GROUP_VULKAN= anv hasvk radv
OPTIONS_EXCLUDE_i386= LTO # anv: vkcube fails on vkCreateSwapchainKHR
OPTIONS_EXCLUDE+= ${ARCH:Naarch64:C/.+/panfrost/}
OPTIONS_EXCLUDE+= ${ARCH:Namd64:Ni386:Nx86_64:C/.+/crocus hasvk/}
-OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Ni386:Nx86_64:C/.+/anv iris/}
+OPTIONS_EXCLUDE+= ${ARCH:Naarch64:Namd64:Ni386:Nx86_64:Npowerpc64*:C/.+/anv iris/}
OPTIONS_EXCLUDE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"==${.CURDIR:T}:?COINST:}
OPTIONS_SLAVE+= ${"${GL_DEFAULT:S/,/ /g:[-1]}"!=${.CURDIR:T}:?COINST:}
OPTIONS_SUB= yes
diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo
index 94bc26dff606..19c17ff41402 100644
--- a/graphics/mesa-devel/distinfo
+++ b/graphics/mesa-devel/distinfo
@@ -1,7 +1,9 @@
-TIMESTAMP = 1720045057
+TIMESTAMP = 1720517604
SHA256 (mesa-24.1-branchpoint-3263-gf9efedb1a1a.tar.bz2) = 3b5670c8106d5f04f173adb492e8f1b1a7daf699794d92248eb123bce4ee99d5
SIZE (mesa-24.1-branchpoint-3263-gf9efedb1a1a.tar.bz2) = 37769076
SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008
SIZE (700efacda59c.patch) = 983
SHA256 (2930dcbb3329.patch) = f90ab77950ba1a56d165f0bc8a3cbd9c5f624bb5c67d1c7f337316027e8295e8
SIZE (2930dcbb3329.patch) = 1638
+SHA256 (11aaf934112c.patch) = 4408d8c0c4bf559ddf32ddbd06766f4fd28cc30b199a1991b20c89cf99bb9121
+SIZE (11aaf934112c.patch) = 780