[Gnash-commit] [SCM] Gnash branch, master, updated. 25d5a4bdb6f3feb9a884481b7a96a123f38b31dd

[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  25d5a4bdb6f3feb9a884481b7a96a123f38b31dd (commit)
      from  56046006b64572d2d738f988e3f77e8cc722a0f4 (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=25d5a4bdb6f3feb9a884481b7a96a123f38b31dd


commit 25d5a4bdb6f3feb9a884481b7a96a123f38b31dd
Author: Sandro Santilli <address@hidden>
Date:   Sun Nov 7 20:02:58 2010 +0100

    Change gui/fb into a first-class subdir. Moving toward GUI independence 
here..

diff --git a/configure.ac b/configure.ac
index b25bf10..fa13f74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2860,6 +2860,7 @@ testsuite/movies.all/Makefile
 testsuite/libcore.all/Makefile
 testsuite/libmedia.all/Makefile
 gui/Makefile
+gui/fb/Makefile
 gui/Info.plist
 gui/pythonmod/Makefile
 extensions/Makefile
diff --git a/gui/Makefile.am b/gui/Makefile.am
index d412178..34b1208 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -22,8 +22,20 @@
 
 AUTOMAKE_OPTIONS = -Wno-portability
 
+DIST_SUBDIRS = pythonmod fb
+
 # Build the current directory first. It's hard to see, but there is a '.' dot 
here.
-SUBDIRS = .
+SUBDIRS = . fb
+
+if BUILD_FB_GUI
+SUBDIRS += fb
+endif
+
+# If python support is enabled, built that too
+if HAS_PYTHON
+SUBDIRS += pythonmod
+endif
+
 
 localedir = $(datadir)/locale
 
@@ -38,12 +50,6 @@ EXTRA_DIST = gnash.in \
        kde/Kde4Gui.moc.in \
        kde/Kde4Glue.moc.in
 
-# If python support is enabled, built that too
-if HAS_PYTHON
-SUBDIRS += pythonmod
-endif
-DIST_SUBDIRS = pythonmod
-
 noinst_HEADERS =
 noinst_LTLIBRARIES = 
 
@@ -256,11 +262,6 @@ if BUILD_DUMP_GUI
 include $(srcdir)/dump/dump.am
 endif
 
-# Build the FB gui
-if BUILD_FB_GUI
-include $(srcdir)/fb/fb.am
-endif
-
 # Build the RISCOS gui
 if BUILD_RISCOS_GUI
 include $(srcdir)/riscos/riscos.am
diff --git a/gui/fb/Makefile.am b/gui/fb/Makefile.am
new file mode 100644
index 0000000..ac868a5
--- /dev/null
+++ b/gui/fb/Makefile.am
@@ -0,0 +1,144 @@
+## 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 FB gui
+#
+
+AUTOMAKE_OPTIONS = -Wno-portability
+
+# 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)/libmedia \
+       -I$(top_srcdir)/libsound \
+       -I$(top_srcdir)/libmedia/ffmpeg \
+       -I$(top_srcdir)/libmedia/gst \
+       -I$(top_srcdir)/libmedia/haiku \
+        -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 =  \
+       $(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 = $(GSTPBUTILS_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
+
+
+# These are used to handle input events from a keyboard, mouse, or
+# touchscreen. These are only used by the Framebuffer GUI, as without
+# X11, it has no event handling. We do it this way so the optionally
+# built source files still get included in the source tarball.
+DEVICES =
+if ENABLE_INPUT_DEVICES
+DEVICES += InputDevice.cpp InputDevice.h
+
+# Touchscreen
+if ENABLE_TSLIB
+DEVICES += TouchDevice.cpp
+endif
+# PS/2 Mouse
+if ENABLE_MOUSE
+DEVICES += MouseDevice.cpp
+endif
+# Linux input events
+if ENABLE_INPUT_EVENTS
+DEVICES += EventDevice.cpp
+endif
+endif
+
+if BUILD_FB_GUI
+bin_PROGRAMS = fb-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)
+
+fb_gnash_SOURCES = $(GUI_SRCS) $(DEVICES) gui_fb.cpp fb.cpp fbsup.h
+fb_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" -DFAKEFB=\"$(FAKEFB)\" \
+       $(AM_CPPFLAGS) 
+fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+#fb_gnash_DEPENDENCIES = .configline
+fb_gnash_LDADD = \
+       $(top_builddir)/librender/libgnashrender.la \
+       $(GNASH_LIBS) 
+
+if BUILD_AGG_RENDERER
+fb_gnash_CPPFLAGS += $(AGG_CFLAGS)
+fb_gnash_LDADD += $(AGG_LIBS)
+endif                          # BUILD_AGG_RENDERER
+
+endif                          # BUILD_FB_GUI
+
diff --git a/gui/fb/fb.am b/gui/fb/fb.am
deleted file mode 100644
index 72f4b60..0000000
--- a/gui/fb/fb.am
+++ /dev/null
@@ -1,60 +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
-# 
-
-
-# These are used to handle input events from a keyboard, mouse, or
-# touchscreen. These are only used by the Framebuffer GUI, as without
-# X11, it has no event handling. We do it this way so the optionally
-# built source files still get included in the source tarball.
-DEVICES =
-if ENABLE_INPUT_DEVICES
-DEVICES += fb/InputDevice.cpp fb/InputDevice.h
-
-# Touchscreen
-if ENABLE_TSLIB
-DEVICES += fb/TouchDevice.cpp
-endif
-# PS/2 Mouse
-if ENABLE_MOUSE
-DEVICES += fb/MouseDevice.cpp
-endif
-# Linux input events
-if ENABLE_INPUT_EVENTS
-DEVICES += fb/EventDevice.cpp
-endif
-endif
-
-#
-# Build the FB gui
-#
-if BUILD_FB_GUI
-bin_PROGRAMS += fb-gnash
-fb_gnash_SOURCES = $(GUI_SRCS) $(DEVICES) fb/gui_fb.cpp fb/fb.cpp fb/fbsup.h
-fb_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" -DFAKEFB=\"$(FAKEFB)\" \
-       $(AM_CPPFLAGS) 
-fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
-#fb_gnash_DEPENDENCIES = .configline
-fb_gnash_LDADD = \
-       $(top_builddir)/librender/libgnashrender.la \
-       $(GNASH_LIBS) 
-
-if BUILD_AGG_RENDERER
-fb_gnash_CPPFLAGS += $(AGG_CFLAGS)
-fb_gnash_LDADD += $(AGG_LIBS)
-endif                          # BUILD_AGG_RENDERER
-endif                          # BUILD_FB_GUI
-

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

Summary of changes:
 configure.ac       |    1 +
 gui/Makefile.am    |   25 +++++----
 gui/fb/Makefile.am |  144 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 gui/fb/fb.am       |   60 ----------------------
 4 files changed, 158 insertions(+), 72 deletions(-)
 create mode 100644 gui/fb/Makefile.am
 delete mode 100644 gui/fb/fb.am


hooks/post-receive
-- 
Gnash