Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (c847698d1b1d5ca9708037a5424e92bebcd86227)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (c847698d1b1d5ca9708037a5424e92bebcd86227)
  • Date: Thu, 10 Mar 2011 19:38:54 -0600

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

xorg-xserver/xorg-server/HISTORY | 4 ++++
xorg-xserver/xorg-server/PRE_SUB_DEPENDS | 4 ++++
xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS | 4 ++++
xorg-xserver/xorg-server/SUB_DEPENDS | 7 +++++++
4 files changed, 19 insertions(+)

New commits:
commit c847698d1b1d5ca9708037a5424e92bebcd86227
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

xorg-server: Allow forcing kdrive and xephyr
xephyr requires kdrive

Since xephyr requires kdrive, I have xephyr enable kdrive itself, that
way spell writers do not need to know this internal xorg dependency and
may just say 'depends -sub XEPHYR xorg-server' to get the required
support.

diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index f1cce22..d1c3adb 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,7 @@
+2011-03-10 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: Allow forcing kdrive and xephyr
+ xephyr requires kdrive
+
2011-02-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* INSTALL: create /usr/share/xsessions if it is missing and
xinitrc.desktop is to be installed
diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
index e9ea305..af9d3df 100755
--- a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
@@ -1,6 +1,10 @@
case $THIS_SUB_DEPENDS in
XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;;
DPMS) list_find "$XORG_SERVER_OPTS" "--enable-dpms" && return 0 ;;
+ KDRIVE) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" && return 0 ;;
+# Xephyr requires Kdrive and list_find returns true if at least one matches
+ XEPHYR) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" &&
+ list_find "$XORG_SERVER_OPTS" "--enable-xephyr" && return 0 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
index e9ea305..af9d3df 100755
--- a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,6 +1,10 @@
case $THIS_SUB_DEPENDS in
XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;;
DPMS) list_find "$XORG_SERVER_OPTS" "--enable-dpms" && return 0 ;;
+ KDRIVE) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" && return 0 ;;
+# Xephyr requires Kdrive and list_find returns true if at least one matches
+ XEPHYR) list_find "$XORG_SERVER_OPTS" "--enable-kdrive" &&
+ list_find "$XORG_SERVER_OPTS" "--enable-xephyr" && return 0 ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac
diff --git a/xorg-xserver/xorg-server/SUB_DEPENDS
b/xorg-xserver/xorg-server/SUB_DEPENDS
index 8125f11..e6b5f70 100755
--- a/xorg-xserver/xorg-server/SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/SUB_DEPENDS
@@ -1,6 +1,13 @@
case "$THIS_SUB_DEPENDS" in
XCOMPOSITE) depends libxcomposite "--enable-composite" ;;
DPMS) list_add XORG_SERVER_OPTS "--enable-dpms" ;;
+ KDRIVE) message "${MESSAGE_COLOR}Forcing Kdrive...${DEFAULT_COLOR}"
+ list_remove XORG_SERVER_OPTS "--disable-kdrive"
+ list_add XORG_SERVER_OPTS "--enable-kdrive" ;;
+# Xephyr requires Kdrive
+ XEPHYR) message "${MESSAGE_COLOR}Forcing Kdrive and
Xephyr...${DEFAULT_COLOR}"
+ list_remove XORG_SERVER_OPTS "--disable-kdrive
--disable-xephyr"
+ list_add XORG_SERVER_OPTS "--enable-kdrive --enable-xephyr" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (c847698d1b1d5ca9708037a5424e92bebcd86227), Eric Sandall, 03/10/2011

Archive powered by MHonArc 2.6.24.

Top of Page