[Gnash-commit] gnash macros/glib.m4 libbase/FLVParser.cpp serv...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    08/02/15 20:50:44

Modified files:
        macros         : glib.m4 
        libbase        : FLVParser.cpp 
        server         : as_value.cpp 
        .              : ChangeLog 

Log message:
                * macros/glib.m4: Add extra glib for include path, and drop the
                extra glib for the glibconfig.h include path. This let's Gnash
                build on NetBSD 4.0.
                * server/as_value.cpp: Use finite if isfinite doesn't exist. 
Fixes
                FreeBSD build problem.
                * libbase/FLVParser.cpp:  Include string and iofwd, and add std
                namespace to fix generic BSD build problem.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5664&r2=1.5665

Patches:
Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- macros/glib.m4      1 Feb 2008 01:30:30 -0000       1.32
+++ macros/glib.m4      15 Feb 2008 20:50:43 -0000      1.33
@@ -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: glib.m4,v 1.32 2008/02/01 01:30:30 rsavoye Exp $
+dnl $Id: glib.m4,v 1.33 2008/02/15 20:50:43 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_GLIB],
 [
@@ -41,17 +41,17 @@
   dnl Attempt to find the top level directory, which unfortunately has a
   dnl version number attached. At least on Debain based systems, this
   dnl doesn't seem to get a directory that is unversioned.
-  AC_MSG_CHECKING([for libglib header])  
+  AC_MSG_CHECKING([for Glib header])  
   if test x"${gnash_glib_version}" = x; then
     gnash_glib_topdir=""
     gnash_glib_version=""
     for i in $incllist; do
-      for j in `ls -dr $i/glib-[[0-9]].[[0-9]] 2>/dev/null`; do
+      for j in `ls -dr $i/glib-[[0-9]].[[0-9]] $i/glib/glib-[[0-9]].[[0-9]] 
2>/dev/null`; do
         if test -f $j/glib.h; then
           gnash_glib_topdir=`basename $j`
           gnash_glib_version=`echo ${gnash_glib_topdir} | sed -e 's:glib-::'`
           ac_cv_path_glib_incl="-I$j"
-          gnash_glib_config=`echo $j | sed -e 's:include:lib:'`
+          gnash_glib_config=`echo $j | sed -e 's:include:lib:' -e 
's:lib/glib/:lib/:'`
           if test -f ${gnash_glib_config}/include/glibconfig.h; then
             ac_cv_path_glib_incl="${ac_cv_path_glib_incl} 
-I${gnash_glib_config}/include"
           fi

Index: libbase/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- libbase/FLVParser.cpp       21 Jan 2008 20:55:43 -0000      1.26
+++ libbase/FLVParser.cpp       15 Feb 2008 20:50:43 -0000      1.27
@@ -17,12 +17,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: FLVParser.cpp,v 1.26 2008/01/21 20:55:43 rsavoye Exp $
+// $Id: FLVParser.cpp,v 1.27 2008/02/15 20:50:43 rsavoye Exp $
 
+#include <string>
+#include <iosfwd>
 #include "FLVParser.h"
 #include "amf.h"
 #include "log.h"
 
+using namespace std;
+
 #define PADDING_BYTES 8
 
 // Define the following macro the have seek() operations printed

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- server/as_value.cpp 14 Feb 2008 21:10:18 -0000      1.114
+++ server/as_value.cpp 15 Feb 2008 20:50:43 -0000      1.115
@@ -36,6 +36,7 @@
 #include "utility.h" // for typeName()
 #include "namedStrings.h"
 
+#include <cmath>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/lexical_cast.hpp>
 #include <locale>
@@ -46,6 +47,10 @@
 #      define snprintf _snprintf
 #endif
 
+#ifdef HAVE_FINITE
+#define isfinite finite
+#endif
+
 // Define the macro below to make abstract equality operator verbose
 //#define GNASH_DEBUG_EQUALITY 1
 

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5664
retrieving revision 1.5665
diff -u -b -r1.5664 -r1.5665
--- ChangeLog   15 Feb 2008 11:28:13 -0000      1.5664
+++ ChangeLog   15 Feb 2008 20:50:43 -0000      1.5665
@@ -1,3 +1,13 @@
+2008-02-15  Rob Savoye  <address@hidden>
+
+       * macros/glib.m4: Add extra glib for include path, and drop the
+       extra glib for the glibconfig.h include path. This let's Gnash
+       build on NetBSD 4.0.
+       * server/as_value.cpp: Use finite if isfinite doesn't exist. Fixes
+       FreeBSD build problem.
+       * libbase/FLVParser.cpp:  Include string and iofwd, and add std
+       namespace to fix generic BSD build problem.
+
 2008-02-15 Benjamin Wolsey <address@hidden>
 
        * server/parser/button_character_def.cpp: use ensureBytes, fix more