[Gnash-commit] [SCM] Gnash branch, hwaccel, updated. release_0_8_9_start-932-g4c7fde5

[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, hwaccel has been updated
       via  4c7fde5a36f699080924b704d9aacafeaaa7b32f (commit)
       via  6dca10c521084891a58b2ff1da44df65990f0b3a (commit)
       via  3a2f973aa4f873ddc03555ffd57056134c233691 (commit)
       via  f05022aca2c14022a942d36a22764fae4b8f00c0 (commit)
       via  7708095e73bd1d5827ac25d65a6a440e065f24a3 (commit)
       via  44c82afe99bd02696c3d79731da18c5c55e7a7b3 (commit)
       via  c6470ee08a5edb0706e0332c9a646951ccfc86a4 (commit)
       via  fe94887b8c648fd3eb4b1030091e5b45a54c15d1 (commit)
       via  4a73cf37d252a68631c0d401a4aa743543c7a6c6 (commit)
       via  73a370d1aa3f519429c89a6acaf589f65920f3c2 (commit)
       via  6da65a7bd31a1dd16ecc74e9c8a5ffb81e5dbb21 (commit)
       via  bf4a7390d3854696624651dbaa6af91be66eddb3 (commit)
       via  e69186a36c786c117151d4855de514a059522d06 (commit)
       via  180013c18f0790387efe1e26b5d56d7c710e0c2f (commit)
      from  d56072bc6240d043e2208fd81e754b650851b367 (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=4c7fde5a36f699080924b704d9aacafeaaa7b32f


commit 4c7fde5a36f699080924b704d9aacafeaaa7b32f
Merge: d56072b 6dca10c
Author: Rob Savoye <address@hidden>
Date:   Sun Apr 3 21:43:28 2011 -0600

    merge with master

diff --cc gui/Makefile.am
index 53d249d,28e4347..106e55e
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@@ -75,15 -81,9 +75,16 @@@ AM_CPPFLAGS = 
        -DPLUGINSDIR=\"$(pluginsdir)\" \
        -DLIBAVCODEC_IDENT=\"$(LIBAVCODEC_IDENT)\" \
        $(BOOST_CFLAGS) \
+       $(PTHREAD_CFLAGS) \
        $(NULL)
  
 +if BUILD_EGL_DEVICE
 +AM_CPPFLAGS += $(EGL_CFLAGS)
 +endif
 +if BUILD_DIRECTFB_DEVICE
 +AM_CPPFLAGS += $(DIRECTFB_CFLAGS)
 +endif
 +
  GTK_CFLAGS = \
        $(GTK2_CFLAGS) \
        $(GLEXT_CFLAGS) \
@@@ -230,25 -218,3 +219,20 @@@ bundle: Info.plist aqua-gnas
        cp -f aqua-gnash $(bundle_name)/Contents/MacOS/Gnash
        cp -f images/GnashG.icns $(bundle_name)/Contents/Resources/
  
- # Rebuild with GCC 4.x Mudflap support
- mudflap:
-       @echo "Rebuilding with GCC Mudflap support"
-       $(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
- 
 +clean-hook:
 +      -rm -f core.* $(CLEANFILES)
 +
 +if ENABLE_DEVELOPER_TESTS
 +check_PROGRAMS = test_glue
 +
 +test_glue_SOURCES = \
 +      test_glue.cpp \
 +      fb/fb_glue_agg.cpp \
 +      fb/fb_glue_ovg.cpp
 +test_glue_CPPFLAGS = \
 +      -DFAKEFB=\"$(FAKEFB)\" \
 +      $(AM_CPPFLAGS) \
 +      $(DIRECTFB_CFLAGS)
 +#       -DUSE_TESTSUITE
 +test_glue_LDADD = $(GNASH_LIBS)
 +endif
diff --cc librender/Makefile.am
index e19f635,a4c3fcf..ca6421f
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@@ -33,7 -33,7 +33,8 @@@ AM_CPPFLAGS = -I.. 
        -I$(top_srcdir)/libcore/swf \
        -I$(top_srcdir)/libbase \
        -I$(top_srcdir)/librender \
 +      -I$(top_srcdir)/libdevice \
+       $(PTHREAD_CFLAGS) \
        $(BOOST_CFLAGS) \
        $(OPENGL_CFLAGS) \
        $(AGG_CFLAGS) \
@@@ -121,14 -83,6 +122,9 @@@ libgnashrender_la_SOURCES += 
  libgnashrender_la_LIBADD += $(CAIRO_LIBS)
  endif
  
- # Rebuild with GCC 4.x Mudflap support
- mudflap:
-       @echo "Rebuilding with GCC Mudflap support"
-       $(MAKE) CXXFLAGS="`$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
- 
 +clean-hook:
 +      -rm -f core.*
 +
  if ENABLE_PCH
  AM_CXXFLAGS = $(PCH_FLAGS)
  endif
diff --cc utilities/Makefile.am
index fbd691b,ef0eb02..0c858ad
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@@ -64,15 -63,9 +64,16 @@@ AM_CPPFLAGS = 
        $(GSTREAMER_PLUGINS_BASE_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(BOOST_CFLAGS) \
+       $(PTHREAD_CFLAGS) \
        $(NULL)
  
 +if BUILD_EGL_DEVICE
 +AM_CPPFLAGS += $(EGL_CFLAGS)
 +endif
 +if BUILD_DIRECTFB_DEVICE
 +AM_CPPFLAGS += $(DIRECTFB_CFLAGS)
 +endif
 +
  if WIN32
    GNASH_LIBS += -lintl -lz -lws2_32
  endif

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

Summary of changes:
 configure.ac                       |    7 -------
 extensions/fileio/Makefile.am      |    1 +
 extensions/gtk2/Makefile.am        |    1 +
 gui/Makefile.am                    |   20 ++------------------
 gui/Player.cpp                     |    5 -----
 gui/Player.h                       |    1 -
 gui/dump/Makefile.am               |   12 +-----------
 gui/fb/Makefile.am                 |   12 +-----------
 libbase/GnashException.h           |   22 ----------------------
 libbase/Makefile.am                |    5 -----
 libbase/RTMP.cpp                   |    2 +-
 libcore/DisplayObject.cpp          |   12 ++++++------
 libcore/Makefile.am                |   20 +-------------------
 libcore/PropertyList.h             |    3 +--
 libcore/TextField.cpp              |    1 -
 libcore/builtin_function.h         |    1 -
 libcore/parser/Makefile.am         |   19 +------------------
 libcore/parser/action_buffer.h     |    1 -
 libcore/vm/ASHandlers.h            |    1 -
 libcore/vm/ActionExec.cpp          |   22 +++++++++-------------
 libcore/vm/Makefile.am             |   13 +------------
 libmedia/Makefile.am               |    9 +--------
 librender/Makefile.am              |    6 +-----
 libsound/Makefile.am               |    9 +--------
 macros/ffmpeg.m4                   |    3 +++
 plugin/aos4/Makefile.am            |    2 --
 plugin/win32/Makefile.am           |    2 --
 testsuite/libbase.all/Makefile.am  |    1 +
 testsuite/libmedia.all/Makefile.am |    1 +
 utilities/Makefile.am              |   24 +-----------------------
 30 files changed, 35 insertions(+), 203 deletions(-)


hooks/post-receive
-- 
Gnash