2011-12-21 David Kowis <dkowis AT shlrm.org>
- * DETAILS: added more information to the long description and refomratted
it
+ * DETAILS: added more information to the long description and
reformatted it
2011-12-20 David Kowis <dkowis AT shlrm.org>
- * DEPENDS: added additional dependencies
- * CONFIGURE: added configure options
- * BUILD: set the root directory correctly
- * INSTALL: added logic to barf out one more config file that's needed
- * UP_TRIGGERS: Set the triggers to fire only if we're doing a fresh install
+ * DEPENDS: added additional dependencies
+ * CONFIGURE: added configure options
+ * BUILD: set the root directory correctly
+ * INSTALL: added logic to barf out one more config file that's needed
+ * UP_TRIGGERS: Set the triggers to fire only if we're doing a fresh
install
2011-12-19 David Kowis <dkowis AT shlrm.org>
- * DEPENDS: needs intltool to successfully build
+ * DEPENDS: needs intltool to successfully build
* DETAILS: version to 37
2013-02-22 Robin Cook <rcook AT wyrms.net>
diff --git a/xorg-driver/xf86-video-intel/DEPENDS
b/xorg-driver/xf86-video-intel/DEPENDS
index 5dd34a4..1807f89 100755
--- a/xorg-driver/xf86-video-intel/DEPENDS
+++ b/xorg-driver/xf86-video-intel/DEPENDS
@@ -31,7 +31,7 @@ if is_depends_enabled $SPELL libxvmc; then
depends xcb-util
fi &&
-optional_depends udev \
+optional_depends DEVICE-MANAGER \
"--enable-udev" \
"--disable-udev" \
"for udev-based monitor hotplug detection support"
diff --git a/xorg-driver/xf86-video-intel/HISTORY
b/xorg-driver/xf86-video-intel/HISTORY
index be43c2d..0a01ee6 100644
--- a/xorg-driver/xf86-video-intel/HISTORY
+++ b/xorg-driver/xf86-video-intel/HISTORY
@@ -1,3 +1,6 @@
+2015-02-11 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: UDEV -> DEVICE-MANAGER
+
2014-08-27 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: removed mesalib references, relying on configure as things
get too complicated with two mesalib spells of which one is the only
@@ -5,7 +8,7 @@
* DETAILS: required bump to 2.99.911 (old version fails because of
XDamage changes, apparently)
-2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
+2014-04-14 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: mesalib => MESALIB
2013-11-08 Vlad Glagolev <stealth AT sourcemage.org>
diff --git a/xorg-xserver/xorg-server/DEPENDS
b/xorg-xserver/xorg-server/DEPENDS
index 6d4ce13..94f3498 100755
--- a/xorg-xserver/xorg-server/DEPENDS
+++ b/xorg-xserver/xorg-server/DEPENDS
@@ -45,10 +45,32 @@ optional_depends libxvmc \
"--disable-xvmc" \
"Enable support for XvMC" &&
- optional_depends UDEV \
- "--enable-config-udev --disable-config-hal" \
+#
+# 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
+#
+# hal is preferred by upstream:
+# --enable-config-udev Build udev support (default: auto)
+# --enable-config-dbus Build D-BUS API support (default: no)
+# --disable-config-hal Build HAL support (default: auto)
+#
+
+message "You can either use hal+dbus OR udev for hotplugging" &&
+message "but NOT both" &&
+optional_depends hal \
+ "--enable-config-hal --enable-config-dbus --disable-config-udev" \
+ "--disable-config-hal --disable-config-dbus" \
+ "Enable HAL support" &&
+
+if ! is_depends_enabled $SPELL hal; then
+ optional_depends DEVICE-MANAGER \
+ "--enable-config-udev --disable-config-dbus --disable-config-hal" \
"--disable-config-udev" \
- "enable udev kernel config support" &&
+ "enable udev kernel config support"
+fi &&