[Gnash-commit] [SCM] Gnash branch, master, updated. 1d35dcd5e8481f6c39f4155b800b7f1de930d57f

[Benjamin Wolsey]

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  1d35dcd5e8481f6c39f4155b800b7f1de930d57f (commit)
       via  12aa2cda012df56e7e3f60eaa2b4e447f1a35148 (commit)
       via  1fef65814a3a09ea3af0d16983aed3b558a468cd (commit)
      from  3a1604e5ab586b0c10a1020ed1db72e1cd232f11 (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=1d35dcd5e8481f6c39f4155b800b7f1de930d57f


commit 1d35dcd5e8481f6c39f4155b800b7f1de930d57f
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Sep 1 09:37:42 2010 +0200

    AM_CXXFLAGS includes CXXFLAGS already.

diff --git a/libmedia/Makefile.am b/libmedia/Makefile.am
index fc4e9b4..71a7d53 100644
--- a/libmedia/Makefile.am
+++ b/libmedia/Makefile.am
@@ -21,7 +21,7 @@ EXTRA_DIST =
 # this is where Gnash plugins get installed
 pluginsdir = $(prefix)/lib/gnash/plugins
 
-AM_CXXFLAGS = $(CXXFLAGS) -DREGISTER_MEDIA_HANDLERS
+AM_CXXFLAGS = -DREGISTER_MEDIA_HANDLERS
 
 #if INSTALL_LTDL
 #LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h

http://git.savannah.gnu.org/cgit//commit/?id=12aa2cda012df56e7e3f60eaa2b4e447f1a35148


commit 12aa2cda012df56e7e3f60eaa2b4e447f1a35148
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Sep 1 09:26:42 2010 +0200

    Use a custom key to improve testsuite reliability.

diff --git a/testsuite/gnashrc.in b/testsuite/gnashrc.in
index 73d610c..d15b443 100644
--- a/testsuite/gnashrc.in
+++ b/testsuite/gnashrc.in
@@ -53,4 +53,7 @@ set Renderer
 # Use the default MediaHandler
 set MediaHandler
 
+# Use a custom key to prevent conflicts with a running plugin
+set LCShmkey 138765373
+
 # TODO: enable extensions ?

http://git.savannah.gnu.org/cgit//commit/?id=1fef65814a3a09ea3af0d16983aed3b558a468cd


commit 1fef65814a3a09ea3af0d16983aed3b558a468cd
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Sep 1 09:25:53 2010 +0200

    Add gstreamer flags for fedora 13.

diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 857f9b5..dc00cbe 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -139,7 +139,13 @@ rtmpget_LDADD =  $(GNASH_LIBS) $(AM_LDFLAGS)
 #dumpshm_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
 
 if USE_GST_ENGINE
- GST_STUFF = $(GSTPBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) 
$(GSTREAMER_LIBS) 
+ GST_STUFF = \
+       $(GSTPBUTILS_LIBS) \
+       $(GSTREAMER_PLUGINS_BASE_LIBS) \
+       $(GSTREAMER_LIBS) \
+       $(GSTAPP_CFLAGS) \
+       $(NULL)
+
  findwebcams_SOURCES = findwebcams.cpp
  findwebcams_LDADD = $(GST_STUFF) $(GNASH_LIBS) $(AM_LDFLAGS)
 

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

Summary of changes:
 libmedia/Makefile.am  |    2 +-
 testsuite/gnashrc.in  |    3 +++
 utilities/Makefile.am |    8 +++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Gnash