diff options
| author | Vlad Glagolev | 2015-02-11 18:10:31 +0300 |
|---|---|---|
| committer | Vlad Glagolev | 2015-02-11 18:10:31 +0300 |
| commit | 01317669fe327e50ba03ff3ce15352ffa6e37479 (patch) | |
| tree | ae65a02bc7041c237db195167108420d4cbd224c /xorg-xserver | |
| parent | e3c378e5017903b95b8ffff964b691861d467837 (diff) | |
| parent | 6bb0aa644327af60df0779dcd06cb7782d7559ca (diff) | |
Merge branch 'master' into devel-xorg-modular
Conflicts:
libs/sdl2/HISTORY
xorg-driver/xf86-video-intel/DEPENDS
xorg-driver/xf86-video-intel/HISTORY
xorg-xserver/xorg-server/DEPENDS
xorg-xserver/xorg-server/HISTORY
Diffstat (limited to 'xorg-xserver')
| -rwxr-xr-x | xorg-xserver/xorg-server/DEPENDS | 28 | ||||
| -rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 7 |
2 files changed, 30 insertions, 5 deletions
diff --git a/xorg-xserver/xorg-server/DEPENDS b/xorg-xserver/xorg-server/DEPENDS index 6d4ce13442..94f3498826 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 && optional_depends dmxproto \ "--enable-dmx" \ diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index 9037c61043..3cac2fa3de 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,6 @@ +2015-02-11 Vlad Glagolev <stealth@sourcemage.org> + * DEPENDS: UDEV -> DEVICE-MANAGER + 2015-02-11 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: 1.17.1 SECURITY_PATCH=9 fix CVE-2015-0255 @@ -40,7 +43,7 @@ 2014-08-24 Thomas Orgis <sobukus@sourcemage.org> * DEPENDS: needs xcb cruft to build -2014-08-19 Treeve Jelbert <treeve@sourcemage.org> +2014-08-19 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: openssl => SSL * SUB_DEPENDS, PRE_SUB_DEPENDS: openssl => SSL @@ -54,7 +57,7 @@ * SUB_DEPENDS, PRE_SUB_DEPENDS: add glamor support * DEPENDS: add libepoxy, optional wayland, nettle -2014-04-14 Treeve Jelbert <treeve@sourcemage.org> +2014-04-14 Treeve Jelbert <treeve@sourcemage.org> * DEPENDS: mesalib => MESALIB 2014-04-14 Treeve Jelbert <treeve@sourcemage.org> |