sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (41feab81c0d3c4a41b88abc585dac5ab80e6b199)
- 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 (41feab81c0d3c4a41b88abc585dac5ab80e6b199)
- Date: Tue, 24 Jun 2025 17:04:46 +0000
GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:
graphics-libs/mesa/BUILD | 4 ++--
graphics-libs/mesa/CONFIGURE | 7 ++++++-
graphics-libs/mesa/HISTORY | 3 +++
3 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 41feab81c0d3c4a41b88abc585dac5ab80e6b199
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
graphics-libs/mesa: osmesa option is for stable only from now on
diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD
index 0c98b02..5e88ba1 100755
--- a/graphics-libs/mesa/BUILD
+++ b/graphics-libs/mesa/BUILD
@@ -51,7 +51,6 @@ meson_opt boolean "gpuvis" "$MESA_GPUVIS" &&
meson_opt feature "intel-rt" "$MESA_INTEL_RAYTRACE" &&
meson_opt boolean "llvm-orcjit" "$MESA_LLVM_ORCJIT" &&
meson_opt boolean "opengl" "$MESA_OPENGL" &&
-meson_opt boolean "osmesa" "$MESA_OSMESA" &&
meson_opt boolean "perfetto" "$MESA_PERFETTO" &&
meson_opt feature "shader-cache" "$MESA_SHADER_CACHE" &&
meson_opt feature "shared-llvm" "$link_llvm_shared" &&
@@ -63,7 +62,8 @@ meson_opt feature "xmlconfig"
"$MESA_XMLCONFIG" &&
if [[ "${MESA_BRANCH}" != "scm" ]]; then
meson_opt boolean "gallium-nine" "$MESA_GALLIUM_D3D9" &&
meson_opt feature "gallium-xa" "$MESA_GALLIUM_XA" &&
- meson_opt choice "gallium-opencl" "${MESA_OPENCL:-disabled}"
+ meson_opt choice "gallium-opencl" "${MESA_OPENCL:-disabled}" &&
+ meson_opt boolean "osmesa" "$MESA_OSMESA"
fi &&
if [ -n "$MESA_GALLIUM" ] && ! list_find "$MESA_GALLIUM" none ;then
diff --git a/graphics-libs/mesa/CONFIGURE b/graphics-libs/mesa/CONFIGURE
index e087daf..5ab1fb7 100755
--- a/graphics-libs/mesa/CONFIGURE
+++ b/graphics-libs/mesa/CONFIGURE
@@ -339,7 +339,12 @@ config_query MESA_GLES1 "Support OpenGL ES 1.x?" n &&
config_query MESA_GLES23 "Support OpenGL ES 2.x and 3.x?" n &&
config_query MESA_OPENGL "Enable desktop OpenGL support?" y &&
config_query MESA_GBM "Enable generic buffer management (GBM) support?" n &&
-config_query MESA_OSMESA "Build OSmesa to support off-screen rendering?" n &&
+
+if [[ "${MESA_BRANCH}" == "stable" ]]; then
+ config_query MESA_OSMESA "Build OSmesa to support off-screen rendering?" n
+else
+ persistent_remove MESA_OSMESA
+fi &&
config_query_list MESA_GLX_CHOICE "Which GLX build type (dri recommended)?" \
disabled \
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 5c6ae2f..2acf7b7 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,6 @@
+2025-06-24 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE: osmesa option is available in stable branch only
+
2025-06-18 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 25.1.4
- [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (41feab81c0d3c4a41b88abc585dac5ab80e6b199), Pavel Vinogradov, 06/24/2025
Archive powered by MHonArc 2.6.24.