[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1959-gb87f88d

[Gabriele Giacone]

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  b87f88df94dd8102f2e47cc443c9aa13e55f3741 (commit)
      from  bdc9e51af8adfeae091f1fbcf4ecc0ac9b732396 (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=b87f88df94dd8102f2e47cc443c9aa13e55f3741


commit b87f88df94dd8102f2e47cc443c9aa13e55f3741
Author: Gabriele Giacone <address@hidden>
Date:   Sun Apr 27 15:00:09 2014 +0200

    Fix build with --enable-sound=none.

diff --git a/gui/dump/dump.cpp b/gui/dump/dump.cpp
index 0ce5e68..ca7a607 100644
--- a/gui/dump/dump.cpp
+++ b/gui/dump/dump.cpp
@@ -174,10 +174,12 @@ DumpGui::init(int argc, char **argv[])
     _renderer.reset(create_Renderer_agg(_pixelformat.c_str()));
     _runResources.setRenderer(_renderer);
 
+#ifdef USE_SOUND
     sound::sound_handler* mixer = _runResources.soundHandler();
     media::MediaHandler* mh = _runResources.mediaHandler();
     _soundHandler.reset(new sound::NullSoundHandler(mh, mixer));
     _runResources.setSoundHandler(_soundHandler);
+#endif
 
     // We know what type of renderer it is.
     _agg_renderer = static_cast<Renderer_agg_base*>(_renderer.get());
@@ -308,6 +310,7 @@ DumpGui::writeFrame()
 void
 DumpGui::writeSamples()
 {
+#ifdef USE_SOUND
     sound::sound_handler* sh = _runResources.soundHandler();
 
     unsigned int ms = _clock.elapsed() - _startTime;
@@ -336,6 +339,7 @@ DumpGui::writeSamples()
         sh->fetchSamples(samples, n);
         toFetch -= n;
     }
+#endif
 
 }
 
diff --git a/gui/pythonmod/Makefile.am b/gui/pythonmod/Makefile.am
index 0b86da1..213a475 100644
--- a/gui/pythonmod/Makefile.am
+++ b/gui/pythonmod/Makefile.am
@@ -47,12 +47,18 @@ INCLUDES = \
 pkgpyexec_LTLIBRARIES = gnash.la
 
 GNASH_LIBS = \
-       $(top_builddir)/libmedia/libgnashmedia.la \
        $(top_builddir)/librender/libgnashrender.la \
-       $(top_builddir)/libsound/libgnashsound.la \
        $(top_builddir)/libcore/libgnashcore.la \
        $(top_builddir)/libbase/libgnashbase.la \
-       $(RENDERER_LIBS)
+
+if BUILD_LIBMEDIA
+GNASH_LIBS += $(top_builddir)/libmedia/libgnashmedia.la
+endif
+if BUILD_LIBSOUND
+GNASH_LIBS += $(top_builddir)/libsound/libgnashsound.la
+endif
+
+GNASH_LIBS += $(RENDERER_LIBS)
 
 gnash_la_LDFLAGS = -module -avoid-version initgnash -export-dynamic 
#-no-undefined
 gnash_la_LIBADD = \

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

Summary of changes:
 gui/dump/dump.cpp         |    4 ++++
 gui/pythonmod/Makefile.am |   12 +++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Gnash