Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Pol Vinogradov (bc2f590d55beaeb7457afe03c1ecee2721845d37)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pol Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Pol Vinogradov (bc2f590d55beaeb7457afe03c1ecee2721845d37)
  • Date: Thu, 18 Sep 2014 21:18:10 -0500

GIT changes to devel-xorg-modular grimoire by Pol Vinogradov
<vin.public AT gmail.com>:

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

New commits:
commit bc2f590d55beaeb7457afe03c1ecee2721845d37
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

xorg-xserver/xorg-server: fixed GLAMOR subdependency

diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index aab9e28..5e92fed 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2014-09-18 Pol Vinogradov <vin.public AT gmail.com>
+ * PRE_SUB_DEPENDS, REPAIR*SUB_DEPENDS: fixed GLAMOR subdependency
+
2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: really needs mesalib-1x ... so actually the old mesalib
spell is obsolete, what's the plan?
diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
index 4b27104..082a699 100755
--- a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
@@ -2,8 +2,8 @@ case $THIS_SUB_DEPENDS in
XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;;
DPMS) list_find "$XORG_SERVER_OPTS" "--enable-dpms" && return 0 ;;
DRI) list_find "$XORG_SERVER_OPTS" "--enable-dri" && return 0 ;;
- GLAMOR) list_find "$XORG_SERVER_OPTS" "--enable-dri" && return 0 ;;
- KDRIVE) list_find "$XORG_SERVER_OPTS" "--enable-glamor" && return 0 ;;
+ GLAMOR) list_find "$XORG_SERVER_OPTS" "--enable-glamor" && 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 ;;
diff --git a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
index 472c897..b9edb74 100755
--- a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
@@ -2,6 +2,7 @@ case $THIS_SUB_DEPENDS in
XCOMPOSITE) is_depends_enabled $SPELL libxcomposite ;;
DPMS) list_find "$XORG_SERVER_OPTS" "--enable-dpms" && return 0 ;;
DRI) list_find "$XORG_SERVER_OPTS" "--enable-dri" && return 0 ;;
+ GLAMOR) list_find "$XORG_SERVER_OPTS" "--enable-glamor" && 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" &&
diff --git a/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS
b/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS
index c4a4d1f..6531834 100755
--- a/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS
@@ -1,12 +1,15 @@
case "$THIS_SUB_DEPENDS" in
XCOMPOSITE) message "${MESSAGE_COLOR}Composite extension required, forcing
it.${DEFAULT_COLOR}" &&
depends libxcomposite "--enable-composite" ;;
- DPMS) message "${MESSAGE_COLOR}DPMS extension required, forcing
it.${DEFAULT_COLOR}" &&
+ DPMS) message "${MESSAGE_COLOR}DPMS extension required, forcing
it.${DEFAULT_COLOR}" &&
list_remove XORG_SERVER_OPTS "--disable-dpms" &&
list_add XORG_SERVER_OPTS "--enable-dpms" ;;
- DRI) message "${MESSAGE_COLOR}DRI extension required, forcing
it.${DEFAULT_COLOR}" &&
+ DRI) message "${MESSAGE_COLOR}DRI extension required, forcing
it.${DEFAULT_COLOR}" &&
list_remove XORG_SERVER_OPTS "--disable-dri" &&
list_add XORG_SERVER_OPTS "--enable-dri" ;;
+ GLAMOR) message "${MESSAGE_COLOR}GLAMORI extension required, forcing
it.${DEFAULT_COLOR}" &&
+ list_remove XORG_SERVER_OPTS "--disable-glamor" &&
+ list_add XORG_SERVER_OPTS "--enable-glamor" ;;
KDRIVE) message "${MESSAGE_COLOR}Forcing Kdrive...${DEFAULT_COLOR}" &&
list_remove XORG_SERVER_OPTS "--disable-kdrive" &&
list_add XORG_SERVER_OPTS "--enable-kdrive" ;;



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Pol Vinogradov (bc2f590d55beaeb7457afe03c1ecee2721845d37), Pol Vinogradov, 09/18/2014

Archive powered by MHonArc 2.6.24.

Top of Page