Skip to Content.
Sympa Menu

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

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 (58fa75ee37a97bf24bdcc926328d037a06ba9275)
  • Date: Fri, 31 Aug 2018 00:40:53 +0000

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

xorg-xserver/xorg-server/HISTORY | 4 ++++
xorg-xserver/xorg-server/POST_RESURRECT | 6 ++++--
xorg-xserver/xorg-server/PRE_BUILD | 12 +++++++-----
xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT | 6 ++++--
4 files changed, 19 insertions(+), 9 deletions(-)

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

xorg-xserver/xorg-server: handle the case when smgl-gl_select isn't
installed

diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 18245f3..11b1442 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2018-08-30 Pavel Vinogradov <public AT sourcemage.org>
+ * POST_RESURRECT, PRE_BUILD, REPAIR^all^POST_RESURRECT: added check
+ for smgl-gl_select availability
+
2018-08-07 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.20.1

diff --git a/xorg-xserver/xorg-server/POST_RESURRECT
b/xorg-xserver/xorg-server/POST_RESURRECT
index 44b0976..b17d803 100755
--- a/xorg-xserver/xorg-server/POST_RESURRECT
+++ b/xorg-xserver/xorg-server/POST_RESURRECT
@@ -1,2 +1,4 @@
-. $GRIMOIRE/FUNCTIONS
-glselect mesa
+. "${GRIMOIRE}/FUNCTIONS" &&
+if spell_ok "smgl-gl_select"; then
+ glselect mesa
+fi
diff --git a/xorg-xserver/xorg-server/PRE_BUILD
b/xorg-xserver/xorg-server/PRE_BUILD
index 7e44ca5..8a67cbf 100755
--- a/xorg-xserver/xorg-server/PRE_BUILD
+++ b/xorg-xserver/xorg-server/PRE_BUILD
@@ -1,8 +1,10 @@
default_pre_build &&
-# required to build
-glselect mesa &&
cd "$SOURCE_DIRECTORY" &&
-# some install scripts are missing!
-autoreconf -f -i --symlink &&
-patch -p1 < $SPELL_DIRECTORY/gl_select.patch
+if spell_ok "smgl-gl_select"; then
+ # required to build
+ glselect mesa &&
+ # some install scripts are missing!
+ autoreconf -f -i --symlink &&
+ patch -p1 < $SPELL_DIRECTORY/gl_select.patch
+fi

diff --git a/xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT
b/xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT
index 44b0976..b17d803 100755
--- a/xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT
+++ b/xorg-xserver/xorg-server/REPAIR^all^POST_RESURRECT
@@ -1,2 +1,4 @@
-. $GRIMOIRE/FUNCTIONS
-glselect mesa
+. "${GRIMOIRE}/FUNCTIONS" &&
+if spell_ok "smgl-gl_select"; then
+ glselect mesa
+fi



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (58fa75ee37a97bf24bdcc926328d037a06ba9275), Pavel Vinogradov, 08/30/2018

Archive powered by MHonArc 2.6.24.

Top of Page