[Gnash-commit] gnash ChangeLog configure.ac backend/render_han... [release_0_7_2]

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         release_0_7_2
Changes by:     Rob Savoye <rsavoye>    06/11/06 00:52:47

Modified files:
        .              : ChangeLog configure.ac 
        backend        : render_handler_agg_compat.h 
        gui            : gnash.cpp 
        libbase        : URL.cpp 

Log message:
                * gnash/configure.ac: Add substitution variables for the build
                options. Task #6059.
                * gui/gnash.cpp: Add support to print out the build options.
                * libbase/URL.cpp: Include sys/param.h to get PATH_MAX for
                arm-linux.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1412.2.88&r2=1.1412.2.89
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.186.2.14&r2=1.186.2.15
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg_compat.h?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.53.2.2&r2=1.53.2.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/URL.cpp?cvsroot=gnash&only_with_tag=release_0_7_2&r1=1.28.2.1&r2=1.28.2.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1412.2.88
retrieving revision 1.1412.2.89
diff -u -b -r1.1412.2.88 -r1.1412.2.89
--- ChangeLog   5 Nov 2006 23:35:34 -0000       1.1412.2.88
+++ ChangeLog   6 Nov 2006 00:52:47 -0000       1.1412.2.89
@@ -1,5 +1,10 @@
 2006-11-05  Rob Savoye  <address@hidden>
 
+       * gnash/configure.ac: Add substitution variables for the build
+       options. Task #6059.
+       * gui/gnash.cpp: Add support to print out the build options.
+       * libbase/URL.cpp: Include sys/param.h to get PATH_MAX for
+       arm-linux.
        * gui/gtk.cpp: Handle control keys better, so Gnash doesn't core
        dump. Works around #18207.
        * plugin/klash.cpp: Don't include tu_opengl.h, it doesn't exist,

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.186.2.14
retrieving revision 1.186.2.15
diff -u -b -r1.186.2.14 -r1.186.2.15
--- configure.ac        4 Nov 2006 14:41:09 -0000       1.186.2.14
+++ configure.ac        6 Nov 2006 00:52:47 -0000       1.186.2.15
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.186.2.14 2006/11/04 14:41:09 strk Exp $
+dnl $Id: configure.ac,v 1.186.2.15 2006/11/06 00:52:47 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.2)
@@ -602,6 +602,17 @@
 GNASH_PATH_AGG
 fi
 
+dnl Define convienience constants so Gnash can print out the
+dnl default configuration of the build.
+RENDERER_CONFIG=$renderer
+AC_SUBST(RENDERER_CONFIG)
+GUI_CONFIG=$gui
+AC_SUBST(GUI_CONFIG)
+SOUND_CONFIG=$sound_handler
+AC_SUBST(SOUND_CONFIG)
+DECODER_CONFIG=$mp3_decoder
+AC_SUBST(DECODER_CONFIG)
+
 GNASH_DOCBOOK
 AM_CONDITIONAL(DOCBOOK, test x$docbook = xyes)
 

Index: backend/render_handler_agg_compat.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg_compat.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- backend/render_handler_agg_compat.h 9 Oct 2006 16:23:45 -0000       1.1
+++ backend/render_handler_agg_compat.h 6 Nov 2006 00:52:47 -0000       1.1.2.1
@@ -11,6 +11,7 @@
 
 namespace agg {
 
+#if 0
 typedef unsigned char cover_type;
 
     //=======================================render_scanlines_compound_layered
@@ -197,6 +198,7 @@
             } //while((num_styles = ras.sweep_styles()) > 0)
         } //if(ras.rewind_scanlines())
     }
+#endif
 } // end of namespace agg
 
 #endif

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.53.2.2
retrieving revision 1.53.2.3
diff -u -b -r1.53.2.2 -r1.53.2.3
--- gui/gnash.cpp       31 Oct 2006 19:31:49 -0000      1.53.2.2
+++ gui/gnash.cpp       6 Nov 2006 00:52:47 -0000       1.53.2.3
@@ -117,7 +117,15 @@
        );
 }
 
-
+static void build_options()
+{
+    cout << "Build options " << VERSION << endl
+         << "   Renderer: " << RENDERER_CONFIG
+         << "   GUI: " << GUI_CONFIG
+         << "   Sound handler: " << SOUND_CONFIG
+         << "   Decoder: " << DECODER_CONFIG
+         << endl;
+}
 
 static void
 parseCommandLine(int argc, char* argv[], gnash::Player& player)
@@ -129,11 +137,13 @@
             version_and_copyright();
             printf("\n");
             usage();
+            build_options();
             dbglogfile.removeLog();
            exit(EXIT_SUCCESS);
         }
         if (strcmp("--version", argv[c]) == 0) {
             version_and_copyright();
+            build_options();
            dbglogfile.removeLog();
            exit(EXIT_SUCCESS);
         }

Index: libbase/URL.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/URL.cpp,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -u -b -r1.28.2.1 -r1.28.2.2
--- libbase/URL.cpp     30 Oct 2006 14:28:47 -0000      1.28.2.1
+++ libbase/URL.cpp     6 Nov 2006 00:52:47 -0000       1.28.2.2
@@ -39,6 +39,7 @@
 // these are for stat(2)
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/param.h>
 
 #if defined(_WIN32) || defined(WIN32)
 # define PATH_MAX 255