Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (b3ddaa457cccf35bbb4e35d6a31340cbcdd92b8c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (b3ddaa457cccf35bbb4e35d6a31340cbcdd92b8c)
  • Date: Tue, 2 Apr 2024 02:42:17 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

graphics-libs/mesa/BUILD | 5 +++++
graphics-libs/mesa/CONFIGURE | 34 ++++++++++++++++------------------
graphics-libs/mesa/DEPENDS | 2 +-
graphics-libs/mesa/HISTORY | 5 +++++
4 files changed, 27 insertions(+), 19 deletions(-)

New commits:
commit b3ddaa457cccf35bbb4e35d6a31340cbcdd92b8c
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

graphics-libs/mesa: fixed building of NVK,
added && where needed,
fixed generation of git_sha1.h required by NVK,
removed message about experimental status of NVK

diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD
index 7121a4d..fcaa585 100755
--- a/graphics-libs/mesa/BUILD
+++ b/graphics-libs/mesa/BUILD
@@ -29,6 +29,11 @@ fi &&
local vulkan=${MESA_VULKAN//none} &&
local gallium=${MESA_GALLIUM//none} &&

+# for NVK
+if list_find "${MESA_VULKAN}" "nouveau"; then
+ python3 bin/git_sha1_gen.py --output src/git_sha1.h
+fi &&
+
OPTS+=" gallium-drivers=${gallium// /,} \
vulkan-drivers=${vulkan// /,} \
platforms=${MESA_EGL// /,} \
diff --git a/graphics-libs/mesa/CONFIGURE b/graphics-libs/mesa/CONFIGURE
index 0740e52..661ee34 100755
--- a/graphics-libs/mesa/CONFIGURE
+++ b/graphics-libs/mesa/CONFIGURE
@@ -1,20 +1,21 @@
-persistent_remove MESALIB_OPTS
-persistent_remove MESALIB_VULKAN
-persistent_remove MESALIB_BUILD
-persistent_remove MESALIB_GALLIUM
-persistent_remove MESALIB_DRIVERS
-persistent_remove MESA_OSMESA
+persistent_remove MESALIB_OPTS &&
+persistent_remove MESALIB_VULKAN &&
+persistent_remove MESALIB_BUILD &&
+persistent_remove MESALIB_GALLIUM &&
+persistent_remove MESALIB_DRIVERS &&
+persistent_remove MESA_OSMESA &&
persistent_remove MESA_DRI &&
persistent_remove MESA_ARCH &&
list_remove MESA_GLX "gallium-xlib" &&
list_remove MESA_TOOLS "xvmc" &&

# adjust some flags
-MESA_GLES1=${MESA_GLES1/true/enabled}
-MESA_GLES2=${MESA_GLES2/true/enabled}
-MESA_GLES1=${MESA_GLES1/false/disabled}
-MESA_GLES2=${MESA_GLES2/false/disabled}
-MESA_EGL=${MESA_EGL/drm/}
+MESA_GLES1=${MESA_GLES1/true/enabled} &&
+MESA_GLES2=${MESA_GLES2/true/enabled} &&
+MESA_GLES1=${MESA_GLES1/false/disabled} &&
+MESA_GLES2=${MESA_GLES2/false/disabled} &&
+MESA_EGL=${MESA_EGL/drm/} &&
+MESA_VULKAN=${MESA_VULKAN/\-experimental/} &&

. "${GRIMOIRE}/config_query_multi.function" &&
. "${GRIMOIRE}/MESON_CONFIGURE" &&
@@ -23,8 +24,8 @@ config_query_multi MESA_EGL "window systems to
support,recommend x11" x11 waylan

config_query_multi MESA_DRM "which libdrm hardware" AMD INTEL NOUVEAU RADEON
&&
# only suggest drivers for specified hardware
-local AVAILABLE_GALLIUM="svga swrast virgl zink"
-local AVAILABLE_VULKAN="swrast"
+local AVAILABLE_GALLIUM="svga swrast virgl zink" &&
+local AVAILABLE_VULKAN="swrast" &&
if list_find "$MESA_DRM" AMD;then
AVAILABLE_VULKAN="amd ${AVAILABLE_VULKAN}"
fi &&
@@ -37,7 +38,7 @@ if list_find "$MESA_DRM" INTEL;then
fi &&
if list_find "$MESA_DRM" NOUVEAU;then
AVAILABLE_GALLIUM="nouveau ${AVAILABLE_GALLIUM}" &&
- AVAILABLE_VULKAN="nouveau-experimental ${AVAILABLE_VULKAN}"
+ AVAILABLE_VULKAN="nouveau ${AVAILABLE_VULKAN}"
fi &&

config_query_multi MESA_GLX "glx build types, recommend dri" disabled dri
xlib &&
@@ -63,9 +64,6 @@ config_query_multi MESA_VULKAN \
if list_find "$MESA_VULKAN" all; then
MESA_VULKAN="$AVAILABLE_VULKAN"
fi &&
-if list_find "${MESA_VULKAN}" "nouveau-experimental";then
- message "${MESSAGE_COLOR}Nouveau Vulkan driver is still experimental, the
build may fail.${DEFAULT_COLOR}"
-fi &&

config_query_option MESA_GLES1 "support GLES1 - embedded systems" n
gles1=enabled gles1=disabled &&
config_query_option MESA_GLES2 "support GLES2/3 - embedded systems" n
gles2=enabled gles2=disabled &&
@@ -79,7 +77,7 @@ config_query_multi MESA_TOOLS "which tools to build" \
nir \
nouveau &&

-config_query_multi MESA_OMX "OMax support" auto disabled tizonia bellagio
+config_query_multi MESA_OMX "OMax support" auto disabled tizonia bellagio
&&

# strip any leading spaces from the driver lists
MESA_GALLIUM="${MESA_GALLIUM# }" &&
diff --git a/graphics-libs/mesa/DEPENDS b/graphics-libs/mesa/DEPENDS
index e3a44e6..709f1fb 100755
--- a/graphics-libs/mesa/DEPENDS
+++ b/graphics-libs/mesa/DEPENDS
@@ -27,7 +27,7 @@ else
depends -sub "${LLVM_SUB_DEPS# }" llvm "llvm=enabled"
fi &&

-if list_find "${MESA_VULKAN}" "nouveau-experimental"; then
+if list_find "${MESA_VULKAN}" "nouveau"; then
depends rust &&
depends rust-bindgen
fi &&
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index afafe99..2d2c35e 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,8 @@
+2024-04-01 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, CONFIGURE, DEPENDS: nouveau-experimental -> nouveau in
MESA_VULKAN,
+ added missing &&, fixed generation of git_sha1.h for NVK, removed
message
+ about experimental status of NVK
+
2024-03-29 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 24.0.4



  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (b3ddaa457cccf35bbb4e35d6a31340cbcdd92b8c), Pavel Vinogradov, 04/01/2024

Archive powered by MHonArc 2.6.24.

Top of Page