sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (ae3fe98ba29a6014b74ad9728ee1f433a6aab842)
- From: Pavel Vinogradov <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (ae3fe98ba29a6014b74ad9728ee1f433a6aab842)
- Date: Wed, 23 Apr 2025 20:38:05 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
graphics-libs/mesa/BUILD | 5 ++++-
graphics-libs/mesa/CONFIGURE | 25 ++++++++++++++++++-------
graphics-libs/mesa/HISTORY | 4 ++++
3 files changed, 26 insertions(+), 8 deletions(-)
New commits:
commit ae3fe98ba29a6014b74ad9728ee1f433a6aab842
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
graphics-libs/mesa: unbroke scm branch by removing
gallium-opencl + added radeonsi rusticl driver
diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD
index 20d6216..40b6946 100755
--- a/graphics-libs/mesa/BUILD
+++ b/graphics-libs/mesa/BUILD
@@ -40,7 +40,6 @@ meson_opt boolean "gallium-d3d10umd"
"$MESA_GALLIUM_D3D10" &&
meson_opt feature "gallium-d3d12-graphics" "$MESA_GALLIUM_D3D12_PIPELINE" &&
meson_opt feature "gallium-d3d12-video" "$MESA_GALLIUM_D3D12_VIDEO" &&
meson_opt boolean "gallium-extra-hud" "$MESA_GALLIUM_HUD" &&
-meson_opt choice "gallium-opencl" "${MESA_OPENCL:-disabled}" &&
meson_opt boolean "gallium-rusticl" "$MESA_RUSTICL" &&
meson_opt feature "gallium-xa" "$MESA_GALLIUM_XA" &&
meson_opt feature "gbm" "$MESA_GBM" &&
@@ -63,6 +62,10 @@ meson_opt boolean "teflon" "$MESA_TEFLON"
&&
meson_opt feature "xlib-lease" "$MESA_XLIB_LEASE" &&
meson_opt feature "xmlconfig" "$MESA_XMLCONFIG" &&
+if [[ "${MESA_BRANCH}" != "scm" ]]; then
+ meson_opt choice "gallium-opencl" "${MESA_OPENCL:-disabled}"
+fi &&
+
if [ -n "$MESA_GALLIUM" ] && ! list_find "$MESA_GALLIUM" none ;then
meson_opt list "gallium-drivers" "$MESA_GALLIUM"
else
diff --git a/graphics-libs/mesa/CONFIGURE b/graphics-libs/mesa/CONFIGURE
index 85fd2de..41e2460 100755
--- a/graphics-libs/mesa/CONFIGURE
+++ b/graphics-libs/mesa/CONFIGURE
@@ -245,20 +245,31 @@ if [ -n "$MESA_GALLIUM" ] && ! list_find
"$MESA_GALLIUM" none ;then
config_query MESA_GALLIUM_D3D12_VIDEO "Build gallium with Direct3D12
video support?" n
fi &&
- config_query MESA_OPENCL_ENABLE "Build gallium OpenCL (clover) frontend?"
n &&
+if [[ "${MESA_BRANCH}" != "scm" ]]; then
+ config_query MESA_OPENCL_ENABLE "Build gallium OpenCL (clover)
frontend?" n &&
- if [[ "$MESA_OPENCL_ENABLE" == "y" ]] ;then
- config_query_list MESA_OPENCL "How should the gallium OpenCL (clover)
frontend be built?" \
- icd \
- standalone
- fi &&
+ if [[ "$MESA_OPENCL_ENABLE" == "y" ]] ;then
+ config_query_list MESA_OPENCL "How should the gallium OpenCL (clover)
frontend be built?" \
+ icd \
+ standalone
+ fi
+else
+ persistent_remove MESA_OPENCL_ENABLE &&
+ persistent_remove MESA_OPENCL
+fi &&
config_query MESA_RUSTICL "Build gallium rusticl (OpenCL) frontend
(requires rust)?" n &&
if [[ "$MESA_RUSTICL" == "y" ]] ;then
+ local AVAILABLE_MESA_RUSTICL_DRIVERS &&
+ AVAILABLE_MESA_RUSTICL_DRIVERS="asahi" &&
+ if [[ "${MESA_BRANCH}" == "scm" ]]; then
+ AVAILABLE_MESA_RUSTICL_DRIVERS="${AVAILABLE_MESA_RUSTICL_DRIVERS}
radeonsi"
+ fi &&
+
config_query_multi MESA_RUSTICL_DRIVERS "Which drivers to enable with
rusticl by default?" \
auto \
- asahi
+ ${AVAILABLE_MESA_RUSTICL_DRIVERS}
fi &&
# EGL requires DRI, which is only enabled if gallium is enabled
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index bef5f9f..3902f68 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2025-04-23 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE: scm branch doesn't have gallium-opencl anymore,
+ but does have radeonsi rusticl driver
+
2025-04-16 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 25.0.4
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (ae3fe98ba29a6014b74ad9728ee1f433a6aab842), Pavel Vinogradov, 04/23/2025
Archive powered by MHonArc 2.6.24.