[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-464-g6fdc3fb

[Sandro Santilli]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  6fdc3fb562032c84719a6d05e2cbe6476ac3c1a8 (commit)
      from  3f30a6b8436f5ffe17c34ab3a9a0fd602c15337e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=6fdc3fb562032c84719a6d05e2cbe6476ac3c1a8


commit 6fdc3fb562032c84719a6d05e2cbe6476ac3c1a8
Author: Jonas 'Sortie' Termansen <address@hidden>
Date:   Sat Jul 9 23:04:39 2011 +0200

    Fixed building GTK without AGG, but rather OpenGL.
    
    Some misplaced macros broke compliation when configuring with
    --enable-gui=gtk --enable-renderer=opengl

diff --git a/gui/gtk/gtk_canvas.cpp b/gui/gtk/gtk_canvas.cpp
index 78e94af..c6c740a 100644
--- a/gui/gtk/gtk_canvas.cpp
+++ b/gui/gtk/gtk_canvas.cpp
@@ -254,6 +254,7 @@ gnash_canvas_setup(GnashCanvas *canvas, std::string& 
hwaccel,
         // rendering performance issues.
         // Use LibVva, which works on Nvidia, AT, or Intel 965 GPUs
         // with AGG or OpenGL.
+#ifdef RENDERER_AGG
 #ifdef HAVE_VA_VA_H
         if (hwaccel == "vaapi") {
             canvas->glue.reset(new gnash::GtkAggVaapiGlue);
@@ -261,7 +262,6 @@ gnash_canvas_setup(GnashCanvas *canvas, std::string& 
hwaccel,
             // if initializing fails.
         } else
 #endif
-#ifdef RENDERER_AGG
         {
             canvas->glue.reset(new gnash::GtkAggGlue);
         }

-----------------------------------------------------------------------

Summary of changes:
 gui/gtk/gtk_canvas.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash