Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (aedd0f5c5a8bc0844f819ac3a9c00fd5b65d50d1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <ladislav.hagara AT unob.cz>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to devel-xorg-modular grimoire by Eric Sandall (aedd0f5c5a8bc0844f819ac3a9c00fd5b65d50d1)
  • Date: Sun, 12 Sep 2010 00:14:33 +0200


> GIT changes to devel-xorg-modular grimoire by Eric Sandall
> <sandalle AT sourcemage.org>:
>
> xorg-xserver/xorg-server/CONFIGURE | 8 ++------
> xorg-xserver/xorg-server/DEPENDS | 35
> +++++++++++++++++++++++++++--------
> xorg-xserver/xorg-server/HISTORY | 4 ++++
> 3 files changed, 33 insertions(+), 14 deletions(-)
>
> New commits:
> commit aedd0f5c5a8bc0844f819ac3a9c00fd5b65d50d1
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Commit: Eric Sandall <sandalle AT sourcemage.org>
>
> xorg-server: Optionally depends on udev for configuration support
> May only select udev xor (hal (preferred) or dbus)
>
> May only select one:
> configure: error: Hotplugging through both libudev and dbus/hal not
> allowed
>
> 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)
>
> commit 876c8362f723a69f0ca64dd0696faf0486b9ebd1
> Author: Eric Sandall <sandalle AT sourcemage.org>
> Commit: Eric Sandall <sandalle AT sourcemage.org>
>
> xorg-server: -multibuffer no longer an option remove query
> and from XORG_SERVER_OPTS
>
> diff --git a/xorg-xserver/xorg-server/CONFIGURE
> b/xorg-xserver/xorg-server/CONFIGURE
> index 166b4bc..4053ef4 100755
> --- a/xorg-xserver/xorg-server/CONFIGURE
> +++ b/xorg-xserver/xorg-server/CONFIGURE
> @@ -1,3 +1,5 @@
> +list_remove XORG_SERVER_OPTS "--enable-multibuffer" "--disable-multibuffer"
> +
> . $GRIMOIRE/config_query_multi.function
> config_query_option XORG_SERVER_OPTS
> \
> "Build documentation?"
> \
> @@ -85,12 +87,6 @@ config_query_option XORG_SERVER_OPTS
> \
> "--disable-xcalibrate"
> &&
>
> config_query_option XORG_SERVER_OPTS
> \
> - "Build Multibuffer extension?"
> \
> - y
> \
> - "--enable-multibuffer"
> \
> - "--disable-multibuffer"
> &&
> -
> -config_query_option XORG_SERVER_OPTS
> \
> "Build Xorg server?"
> \
> y
> \
> "--enable-xorg"
> \
> diff --git a/xorg-xserver/xorg-server/DEPENDS
> b/xorg-xserver/xorg-server/DEPENDS
> index f53047f..a57d760 100755
> --- a/xorg-xserver/xorg-server/DEPENDS
> +++ b/xorg-xserver/xorg-server/DEPENDS
> @@ -35,14 +35,33 @@ optional_depends libxvmc \
> "--enable-xvmc" \
> "--disable-xvmc" \
> "Enable support for XvMC" &&
> -optional_depends dbus \
> - "--enable-config-dbus" \
> - "--disable-config-dbus" \
> - "Enable D-BUS API support" &&
> -optional_depends hal \
> - "--enable-config-hal" \
> - "--disable-config-hal" \
> - "Enable HAL support" &&
> +
> +#
> +# May only select one:
> +# configure: error: Hotplugging through both libudev and dbus/hal not
> allowed
> +#
> +# 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)
> +#
> +optional_depends dbus \
> + "--enable-config-dbus --disable-config-udev" \
> + "--disable-config-dbus" \
> + "Enable D-BUS API support" &&
> +
> +optional_depends hal \
> + "--enable-config-hal --disable-config-udev" \
> + "--disable-config-hal" \
> + "Enable HAL support" &&
> +
> +if ! is_depends_enabled $SPELL hal &&
> + ! is_depends_enabled $SPELL dbus; then
> + optional_depends udev \
> + "--enable-config-udev" \
> + "--disable-config-udev" \
> + "enable udev kernel config support"
> +fi &&
>
> #optional_depends libdmx \
> # "--enable-dmx" \
> diff --git a/xorg-xserver/xorg-server/HISTORY
> b/xorg-xserver/xorg-server/HISTORY
> index 7492c95..f4bc487 100644
> --- a/xorg-xserver/xorg-server/HISTORY
> +++ b/xorg-xserver/xorg-server/HISTORY
> @@ -1,6 +1,10 @@
> 2010-09-04 Eric Sandall <sandalle AT sourcemage.org>
> * DETAILS: Updated to 1.9.0
> SOURCE matches upstream posted SHA1
> + * CONFIGURE: -multibuffer no longer an option remove query and from
> + XORG_SERVER_OPTS
> + * DEPENDS: Optionally depends on udev for configuration support
> + May only select udev xor (hal (preferred) or dbus)
>


hal preferred?
it is deprecated
http://www.x.org/wiki/XorgHAL

--
Ladislav Hagara




Archive powered by MHonArc 2.6.24.

Top of Page