[Gnash-commit] gnash ChangeLog configure.ac plugin/plugin.cpp ...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/18 12:24:41

Modified files:
        .              : ChangeLog configure.ac 
        plugin         : plugin.cpp 
        server/vm      : VM.cpp 

Log message:
        Patch #6154 by Benjamin Wolsey <address@hidden>
        
         * configure.ac: define flash player version macros
           for compatibility detectors.
         * plugin/plugin.cpp: build the flash player version
           using provided macros.
         * server/vm/VM.cpp: buil flash player version using
           provided macros.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4025&r2=1.4026
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.400&r2=1.401
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4025
retrieving revision 1.4026
diff -u -b -r1.4025 -r1.4026
--- ChangeLog   18 Aug 2007 11:58:06 -0000      1.4025
+++ ChangeLog   18 Aug 2007 12:24:40 -0000      1.4026
@@ -1,3 +1,12 @@
+2007-08-18 Benjamin Wolsey <address@hidden>
+
+       * configure.ac: define flash player version macros
+         for compatibility detectors.
+       * plugin/plugin.cpp: build the flash player version
+         using provided macros.
+       * server/vm/VM.cpp: buil flash player version using
+         provided macros.
+
 2007-08-18 Sandro Santilli <address@hidden>
 
        * server/as_object.h (ensureType): fix printing of *source* type

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.400
retrieving revision 1.401
diff -u -b -r1.400 -r1.401
--- configure.ac        16 Aug 2007 23:26:02 -0000      1.400
+++ configure.ac        18 Aug 2007 12:24:40 -0000      1.401
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.400 2007/08/16 23:26:02 strk Exp $
+dnl $Id: configure.ac,v 1.401 2007/08/18 12:24:40 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -26,6 +26,13 @@
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 
+dnl Set the default values for Flash Version. These are converted into
+dnl various strings to make JavaScript or ActionScript detectors
+dnl recognize Gnash as a Flash Player.
+AC_DEFINE([DEFAULT_FLASH_MAJOR_VERSION], ["8"], [Default Flash major version])
+AC_DEFINE([DEFAULT_FLASH_MINOR_VERSION], ["0"], [Default Flash minor version])
+AC_DEFINE([DEFAULT_FLASH_REV_NUMBER], ["99"], [Default Flash revision number])
+
 dnl Some things you can only do by looking at the platform name.
 case "${host}" in
   powerpc-apple-darwin*)

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- plugin/plugin.cpp   17 Aug 2007 13:57:36 -0000      1.82
+++ plugin/plugin.cpp   18 Aug 2007 12:24:40 -0000      1.83
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.82 2007/08/17 13:57:36 strk Exp $ */
+/* $Id: plugin.cpp,v 1.83 2007/08/18 12:24:40 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,7 +30,9 @@
 //Some javascript plugin detectors use the description
 //to decide the flash version to display. They expect the
 //form (major version).(minor version) r(revision).
-#define FLASH_VERSION "8.0 r99."
+//e.g. "8.0 r99."
+#define FLASH_VERSION DEFAULT_FLASH_MAJOR_VERSION"."\
+       DEFAULT_FLASH_MINOR_VERSION" r"DEFAULT_FLASH_REV_NUMBER"."
 
 #define PLUGIN_DESCRIPTION \
   "Shockwave Flash "FLASH_VERSION" Gnash "VERSION", the GNU Flash Player. \
@@ -59,6 +61,7 @@
 #include <vector>
 #include <iostream>
 
+
 // Mozilla SDK headers
 #include "prinit.h"
 #include "prlock.h"

Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/vm/VM.cpp    17 Aug 2007 13:57:36 -0000      1.13
+++ server/vm/VM.cpp    18 Aug 2007 12:24:41 -0000      1.14
@@ -16,7 +16,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: VM.cpp,v 1.13 2007/08/17 13:57:36 strk Exp $ */
+/* $Id: VM.cpp,v 1.14 2007/08/18 12:24:41 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -110,9 +110,11 @@
        //    the last ,0 is necessary, even if it doesn't appear
        //    to mean anything.
        //    
-       // TODO: use config.h for the default, query RcInit file for an override
+       // TODO: query RcInit file for an override
        //
-#define FLASH_VERSION "GSH 8,0,99,0"
+#define FLASH_VERSION "GSH "DEFAULT_FLASH_MAJOR_VERSION","\
+        DEFAULT_FLASH_MINOR_VERSION","DEFAULT_FLASH_REV_NUMBER",0"
+
        static const std::string version(FLASH_VERSION);
        return version;
 }