Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (4e8b53a1690d8ebb563a5ac3993a8bd48e5d601d)

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: Vasil Yonkov <spirtbrat AT sourcemage.org>
  • Cc: "sm-commit AT lists.ibiblio.org" <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (4e8b53a1690d8ebb563a5ac3993a8bd48e5d601d)
  • Date: Tue, 24 Nov 2009 00:51:31 +0100

Hi,
thanks for dependencies cleaning.

> GIT changes to master grimoire by Vasil Yonkov <spirtbrat AT sourcemage.org>:
>
> audio-players/rhythmbox/DEPENDS | 3 ++-
> audio-players/rhythmbox/HISTORY | 3 +++
> gnome2-libs/gnome-media2/BUILD | 13 ++++++++++---
> gnome2-libs/gnome-media2/CONFIGURE | 3 +--
> gnome2-libs/gnome-media2/HISTORY | 3 +++
> gnome2-libs/gnome-media2/PRE_SUB_DEPENDS | 5 +++++
> gnome2-libs/gnome-media2/SUB_DEPENDS | 9 +++++++++
> 7 files changed, 33 insertions(+), 6 deletions(-)
>
> New commits:
> commit 4e8b53a1690d8ebb563a5ac3993a8bd48e5d601d
> Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
> Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>
>
> rhythmbox: require gnome-media2 with profiles, added libsoup as
> dependency
>
> diff --git a/audio-players/rhythmbox/DEPENDS
> b/audio-players/rhythmbox/DEPENDS
> index d8aa1fb..04a0ca3 100755
> --- a/audio-players/rhythmbox/DEPENDS
> +++ b/audio-players/rhythmbox/DEPENDS
> @@ -2,7 +2,8 @@ depends totem &&
> depends nautilus-cd-burner &&
> depends gst-plugins-base &&
> depends dbus-glib &&
> -depends gnome-media2 &&
> +depends -sub PROFILES gnome-media2 &&
> +depends libsoup &&
>
> optional_depends "libgpod" \
> "--with-ipod" \
> diff --git a/audio-players/rhythmbox/HISTORY
> b/audio-players/rhythmbox/HISTORY
> index f8365ee..66a78f1 100644
> --- a/audio-players/rhythmbox/HISTORY
> +++ b/audio-players/rhythmbox/HISTORY
> @@ -1,3 +1,6 @@
> +2009-11-22 Vasil Yonkov <spirtbrat AT sourcemage.org>
> + * DEPENDS: added libsoup, request gnome-media2 with profiles
> +
> 2009-09-18 Ladislav Hagara <hgr AT vabo.cz>
> * DETAILS: 0.12.5
>
> diff --git a/gnome2-libs/gnome-media2/BUILD b/gnome2-libs/gnome-media2/BUILD
> index c61ae5d..a607ca9 100755
> --- a/gnome2-libs/gnome-media2/BUILD
> +++ b/gnome2-libs/gnome-media2/BUILD
> @@ -1,4 +1,11 @@
> -OPTS="$OPTS $GMEDIA_IPV6 $GMEDIA_GMP $GMEDIA_GSR" &&
> -OPTS="$OPTS $GMEDIA_GSTPROPS $GMEDIA_GSTMIXR " &&
> +OPTS="$OPTS $GMEDIA_IPV6 $GMEDIA_GSR" &&
>
> -default_build
> \ No newline at end of file
> +if [[ $GMEDIA_GMP == y ]]; then
> + OPTS="$OPTS --enable-profiles"
> +else
> + OPTS="$OPTS --disable-profiles"
> +fi &&
> +
> +OPTS="$OPTS $GMEDIA_GSTPROPS $GMEDIA_GSTMIXR " &&
> +
> +default_build
> diff --git a/gnome2-libs/gnome-media2/CONFIGURE
> b/gnome2-libs/gnome-media2/CONFIGURE
> index 4e4b72d..51ac035 100755
> --- a/gnome2-libs/gnome-media2/CONFIGURE
> +++ b/gnome2-libs/gnome-media2/CONFIGURE
> @@ -1,8 +1,7 @@
> config_query_option GMEDIA_IPV6 "Enable IPv6 Support?" n \
> "--enable-ipv6" "--disable-ipv6" &&
>
> -config_query_option GMEDIA_GMP "Enable GNOME media profiles?" y \
> - "--enable-profiles" "--disable-profiles" &&
> +config_query GMEDIA_GMP "Enable GNOME media profiles?" y &&
>


BTW, why have you replaced config_query_option by config_query?
In PRE_SUB_DEPENDS you can use

[[ "$GMEDIA_GMP" == "--enable-profiles" ]] ...

--
Ladislav Hagara


>
> config_query_option GMEDIA_GSR "Enable GNOME sound recorder?" y \
> "--enable-grecord" "--disable-grecord" &&
> diff --git a/gnome2-libs/gnome-media2/HISTORY
> b/gnome2-libs/gnome-media2/HISTORY
> index 534c9b2..4b2d746 100644
> --- a/gnome2-libs/gnome-media2/HISTORY
> +++ b/gnome2-libs/gnome-media2/HISTORY
> @@ -1,3 +1,6 @@
> +2009-11-21 Vasil Yonkov <spirtbrat AT sourcemage.org>
> + * SUB_DEPENDS, PRE_SUB_DEPENDS: added, with GMEDIA_GMP support
> +
> 2009-10-07 Ladislav Hagara <hgr AT vabo.cz>
> * DETAILS: 2.28.1
>
> diff --git a/gnome2-libs/gnome-media2/PRE_SUB_DEPENDS
> b/gnome2-libs/gnome-media2/PRE_SUB_DEPENDS
> new file mode 100755
> index 0000000..903236f
> --- /dev/null
> +++ b/gnome2-libs/gnome-media2/PRE_SUB_DEPENDS
> @@ -0,0 +1,5 @@
> +case $THIS_SUB_DEPENDS in
> + PROFILES) [[ $GMEDIA_GMP == y ];;
> + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
> $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
> + return 1;;
> +esac
> diff --git a/gnome2-libs/gnome-media2/SUB_DEPENDS
> b/gnome2-libs/gnome-media2/SUB_DEPENDS
> new file mode 100755
> index 0000000..5491e6b
> --- /dev/null
> +++ b/gnome2-libs/gnome-media2/SUB_DEPENDS
> @@ -0,0 +1,9 @@
> +case $THIS_SUB_DEPENDS in
> + PROFILES) if [[ $GMEDIA_GMP != y ]]; then
> + message "GNOME media profiles requested, forcing
> dependency" &&
> + GMEDIA_GMP=y
> + fi
> + ;;
> + *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
> $THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
> + return 1;;
> +esac





Archive powered by MHonArc 2.6.24.

Top of Page