[Gnash-commit] gnash gui/gnash.cpp gui/Makefile.am libbase/ima...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    07/06/16 19:03:01

Modified files:
        gui            : gnash.cpp Makefile.am 
        libbase        : image.cpp 
        macros         : ffmpeg.m4 
        .              : ChangeLog 

Log message:
                * gui/gnash.cpp: Add the version of FFMPEG or GST to
                --version. Add the config options too.
                * gui/Makefile.am: Extract the config options so we can pass 
them
                to GCC, wo they become part of the output from --version.
                * libbase/image.cpp: Include memory so auto_ptr is defined.
                * macros/ffmpeg.m4: Define HAVE_FFMPEG_AVCODEC_H eben when not
                using AC_CHECK_HEADER.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3562&r2=1.3563

Patches:
Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- gui/gnash.cpp       15 Jun 2007 18:46:59 -0000      1.73
+++ gui/gnash.cpp       16 Jun 2007 19:02:59 -0000      1.74
@@ -26,6 +26,15 @@
 #include "rc.h" // for use of rcfile
 #include "debugger.h"
 
+#ifdef HAVE_FFMPEG_AVCODEC_H
+# include "ffmpeg/avcodec.h"
+#endif
+
+#ifdef HAVE_GST_GST_H
+# include "gst/gst.h"
+# include "gst/gstversion.h"
+#endif
+
 #if defined(_WIN32) || defined(WIN32)
         #include "getopt_win32.h"
 #else
@@ -148,9 +157,17 @@
 {
     printf (_("Build options %s\n"
               "   Target: %s\n"
-              "   Renderer: %s   GUI: %s   Media handler: %s\n"),
+              "   Renderer: %s   GUI: %s   Media handler: %s\n"
+              "   Configured with: %s\n"),
                VERSION, TARGET_CONFIG, RENDERER_CONFIG, GUI_CONFIG,
-               MEDIA_CONFIG);
+                MEDIA_CONFIG, CONFIG_CONFIG);
+#ifdef HAVE_FFMPEG_AVCODEC_H
+    printf(_("Ffmpeg version is: %s\n"), LIBAVCODEC_IDENT);
+#endif
+#ifdef HAVE_GST_GST_H
+    printf(_("Gstreamer version is: %d.%d.%d."), GST_VERSION_MAJOR,
+           GST_VERSION_MINOR, GST_VERSION_MICRO);
+#endif
 }
 
 

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- gui/Makefile.am     10 Jun 2007 07:36:13 -0000      1.78
+++ gui/Makefile.am     16 Jun 2007 19:03:00 -0000      1.79
@@ -17,7 +17,7 @@
 
 # 
 
-# $Id: Makefile.am,v 1.78 2007/06/10 07:36:13 strk Exp $
+# $Id: Makefile.am,v 1.79 2007/06/16 19:03:00 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 localedir = $(datadir)/locale
@@ -184,6 +184,9 @@
 endif
 endif
 
+if USE_SOUND_GST
+AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
+endif
 
 if USE_GUI_FLTK
  FLTK_SRCS = fltk.cpp fltksup.h $(FLTK_AGG_SRCS) $(FLTK_CAIRO_SRCS)
@@ -199,6 +202,7 @@
 AM_CPPFLAGS += -DGUI_CONFIG=\"$(GUI_CONFIG)\"
 AM_CPPFLAGS += -DMEDIA_CONFIG=\"$(MEDIA_CONFIG)\"
 AM_CPPFLAGS += -DTARGET_CONFIG=\"$(target)\"
+AM_CPPFLAGS += -DCONFIG_CONFIG="\"$(shell cat .configline)\""
 
 dist_images_DATA = images/gnash_128_96.ico images/GnashG.png
 #dist_images_DATA = images/gnash_G_v3.ico
@@ -263,7 +267,7 @@
 gnash_SOURCES = gnash.cpp
 # export our symbols so they can be used by Gnash plugins
 gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
-gnash_DEPENDENCIES = $(GNASH_LIBS)
+gnash_DEPENDENCIES = $(GNASH_LIBS)  .configline
 gnash_LDADD = \
        $(MYSQL_LIBS) \
        $(GNASH_LIBS)
@@ -282,7 +286,7 @@
 #      $(GNASH_LIBS)
 
 #klash_DEPENDENCIES = \
-#      $(GNASH_LIBS) 
+#      $(GNASH_LIBS)  .configline
 #       $(LIBLTDL) "-dlopen" self "-dlopen"
 
 CLEANFILES = klash.moc
@@ -295,6 +299,10 @@
          ln -sf $(srcdir)/klash.moc.in klash.moc; \
        fi
 
+.configline: ../config.log
+       address@hidden -f .configline
+       @head ../config.log | grep " .*/configure " | sed -e 's:^  . 
.*configure ::' > .configline
+
 #noinst_PROGRAMS = guitest # klash flak
 #guitest_SOURCES = guitest.cpp #fltk.cpp #fltksup.h fltksupp.h gnash.cpp 
gtk.cpp 
 #      gtksup.h gui.cpp gui.h menu.cpp menu.h sdl.cpp sdlsup.h [21~sdlsupp.h

Index: libbase/image.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- libbase/image.cpp   16 Jun 2007 12:47:53 -0000      1.21
+++ libbase/image.cpp   16 Jun 2007 19:03:00 -0000      1.22
@@ -12,9 +12,9 @@
 #include "jpeg.h"
 #include "tu_file.h"
 #include <cstring>
+#include <memory>              // for auto_ptr
 #include <boost/scoped_array.hpp>
 
-
 namespace image
 {
        //

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- macros/ffmpeg.m4    7 Jun 2007 18:59:51 -0000       1.44
+++ macros/ffmpeg.m4    16 Jun 2007 19:03:00 -0000      1.45
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: ffmpeg.m4,v 1.44 2007/06/07 18:59:51 strk Exp $
+dnl $Id: ffmpeg.m4,v 1.45 2007/06/16 19:03:00 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -75,6 +75,8 @@
     if test x${cross_compiling} = xno; then
       AC_CHECK_HEADERS(ffmpeg/avcodec.h, [ac_cv_path_ffmpeg_incl=""])
     fi
+  else
+      AC_DEFINE(HAVE_FFMPEG_AVCODEC_H, 1, [Define if you have avcodec.h 
installed.])
   fi
 
 dnl We need LIBAVCODEC VERSION of at least 51.29.0 to get avcodec_decode_audio2

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3562
retrieving revision 1.3563
diff -u -b -r1.3562 -r1.3563
--- ChangeLog   16 Jun 2007 12:47:52 -0000      1.3562
+++ ChangeLog   16 Jun 2007 19:03:00 -0000      1.3563
@@ -1,3 +1,13 @@
+2007-06-16  Rob Savoye  <address@hidden>
+
+       * gui/gnash.cpp: Add the version of FFMPEG or GST to
+       --version. Add the config options too.
+       * gui/Makefile.am: Extract the config options so we can pass them
+       to GCC, wo they become part of the output from --version.
+       * libbase/image.cpp: Include memory so auto_ptr is defined.
+       * macros/ffmpeg.m4: Define HAVE_FFMPEG_AVCODEC_H eben when not
+       using AC_CHECK_HEADER.
+
 2007-06-16 Sandro Santilli <address@hidden>
 
        * libbase/: image.{cpp,h}, LoadThread.{cpp,h},