Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (399b2888b2bd3b83352691764b83b7b4fff9f13d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (399b2888b2bd3b83352691764b83b7b4fff9f13d)
  • Date: Sun, 4 Nov 2012 13:37:26 -0600

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev
<stealth AT sourcemage.org>:

xorg-driver/xf86-video-intel/DEPENDS | 3 ++-
xorg-driver/xf86-video-intel/HISTORY | 1 +
xorg-xserver/xorg-server/HISTORY | 4 ++++
xorg-xserver/xorg-server/PRE_SUB_DEPENDS | 1 +
xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS | 1 +
xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS | 19
+++++++++++++++++++
xorg-xserver/xorg-server/SUB_DEPENDS | 18 ++++++++++++------
7 files changed, 40 insertions(+), 7 deletions(-)

New commits:
commit 399b2888b2bd3b83352691764b83b7b4fff9f13d
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xf86-video-intel: corrected dependency check

commit 35b51833f8440846e0f0e5a22514bdf39c27fe96
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

xorg-server: added DRI subdependency

diff --git a/xorg-driver/xf86-video-intel/DEPENDS
b/xorg-driver/xf86-video-intel/DEPENDS
index 6427633..70318cf 100755
--- a/xorg-driver/xf86-video-intel/DEPENDS
+++ b/xorg-driver/xf86-video-intel/DEPENDS
@@ -10,7 +10,8 @@ fi &&

if [[ $MESALIB_BUILD == dri ]]; then
depends xf86driproto &&
- depends -sub "DRI" mesalib "--enable-dri"
+ depends -sub "DRI" mesalib "--enable-dri" &&
+ depends -sub "DRI" xorg-server
else
depends mesalib "--disable-dri"
fi &&
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index 4e17add..0c44712 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,5 +1,6 @@
2012-11-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.20.12
+ * DEPENDS: requires xorg-server with DRI if selected

2012-10-09 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.20.9
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index 5e36c74..6656418 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,5 +1,9 @@
2012-11-04 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing libxtst dependency
+ * REPAIR^all^SUB_DEPENDS: added
+ * {REPAIR^all^,}PRE_SUB_DEPENDS: added DRI extension subdependency
check
+ * SUB_DEPENDS: added DRI extension subdependency; corrected actions
for
+ DPMS; added missing `&&'s

2012-08-27 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.12.4
diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
index af9d3df..472c897 100755
--- a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
@@ -1,6 +1,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 ;;
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^PRE_SUB_DEPENDS
b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
index af9d3df..472c897 100755
--- a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
@@ -1,6 +1,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 ;;
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
new file mode 100755
index 0000000..c4a4d1f
--- /dev/null
+++ b/xorg-xserver/xorg-server/REPAIR^all^SUB_DEPENDS
@@ -0,0 +1,19 @@
+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}" &&
+ 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}" &&
+ list_remove XORG_SERVER_OPTS "--disable-dri" &&
+ list_add XORG_SERVER_OPTS "--enable-dri" ;;
+ 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
diff --git a/xorg-xserver/xorg-server/SUB_DEPENDS
b/xorg-xserver/xorg-server/SUB_DEPENDS
index e6b5f70..c4a4d1f 100755
--- a/xorg-xserver/xorg-server/SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/SUB_DEPENDS
@@ -1,12 +1,18 @@
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"
+ 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}" &&
+ 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}" &&
+ list_remove XORG_SERVER_OPTS "--disable-dri" &&
+ list_add XORG_SERVER_OPTS "--enable-dri" ;;
+ 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"
+ 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;;



  • [SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (399b2888b2bd3b83352691764b83b7b4fff9f13d), Vlad Glagolev, 11/04/2012

Archive powered by MHonArc 2.6.24.

Top of Page