[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-354-g0688c32

[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  0688c3274802591588a6e7c324ff63bfb59390d9 (commit)
      from  fd373fe129baba3523cc5a612b941ba62ea7bb94 (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=0688c3274802591588a6e7c324ff63bfb59390d9


commit 0688c3274802591588a6e7c324ff63bfb59390d9
Author: Sandro Santilli <address@hidden>
Date:   Wed May 25 09:47:38 2011 +0200

    USE_VAAPI conditional is not being used, so don't define it... This is 
trying to reduce confusion while debugging bug #33393

diff --git a/configure.ac b/configure.ac
index 1c888a4..77a5b46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1084,7 +1084,7 @@ dnl libVA drivers. We declare conditional for both the 
option being
 dnl selected, as well as whether or not it's found. This we can
 dnl generate better error handling if it's not found.
 AM_CONDITIONAL(BUILD_OMAP, test x"${build_omap}" = xyes)
-AM_CONDITIONAL(USE_VAAPI, test x"${use_libva}" = xyes)
+dnl AM_CONDITIONAL(USE_VAAPI, test x"${use_libva}" = xyes) dnl UNUSED! 
 
 dnl Only build the vaapi support if we have a version of FFmpeg that
 dnl supports it.
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 9e3e634..0f77f0c 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -127,7 +127,7 @@ GNASH_LIBS += \
 if BUILD_OGL_RENDERER
 GNASH_LIBS += $(LIBVA_GLX_LIBS)
 endif   # BUILD_OGL_RENDERER
-endif   # USE_VAAPI
+endif   # HAVE_VAAPI
 
 LIB_FLAGS = -release $(VERSION)
 if WIN32
diff --git a/gui/gtk/gtk.am b/gui/gtk/gtk.am
index a658ba3..d92f30b 100644
--- a/gui/gtk/gtk.am
+++ b/gui/gtk/gtk.am
@@ -54,7 +54,7 @@ gtk_gnash_LDADD += $(GNASH_LIBS) \
 if HAVE_VAAPI
 noinst_HEADERS         += gtk/gtk_glue_agg_vaapi.h
 gtk_gnash_SOURCES      += gtk/gtk_glue_agg_vaapi.cpp
-endif   # USE_VAAPI
+endif   # HAVE_VAAPI
 endif  # BUILD_AGG_RENDERER
 
 if BUILD_CAIRO_RENDERER

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

Summary of changes:
 configure.ac    |    2 +-
 gui/Makefile.am |    2 +-
 gui/gtk/gtk.am  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash