[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-338-g2f5b13b

[Rob Savoye]

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  2f5b13bc575240872bcec564a94f3026cdd1ee5e (commit)
       via  7b0937168fa0da983d9639c50502e4a8529fdf24 (commit)
      from  e3c511f47714ce0e503786f55cd34fea980af1bc (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=2f5b13bc575240872bcec564a94f3026cdd1ee5e


commit 2f5b13bc575240872bcec564a94f3026cdd1ee5e
Author: Rob Savoye <address@hidden>
Date:   Wed May 11 09:08:41 2011 -0600

    cleanup handling of libva libraries so they work for all guis.

diff --git a/gui/Makefile.am b/gui/Makefile.am
index 28e4347..9e3e634 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -77,6 +77,7 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/librender/opengl \
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libsound \
+       -I$(top_srcdir)/libvaapi \
        -DLOCALEDIR=\"$(localedir)\" \
        -DPLUGINSDIR=\"$(pluginsdir)\" \
        -DLIBAVCODEC_IDENT=\"$(LIBAVCODEC_IDENT)\" \
@@ -118,6 +119,16 @@ GNASH_LIBS = \
        $(top_builddir)/libmedia/libgnashmedia.la \
        $(top_builddir)/libbase/libgnashbase.la
 
+if HAVE_VAAPI
+GNASH_LIBS += \
+       $(top_builddir)/libvaapi/libgnashvaapi.la \
+       $(LIBVA_LIBS) \
+       $(LIBVA_X11_LIBS)
+if BUILD_OGL_RENDERER
+GNASH_LIBS += $(LIBVA_GLX_LIBS)
+endif   # BUILD_OGL_RENDERER
+endif   # USE_VAAPI
+
 LIB_FLAGS = -release $(VERSION)
 if WIN32
 LIB_FLAGS += --enable-auto-import
diff --git a/gui/gtk/gtk.am b/gui/gtk/gtk.am
index 1c83cc5..a658ba3 100644
--- a/gui/gtk/gtk.am
+++ b/gui/gtk/gtk.am
@@ -54,17 +54,6 @@ 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
-gtk_gnash_CPPFLAGS     += \
-       $(X11_CFLAGS) \
-       $(LIBVA_X11_CFLAGS) \
-       -I$(top_srcdir)/libvaapi \
-       $(NULL)
-gtk_gnash_LDADD += \
-       $(top_builddir)/libvaapi/libgnashvaapi.la \
-       $(X11_LIBS) \
-       $(LIBVA_LIBS) \
-       $(LIBVA_X11_LIBS) \
-       $(NULL)
 endif   # USE_VAAPI
 endif  # BUILD_AGG_RENDERER
 
diff --git a/gui/qt/qt4.am b/gui/qt/qt4.am
index 708bce8..5366a8e 100644
--- a/gui/qt/qt4.am
+++ b/gui/qt/qt4.am
@@ -55,7 +55,7 @@ qt4_gnash_LDADD = \
        $(GNASH_LIBS) \
        $(AM_LDFLAGS) \
        $(X11_LIBS) \
-       $(LIBVA_X11_LIBS)
+       $(NULL)
 
 if BUILD_OGL_RENDERER
 qt4_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
@@ -77,3 +77,4 @@ qt4_gnash_LDADD += 
$(top_builddir)/librender/libgnashrender.la \
        $(QT4_LIBS) $(AGG_LIBS)
 qt4_gnash_SOURCES += qt/Qt4GlueAgg.cpp qt/Qt4GlueAgg.h
 endif
+

http://git.savannah.gnu.org/cgit//commit/?id=7b0937168fa0da983d9639c50502e4a8529fdf24


commit 7b0937168fa0da983d9639c50502e4a8529fdf24
Author: Rob Savoye <address@hidden>
Date:   Wed May 11 09:07:39 2011 -0600

    don't always add the libva GLX library

diff --git a/libvaapi/Makefile.am b/libvaapi/Makefile.am
index 7d5283e..a22b386 100644
--- a/libvaapi/Makefile.am
+++ b/libvaapi/Makefile.am
@@ -31,6 +31,7 @@ libgnashvaapi_la_LIBADD = \
        $(BOOST_LIBS) \
        $(FFMPEG_LIBS) \
        $(LIBVA_LIBS) \
+       $(LIBVA_GLX_LIBS) \
        $(LIBVA_X11_LIBS) \
        $(NULL)
 

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

Summary of changes:
 gui/Makefile.am      |   11 +++++++++++
 gui/gtk/gtk.am       |   11 -----------
 gui/qt/qt4.am        |    3 ++-
 libvaapi/Makefile.am |    1 +
 4 files changed, 14 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Gnash