[Gnash-commit] [SCM] Gnash branch, master, updated. 06d5ce9c54e579ad60f6653f4cd84c5a4ef861c2

[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  06d5ce9c54e579ad60f6653f4cd84c5a4ef861c2 (commit)
       via  cf84521f17b6f546c5c9c11f79cb09a2a212b502 (commit)
      from  5f46b3cf5acbadf825921950527a991f5d629380 (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=06d5ce9c54e579ad60f6653f4cd84c5a4ef861c2


commit 06d5ce9c54e579ad60f6653f4cd84c5a4ef861c2
Author: Sandro Santilli <address@hidden>
Date:   Sun Dec 19 15:40:35 2010 +0100

    Oops, forgot this

diff --git a/gui/dump/Makefile.am b/gui/dump/Makefile.am
new file mode 100644
index 0000000..40ec664
--- /dev/null
+++ b/gui/dump/Makefile.am
@@ -0,0 +1,117 @@
+## Process this file with automake to generate Makefile.in
+# 
+#   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# 
+
+#
+# Build the DUMP gui
+#
+
+AUTOMAKE_OPTIONS = -Wno-portability
+
+if BUILD_FB_GUI
+
+# top_builddir and top_srcdir are for revno.h; its location depends on
+# whether we're building from a snapshot or a checkout.
+AM_CPPFLAGS = \
+       -I$(top_builddir) \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/gui \
+       -I$(top_srcdir)/libnet \
+       -I$(top_srcdir)/libcore \
+       -I$(top_srcdir)/libcore/swf \
+       -I$(top_srcdir)/libcore/parser \
+       -I$(top_srcdir)/libcore/vm \
+       -I$(top_srcdir)/libcore/asobj \
+       -I$(top_srcdir)/libltdl \
+       -I$(top_srcdir)/libbase \
+       -I$(top_srcdir)/librender \
+       -I$(top_srcdir)/librender/agg \
+       -I$(top_srcdir)/librender/cairo \
+       -I$(top_srcdir)/librender/opengl \
+       -I$(top_srcdir)/libmedia \
+       -I$(top_srcdir)/libsound \
+       -DLOCALEDIR=\"$(localedir)\" \
+       -DPLUGINSDIR=\"$(pluginsdir)\" \
+       -DLIBAVCODEC_IDENT=\"$(LIBAVCODEC_IDENT)\" \
+       $(GLIB_CFLAGS) \
+       $(LIRC_CFLAGS) \
+       $(BOOST_CFLAGS) \
+       $(PYTHON_LIBS) \
+       $(PTHREAD_CFLAGS) \
+       $(NULL)
+
+AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
+AM_CPPFLAGS += -DRENDERER_CONFIG="\"$(RENDERER_CONFIG)\""
+AM_CPPFLAGS += -DHWACCEL_CONFIG="\"$(HWACCEL_CONFIG)\""
+AM_CPPFLAGS += -DMEDIA_CONFIG="\"$(MEDIA_CONFIG)\""
+AM_CPPFLAGS += -DCONFIG_CONFIG="\"$(shell cat ../../.configline)\""
+AM_CPPFLAGS += -DCXXFLAGS="\"$(CXXFLAGS)\"" 
+
+## WARNING: make sure GLIB_LIBS appears first
+## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
+AM_LDFLAGS =  \
+       -export-dynamic \
+       $(GLIB_LIBS) \
+       $(CURL_LIBS) \
+       $(JPEG_LIBS) \
+       $(PNG_LIBS) \
+       $(LIRC_LIBS) \
+       $(MYSQL_LIBS) \
+       $(INTLLIBS) \
+       $(TS_LIBS) \
+       $(BOOST_LIBS) \
+       $(PTHREAD_LIBS) \
+       $(NULL)
+
+if USE_FFMPEG_ENGINE
+AM_LDFLAGS += $(FFMPEG_LIBS) $(LIBVA_LIBS) $(LIBVA_X11_LIBS) 
+AM_CPPFLAGS += $(FFMPEG_CFLAGS) 
+endif
+
+if USE_GST_ENGINE
+GST_STUFF = $(GSTREAMER_PBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) 
$(GSTREAMER_LIBS)
+AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
+AM_LDFLAGS += $(GST_STUFF)
+endif
+
+GNASH_LIBS = \
+       $(top_builddir)/libcore/libgnashcore.la \
+       $(top_builddir)/librender/libgnashrender.la \
+       $(top_builddir)/libsound/libgnashsound.la \
+       $(top_builddir)/libmedia/libgnashmedia.la \
+       $(top_builddir)/libbase/libgnashbase.la
+
+
+bin_PROGRAMS = dump-gnash
+
+# TODO: stop using these  ?
+GUI_SRCS = ../gnash.cpp \
+       ../gui.cpp ../gui.h \
+       ../Player.cpp ../Player.h \
+       ../NullGui.cpp ../NullGui.h \
+       ../ScreenShotter.cpp ../ScreenShotter.h \
+       $(NULL)
+
+dump_gnash_SOURCES = $(GUI_SRCS) gui_dump.cpp dump.cpp dump.h
+dump_gnash_CPPFLAGS = -DGUI_DUMP -DGUI_CONFIG=\"DUMP\" \
+       $(AM_CPPFLAGS)  \
+       $(AGG_CFLAGS)
+dump_gnash_LDADD = \
+       $(GNASH_LIBS) \
+       $(AGG_LIBS) 
+
+endif                          # BUILD_FB_GUI

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


commit cf84521f17b6f546c5c9c11f79cb09a2a212b502
Author: Sandro Santilli <address@hidden>
Date:   Sun Dec 19 15:13:52 2010 +0100

    dump-gui fully moved in its dir

diff --git a/configure.ac b/configure.ac
index 1a3729b..27daed6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2979,6 +2979,7 @@ testsuite/libcore.all/Makefile
 testsuite/libmedia.all/Makefile
 gui/Makefile
 gui/fb/Makefile
+gui/dump/Makefile
 gui/Info.plist
 gui/pythonmod/Makefile
 extensions/Makefile
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 7448bef..4e997b7 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -22,7 +22,7 @@
 
 AUTOMAKE_OPTIONS = -Wno-portability
 
-DIST_SUBDIRS = pythonmod fb
+DIST_SUBDIRS = pythonmod fb dump
 
 # Build the current directory first. It's hard to see, but there is a '.' dot 
here.
 SUBDIRS = . fb
@@ -31,6 +31,10 @@ if BUILD_FB_GUI
 SUBDIRS += fb
 endif
 
+if BUILD_DUMP_GUI
+SUBDIRS += dump
+endif
+
 # If python support is enabled, built that too
 if HAS_PYTHON
 SUBDIRS += pythonmod
@@ -253,11 +257,6 @@ if BUILD_GTK_GUI
 include $(srcdir)/gtk/gtk.am
 endif
 
-# Build the DUMP gui
-if BUILD_DUMP_GUI
-include $(srcdir)/dump/dump.am
-endif
-
 # Build the RISCOS gui
 if BUILD_RISCOS_GUI
 include $(srcdir)/riscos/riscos.am
diff --git a/gui/dump/dump.am b/gui/dump/dump.am
deleted file mode 100644
index d33f33d..0000000
--- a/gui/dump/dump.am
+++ /dev/null
@@ -1,28 +0,0 @@
-# 
-#   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# 
-
-#
-# Build the DUMP gui
-#
-if BUILD_DUMP_GUI
-bin_PROGRAMS += dump-gnash
-dump_gnash_SOURCES = $(GUI_SRCS) dump/gui_dump.cpp dump/dump.cpp dump/dump.h
-dump_gnash_CPPFLAGS = -DGUI_DUMP -DGUI_CONFIG=\"DUMP\" \
-       $(AM_CPPFLAGS) $(DUMP_CFLAGS) $(AGG_CFLAGS)
-dump_gnash_LDFLAGS = -export-dynamic $(AM_LDFLAGS) 
-dump_gnash_LDADD = $(GNASH_LIBS) $(DUMP_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
-endif                          # BUILD_DUMP_GUI

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

Summary of changes:
 configure.ac                 |    1 +
 gui/Makefile.am              |   11 ++++----
 gui/{fb => dump}/Makefile.am |   53 ++++++++++-------------------------------
 gui/dump/dump.am             |   28 ----------------------
 4 files changed, 19 insertions(+), 74 deletions(-)
 copy gui/{fb => dump}/Makefile.am (74%)
 delete mode 100644 gui/dump/dump.am


hooks/post-receive
-- 
Gnash