summaryrefslogtreecommitdiffstats
path: root/xorg-xserver/xorg-server
diff options
context:
space:
mode:
authorThomas Orgis2016-04-15 15:39:59 +0200
committerThomas Orgis2016-04-15 15:41:14 +0200
commitdc442c6dfd20a92d49c0f806ec01a10b8c1eb4ed (patch)
tree6bbef18e9a01fcb7a7c2cb89a0d3bf9610d79299 /xorg-xserver/xorg-server
parent4435b86ff7170744b7bf22ec67b1bb6902a50ab4 (diff)
xorg-server: add XVFB sub-dependency
Diffstat (limited to 'xorg-xserver/xorg-server')
-rw-r--r--xorg-xserver/xorg-server/HISTORY3
-rwxr-xr-xxorg-xserver/xorg-server/PRE_SUB_DEPENDS1
-rwxr-xr-xxorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS1
-rwxr-xr-xxorg-xserver/xorg-server/SUB_DEPENDS1
4 files changed, 6 insertions, 0 deletions
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 39344a75b3..7f046db8fa 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2016-04-14 Thomas Orgis <sobukus@sourcemage.org>
+ * *SUB_DEPENDS: added XVFB
+
2016-04-05 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: 1.18.3
diff --git a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
index 082a6995e3..cc9d460846 100755
--- a/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/PRE_SUB_DEPENDS
@@ -7,6 +7,7 @@ case $THIS_SUB_DEPENDS in
# 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 ;;
+ XVFB) list_find "$XORG_SERVER_OPTS" "--enable-xvfb" && 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 b9edb74cda..76e6a138b8 100755
--- a/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/REPAIR^all^PRE_SUB_DEPENDS
@@ -7,6 +7,7 @@ case $THIS_SUB_DEPENDS in
# 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 ;;
+ XVFB) list_find "$XORG_SERVER_OPTS" "--enable-xvfb" && 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 8300bcd9e9..2e0dcb2ddb 100755
--- a/xorg-xserver/xorg-server/SUB_DEPENDS
+++ b/xorg-xserver/xorg-server/SUB_DEPENDS
@@ -17,6 +17,7 @@ case "$THIS_SUB_DEPENDS" in
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" ;;
+ XVFB) list_add XORG_SERVER_OPTS "--enable-xvfb" ;;
*) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
return 1;;
esac