summaryrefslogtreecommitdiffstats
path: root/xorg
diff options
context:
space:
mode:
authorTreeve Jelbert2022-10-12 21:49:32 +0200
committerTreeve Jelbert2022-10-19 20:40:38 +0200
commit0a2cf5733bd83df171602d0932c7020a27eb2f1b (patch)
tree89bb82051dc854fecc44ca3f1a3f29e8c276b489 /xorg
parent17a9b00084fe517934951ba3245a6e0b33ea3777 (diff)
xserver - adjust depends
Diffstat (limited to 'xorg')
-rwxr-xr-xxorg/xserver/DEPENDS9
-rw-r--r--xorg/xserver/HISTORY3
2 files changed, 8 insertions, 4 deletions
diff --git a/xorg/xserver/DEPENDS b/xorg/xserver/DEPENDS
index 7a5d30e165..aa68f41295 100755
--- a/xorg/xserver/DEPENDS
+++ b/xorg/xserver/DEPENDS
@@ -49,7 +49,6 @@ if [[ "$XSERVER_WAYLAND" == true ]];then
depends wayland-protocols
fi &&
-#optional_depends elogind '' '' ''
optional_depends libbsd '' '' 'BSD type features' &&
@@ -61,10 +60,12 @@ if is_depends_enabled $SPELL libxv;then
optional_depends libxvmc 'xvmc=true' 'xvmc=false' 'XvMC extension'
fi &&
-optional_depends systemd \
+
+if ! is_depends_enabled "$SPELL" systemd; then
+ optional_depends systemd \
'systemd_logind=true' 'systemd_logind=false' \
- 'for systemd-logind integration' &&
-if is_depends_enabled "$SPELL" systemd; then
+ 'for systemd-logind integration'
+else
depends dbus
fi &&
diff --git a/xorg/xserver/HISTORY b/xorg/xserver/HISTORY
index 0dc262d19a..c2b0f6f9e4 100644
--- a/xorg/xserver/HISTORY
+++ b/xorg/xserver/HISTORY
@@ -1,3 +1,6 @@
+2022-10-12 Treeve Jelbert <treeve@sourcemage.org>
+ * DEPENDS: adjust systemd usage
+
2022-07-20 Pavel Vinogradov <public@sourcemage.org>
* PRE_BUILD: removed old meson hacks