sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (de484388f33afb0e2e6bb7d4e56d1267494f22fb)
- From: Justin Boffemmyer <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 Justin Boffemmyer (de484388f33afb0e2e6bb7d4e56d1267494f22fb)
- Date: Sat, 25 Jan 2025 15:15:37 +0000
GIT changes to master grimoire by Justin Boffemmyer <flux AT sourcemage.org>:
graphics-libs/mesa/HISTORY | 4 ++++
graphics-libs/mesa/PRE_INSTALL | 15 ++++++++-------
graphics-libs/mesa/PRE_SUB_DEPENDS | 6 +++---
graphics-libs/mesa/SUB_DEPENDS | 10 +++++-----
4 files changed, 20 insertions(+), 15 deletions(-)
New commits:
commit de484388f33afb0e2e6bb7d4e56d1267494f22fb
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>
graphics-libs/mesa: quote paths, update sub-deps
Quote file paths in PRE_INSTALL. All file/path values should always be
quoted, but especially never rm unquoted file paths.
Update sub-dependency operations to match the recent changes in
CONFIGURE.
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 4b01bf3..002c8132 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2025-01-26 Justin Boffemmyer <flux AT sourcemage.org>
+ * PRE_INSTALL: quote filesystem paths
+ * PRE_SUB_DEPENDS,SUB_DEPENDS: update to match CONFIGURE
+
2025-01-25 Justin Boffemmyer <flux AT sourcemage.org>
* CONFIGURE: refactor, remove problematic 'auto' choices, fix usage of
'all'
choices, fix persistent variables
diff --git a/graphics-libs/mesa/PRE_INSTALL b/graphics-libs/mesa/PRE_INSTALL
index 663aa72..1226650 100755
--- a/graphics-libs/mesa/PRE_INSTALL
+++ b/graphics-libs/mesa/PRE_INSTALL
@@ -1,12 +1,13 @@
-if spell_ok $SPELL;then
- dispel --notriggers $SPELL
+if spell_ok "$SPELL" ;then
+ dispel --notriggers "$SPELL"
fi &&
+
# cleanup broken symlinks, left over from smgl-gl_select
-if ! is_depends_enabled $SPELL smgl-gl_select;then
- for C in $(find -L $INSTALL_ROOT/usr/lib -type l) ; do
- rm $C
+if ! is_depends_enabled "$SPELL" smgl-gl_select;then
+ for C in $(find -L "$INSTALL_ROOT/usr/lib" -type l) ; do
+ rm "$C"
done &&
- for C in $(find -L $INSTALL_ROOT/usr/include/GL -type l) ; do
- rm $C
+ for C in $(find -L "$INSTALL_ROOT/usr/include/GL" -type l) ; do
+ rm "$C"
done
fi
diff --git a/graphics-libs/mesa/PRE_SUB_DEPENDS
b/graphics-libs/mesa/PRE_SUB_DEPENDS
index ca989e8..861da6b 100755
--- a/graphics-libs/mesa/PRE_SUB_DEPENDS
+++ b/graphics-libs/mesa/PRE_SUB_DEPENDS
@@ -1,11 +1,11 @@
-case $THIS_SUB_DEPENDS in
+case "$THIS_SUB_DEPENDS" in
DRI)
- if list_find "$MESA_GLX" dri;then
+ if [[ "$MESA_GLX" == "dri" ]];then
return 0
fi
;;
GLES2)
- if [[ "$MESA_GLES2" == "gles2=enabled" ]];then
+ if [[ "$MESA_GLES23" == "y" ]];then
return 0
fi
;;
diff --git a/graphics-libs/mesa/SUB_DEPENDS b/graphics-libs/mesa/SUB_DEPENDS
index dfb0e93..9127980 100755
--- a/graphics-libs/mesa/SUB_DEPENDS
+++ b/graphics-libs/mesa/SUB_DEPENDS
@@ -1,12 +1,12 @@
-case $THIS_SUB_DEPENDS in
+case "$THIS_SUB_DEPENDS" in
DRI)
- if ! list_find "$MESA_GLX" dri;then
- list_add MESA_GLX dri
+ if [[ "$MESA_GLX" != "dri" ]]; then
+ MESA_GLX="dri"
fi
;;
GLES2)
- if [[ "$MESA_GLES2" != "gles2=enabled" ]]; then
- MESA_GLES2="gles2=enabled"
+ if [[ "$MESA_GLES23" != "y" ]]; then
+ MESA_GLES23="y"
fi
;;
*) echo "Unknown sub_depends $THIS_SUB_DEPENDS!"; return 1 ;;
- [[SM-Commit] ] GIT changes to master grimoire by Justin Boffemmyer (de484388f33afb0e2e6bb7d4e56d1267494f22fb), Justin Boffemmyer, 01/25/2025
Archive powered by MHonArc 2.6.24.