Source Mage code commit list

[Pol Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pol Vinogradov <vin.public AT gmail.com>:

 http/gnash/DEPENDS |   14 ++++++++------
 http/gnash/HISTORY |    1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 79cb86a488f936b546ccebfd9334036e07457015
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

    http/gnash: fixed cairo double dependency

diff --git a/http/gnash/DEPENDS b/http/gnash/DEPENDS
index 2dec224..e70e36b 100755
--- a/http/gnash/DEPENDS
+++ b/http/gnash/DEPENDS
@@ -10,11 +10,11 @@ depends  zlib                               &&
 #
 # Video rendering
 #
-case "$GNASH_RENDERER" in
-  opengl) depends OPENGL "--enable-renderer=ogl";;
-   cairo) depends cairo "--enable-renderer=cairo";;
-       *) depends agg "--enable-renderer=agg";;
-esac                                        &&
+if [[ "$GNASH_RENDERER" == "opengl" ]]; then
+  depends OPENGL "--enable-renderer=ogl"
+else
+  depends $GNASH_RENDERER "--enable-renderer=$GNASH_RENDERER"
+fi                                          &&
 
 #
 # Media rendering
@@ -32,7 +32,9 @@ fi  &&
 #
 if   [[ "${GNASH_GUI}" == "GTK" ]]; then
   depends  atk                           &&
-  depends  cairo                         &&
+  if [[ "$GNASH_RENDERER" != "cairo" ]]; then
+    depends  cairo
+  fi                                     &&
   depends  GTK2      '--enable-gui=gtk'  &&
   depends  gtkglext  '--enable-glext'    &&
   depends  pango
diff --git a/http/gnash/HISTORY b/http/gnash/HISTORY
index 8fad12b..ee20077 100644
--- a/http/gnash/HISTORY
+++ b/http/gnash/HISTORY
@@ -1,5 +1,6 @@
 2010-02-19 Pol Vinogradov <vin.public AT gmail.com>
        * CONFIGURE, BUILD: moved OPTS modifying code to BUILD according 
policy
+       * DEPENDS: fixed cairo double dependency
 
 2010-02-19 Pol Vinogradov <vin.public AT gmail.com>
        * CONFIGURE: options for Cygnal server, removed redundancy