summaryrefslogtreecommitdiffstats
path: root/xorg-xserver/xorg-server
diff options
context:
space:
mode:
authorTreeve Jelbert2016-02-09 11:08:28 +0100
committerTreeve Jelbert2016-02-09 11:21:56 +0100
commit68ae8a611614199a07c2a7a5252d9db79bc4e79f (patch)
tree014beb23433a89abb8519c07a9fe1c121c3e82d0 /xorg-xserver/xorg-server
parent9f212847863dc3b28644f95ca0bf173242873ea6 (diff)
xorg-server - improve UP_TRIGGERS;
CONFIGURE: remove obsolete option
Diffstat (limited to 'xorg-xserver/xorg-server')
-rwxr-xr-xxorg-xserver/xorg-server/CONFIGURE6
-rw-r--r--xorg-xserver/xorg-server/HISTORY2
-rwxr-xr-xxorg-xserver/xorg-server/UP_TRIGGERS27
3 files changed, 12 insertions, 23 deletions
diff --git a/xorg-xserver/xorg-server/CONFIGURE b/xorg-xserver/xorg-server/CONFIGURE
index 0dc52a28e2..887a70145d 100755
--- a/xorg-xserver/xorg-server/CONFIGURE
+++ b/xorg-xserver/xorg-server/CONFIGURE
@@ -25,12 +25,6 @@ config_query_option XORG_SERVER_OPTS \
"--disable-glamor" &&
config_query_option XORG_SERVER_OPTS \
- "Install libxf86config?" \
- n \
- "--enable-install-libxf86config" \
- "--disable-install-libxf86config" &&
-
-config_query_option XORG_SERVER_OPTS \
"Build XRes extension?" \
y \
"--enable-xres" \
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY
index 626e0d0cd4..d78fd72aea 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,5 +1,7 @@
2016-02-09 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: 1.18.1
+ * UP_TRIGGERS: improve it
+ * CONFIGURE: remove obsolete option
2015-11-10 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: 1.18.0
diff --git a/xorg-xserver/xorg-server/UP_TRIGGERS b/xorg-xserver/xorg-server/UP_TRIGGERS
index d5b34ef6ec..6f9bf38301 100755
--- a/xorg-xserver/xorg-server/UP_TRIGGERS
+++ b/xorg-xserver/xorg-server/UP_TRIGGERS
@@ -1,18 +1,11 @@
-local each
-local epicfail
-
-case "$(installed_version $SPELL)" in
- 1.4.2|1.3.0.0|1.2.99.903|1.2.99.902|1.2.0|1.1.1|1.0.1|1.0.0|0.99.4) epicfail=y;;
- *) epicfail=n;;
-esac &&
-
-for each in synaptics $(gaze -q -g "$(gaze -q grimoires | tr " " "\n" | \
- grep -Ex "test|stable(-rc|-[0-9]+\.[0-9]+)?")" section xorg-driver);do
- if spell_ok $each; then
- if [[ $epicfail == y ]]; then
- up_trigger $each cast_self
- else
- up_trigger $each check_self
- fi
+local OLD_SPELL_VERSION=""
+if spell_ok $SPELL; then
+ OLD_SPELL_VERSION="$(installed_version $SPELL)"
+ if test "${VERSION:0:3}" != "${OLD_SPELL_VERSION:0:3}"; then
+ message "This is a possibly incompatible update of $SPELL..."
+ message "Figuring out what spells need to be recast, this may take a while."
+ for each in $(show_up_depends $SPELL 1); do
+ up_trigger $each check_self
+ done
fi
-done
+fi