Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (0533e837f4b1ef936d3a6ee851e22ce6d4c8930e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (0533e837f4b1ef936d3a6ee851e22ce6d4c8930e)
  • Date: Wed, 2 Mar 2016 20:13:43 +0000

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

xorg-xserver/xorg-server/DEPENDS | 15 ++++++++-------
xorg-xserver/xorg-server/HISTORY | 3 +++
2 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit 0533e837f4b1ef936d3a6ee851e22ce6d4c8930e
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

xorg-server: don't force dbus dependency when it isn't needed

diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 57adc13..56f1e70 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -55,20 +55,16 @@ optional_depends LOGIN-DAEMON \
'--enable-systemd-logind' \
'--disable-systemd-logind' \
'login daemon' &&
-depends dbus &&
+
#
# May only select one:
-# configure: error: Hotplugging through both libudev and dbus/hal not allowed
-#
-# NOTE: as hal depends on dbus, we can safely enable/disable dbus's configure
-# options with hal
+# configure: error: Hotplugging through both libudev and hal not allowed
#
# hal is preferred by upstream:
# --enable-config-udev Build udev support (default: auto)
# --disable-config-hal Build HAL support (default: auto)
#
-
-message "You can either use hal+dbus OR udev for hotplugging" &&
+message "You can either use hal OR udev for hotplugging" &&
message "but NOT both" &&
optional_depends hal \
"--enable-config-hal --disable-config-udev" \
@@ -82,6 +78,11 @@ if ! is_depends_enabled $SPELL hal; then
"enable udev kernel config support"
fi &&

+if is_depends_enabled $SPELL $(get_spell_provider $SPELL LOGIN-DAEMON) \
+ || is_depends_enabled $SPELL hal; then
+ depends dbus
+fi &&
+
optional_depends dmxproto \
"--enable-dmx" \
"--disable-dmx" \
diff --git a/xorg-xserver/xorg-server/HISTORY
b/xorg-xserver/xorg-server/HISTORY
index c64bb12..9c3d83f 100644
--- a/xorg-xserver/xorg-server/HISTORY
+++ b/xorg-xserver/xorg-server/HISTORY
@@ -1,3 +1,6 @@
+2016-03-02 Remko van der Vossen <wich AT sourcemage.org>
+ * DEPENDS: don't force dbus dependency when it isn't needed
+
2016-02-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: 1.18.1
PATCHLEVEL=1



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (0533e837f4b1ef936d3a6ee851e22ce6d4c8930e), Remko van der Vossen, 03/02/2016

Archive powered by MHonArc 2.6.24.

Top of Page