Source Mage code commit list

[Arwed von Merkatz <scm AT sourcemage.org>]

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

 gnome2-libs/gnome-games2/CONFIGURE |   13 ++-----------
 gnome2-libs/gnome-games2/DEPENDS   |    7 ++++---
 gnome2-libs/gnome-games2/HISTORY   |    5 +++++
 video-libs/schroedinger/DEPENDS    |    2 +-
 4 files changed, 12 insertions(+), 15 deletions(-)

New commits:
commit b3415c4b3a56576d5da567f8bf53d8c3993be3e4
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    schroedinger: added patch to compile with current gstreamer

commit 99b2b460a5c03c0ca3605c5eefb56ee424577640
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    Revert "schroedinger: added patch to compile with current gstreamer"
    
    included wrong changes, will redo
    
    This reverts commit 1f8f25b585cfd937b2bef3a8c3c333c8b05acdae.

commit 36ccaa11a99d7234c3f740bec5fc2bf724f1a38b
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

    gnome-games2: remove sound choices, optional_depend on libcanberra instead

diff --git a/gnome2-libs/gnome-games2/CONFIGURE 
b/gnome2-libs/gnome-games2/CONFIGURE
index d5747d4..c650db5 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 59273af..5c835f6 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 cda7d9b..0b2afac 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 AT 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 AT vabo.cz>
        * DEPENDS: added optional_depends gobject-introspection
 
diff --git a/video-libs/schroedinger/DEPENDS b/video-libs/schroedinger/DEPENDS
index 29b1de3..6829509 100755
--- a/video-libs/schroedinger/DEPENDS
+++ b/video-libs/schroedinger/DEPENDS
@@ -1,4 +1,4 @@
 depends pkgconfig  &&
 depends liboil     &&
-#optional_depends gstreamer '--enable-gstreamer' '--disable-gstreamer' 
'gstreamer plugin'  &&
+optional_depends gstreamer '--enable-gstreamer' '--disable-gstreamer' 
'gstreamer plugin'  &&
 optional_depends gtk-doc   '--enable-gtk-doc'   '--disable-gtk-doc' 'build 
documentation'