diff options
| author | Arwed von Merkatz | 2009-12-05 11:34:12 +0100 |
|---|---|---|
| committer | Arwed von Merkatz | 2009-12-05 11:34:12 +0100 |
| commit | 36ccaa11a99d7234c3f740bec5fc2bf724f1a38b (patch) | |
| tree | f1e9d6c8e96170bcd2e944556709ad3864205bec | |
| parent | 1f8f25b585cfd937b2bef3a8c3c333c8b05acdae (diff) | |
gnome-games2: remove sound choices, optional_depend on libcanberra instead
| -rwxr-xr-x | gnome2-libs/gnome-games2/CONFIGURE | 13 | ||||
| -rwxr-xr-x | gnome2-libs/gnome-games2/DEPENDS | 7 | ||||
| -rw-r--r-- | gnome2-libs/gnome-games2/HISTORY | 5 |
3 files changed, 11 insertions, 14 deletions
diff --git a/gnome2-libs/gnome-games2/CONFIGURE b/gnome2-libs/gnome-games2/CONFIGURE index d5747d4d21..c650db53a1 100755 --- a/gnome2-libs/gnome-games2/CONFIGURE +++ b/gnome2-libs/gnome-games2/CONFIGURE @@ -1,14 +1,5 @@ -config_query GGAMES_SOUND "Enable sound?" y && - -if [[ "$GGAMES_SOUND" == "y" ]]; then - if spell_ok gstreamer; then - config_query_list GGAMES_SNDLIB "Use which sound library?" \ - gstreamer sdl_mixer - else - config_query_list GGAMES_SNDLIB "Use which sound library?" \ - sdl_mixer gstreamer - fi -fi && +# remove old sound choices, not supported anymore +persistent_remove GGAMES_SOUND GGAMES_SNDLIB config_query_list GGAMES_TLS "Which TLS library?" \ openssl gnutls && diff --git a/gnome2-libs/gnome-games2/DEPENDS b/gnome2-libs/gnome-games2/DEPENDS index 59273affde..5c835f6cad 100755 --- a/gnome2-libs/gnome-games2/DEPENDS +++ b/gnome2-libs/gnome-games2/DEPENDS @@ -35,6 +35,7 @@ optional_depends gobject-introspection \ "--enable-introspection=no" \ "to enable introspection for this build" && -if [[ "$GGAMES_SOUND" == "y" ]]; then - depends $GGAMES_SNDLIB "--enable-sound --with-sound=$GGAMES_SNDLIB" -fi +optional_depends -sub GTK libcanberra \ + "--with-sound=libcanberra" \ + "--without-sound" \ + "for sound support" diff --git a/gnome2-libs/gnome-games2/HISTORY b/gnome2-libs/gnome-games2/HISTORY index cda7d9bf48..0b2afacb47 100644 --- a/gnome2-libs/gnome-games2/HISTORY +++ b/gnome2-libs/gnome-games2/HISTORY @@ -1,3 +1,8 @@ +2009-12-05 Arwed v. Merkatz <v.merkatz@gmx.net> + * CONFIGURE: removed sound choices, only libcanberra works + * DEPENDS: removed sound choice code, optional_depends on libcanberra + for sound now + 2009-10-22 Ladislav Hagara <hgr@vabo.cz> * DEPENDS: added optional_depends gobject-introspection |