[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-461-g84cb746

[Benjamin Wolsey]

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  84cb7466db5f81610aa6217411d43a41a861f54a (commit)
       via  27a4e1f6a5b50e35af8fa29f9cd9fabf5ee777bd (commit)
      from  f27749121d756a57e49efed961b9368cf2c2fab3 (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=84cb7466db5f81610aa6217411d43a41a861f54a


commit 84cb7466db5f81610aa6217411d43a41a861f54a
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Apr 1 13:43:00 2011 +0200

    Test that a SWF5 loaded into a SWF4 still has global functions,
    confirming the correctness of a recent fix.

diff --git a/testsuite/misc-ming.all/Makefile.am 
b/testsuite/misc-ming.all/Makefile.am
index 2756a18..c943636 100644
--- a/testsuite/misc-ming.all/Makefile.am
+++ b/testsuite/misc-ming.all/Makefile.am
@@ -47,6 +47,8 @@ EXTRA_DIST = \
        XMLSocketTest.as \
        attachExtImported.as \
        attachImported.as \
+       Version4Loader.as \
+       Version5Loaded.as \
        case6.as \
        case7.as \
        easysound.as \
@@ -274,6 +276,7 @@ check_SCRIPTS += VarAndCharClashTest-Runner \
        FlashVarsTest-Runner \
        attachImported-Runner \
        attachExtImported-Runner \
+       MixedVersion4And5Runner \
        SharedObjectTestRunner
 endif
 
@@ -352,6 +355,14 @@ DefineTextTest_Runner_DEPENDENCIES = \
        DefineTextTest.swf      \
        $(NULL)
 
+Version4Loader.swf: $(srcdir)/Version4Loader.as 
+       $(MAKESWF) -o $@ -v4 $(srcdir)/Version4Loader.as
+Version5Loaded.swf: $(srcdir)/Version5Loaded.as Dejagnu.swf
+       $(MAKESWF) -o $@ Dejagnu.swf -v5 $(srcdir)/Version5Loaded.as
+MixedVersion4And5Runner: Version4Loader.swf Version5Loaded.swf
+       sh $(srcdir)/../generic-testrunner.sh $(top_builddir) 
Version5Loaded.swf > $@
+       chmod 755 $@
+
 TextSnapshotTest.swf: TextSnapshotTest
        ./TextSnapshotTest $(abs_mediadir)
 
@@ -1743,6 +1754,7 @@ TEST_CASES += VarAndCharClashTest-Runner \
        DragDropTestRunner   \
        FlashVarsTest-Runner \
        SharedObjectTestRunner \
+       MixedVersion4And5Runner \
        intervalTestRunner \
        gotoFrame2Test-Runner \
        attachImported-Runner \
diff --git a/testsuite/misc-ming.all/Version4Loader.as 
b/testsuite/misc-ming.all/Version4Loader.as
new file mode 100644
index 0000000..2de1d9e
--- /dev/null
+++ b/testsuite/misc-ming.all/Version4Loader.as
@@ -0,0 +1,2 @@
+
+loadMovieNum("Version5Loaded.swf", 4);
diff --git a/testsuite/misc-ming.all/Version5Loaded.as 
b/testsuite/misc-ming.all/Version5Loaded.as
new file mode 100644
index 0000000..504e36d
--- /dev/null
+++ b/testsuite/misc-ming.all/Version5Loaded.as
@@ -0,0 +1,13 @@
+#include "../actionscript.all/check.as"
+
+// Check that global functions exist when called from SWF5, even when loaded
+// in a SWF4.
+check_equals(typeof(unescape), "function");
+check_equals(typeof(escape), "function");
+check_equals(typeof(isNaN), "function");
+check_equals(typeof(isFinite), "function");
+check_equals(typeof(parseFloat), "function");
+check_equals(typeof(parseInt), "function");
+check_equals(typeof(NaN), "number");
+check_equals(typeof(Infinity), "number");
+stop();

http://git.savannah.gnu.org/cgit//commit/?id=27a4e1f6a5b50e35af8fa29f9cd9fabf5ee777bd


commit 27a4e1f6a5b50e35af8fa29f9cd9fabf5ee777bd
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Apr 1 13:15:47 2011 +0200

    FFmpeg trunk uses libavcodec/version.h to store the version.

diff --git a/macros/ffmpeg.m4 b/macros/ffmpeg.m4
index 4eb68c2..85f11b8 100644
--- a/macros/ffmpeg.m4
+++ b/macros/ffmpeg.m4
@@ -22,6 +22,7 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
   backupLIBS="$LIBS"
   backupCFLAGS="$CFLAGS"
   avcodec_h=""
+  avcodec_version_h=""
   ffmpeg_top_incl=""
 
   dnl If the user specify an path to include headers from, we assume it's the 
full
@@ -46,6 +47,9 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
       else
         AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the 
avcodec.h header])
       fi
+      if test -f ${with_ffmpeg_incl}/version.h; then
+        avcodec_version_h=${with_ffmpeg_incl}/version.h
+      fi
     fi
   ])
 
@@ -182,14 +186,24 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
   dnl a modified form of grepping may be better, making sure all old kinds of
   dnl version numbering fail gracefully.
 
+  versionfile=""
+
   dnl Check avcodec version number, if it was found
-  if test x"${avcodec_h}" != x; then
+  if test x"${avcodec_version_h}" != x; then
+    versionfile=${avcodec_version_h}
+  else
+    if test x"${avcodec_h}" != x; then
+      versionfile=${avcodec_h}
+    fi
+  fi
+
+  if test x"${versionfile}" != x; then
 
     AC_MSG_CHECKING([ffmpeg version])
 
-    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " 
${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
-    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " 
${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
-    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " 
${avcodec_h} | sed -e "s%[[^0-9]]%%g"`
+    ffmpeg_major_version=`$EGREP "define LIBAVCODEC_VERSION_MAJOR " 
${versionfile} | sed -e "s%[[^0-9]]%%g"`
+    ffmpeg_minor_version=`$EGREP "define LIBAVCODEC_VERSION_MINOR " 
${versionfile} | sed -e "s%[[^0-9]]%%g"`
+    ffmpeg_micro_version=`$EGREP "define LIBAVCODEC_VERSION_MICRO " 
${versionfile} | sed -e "s%[[^0-9]]%%g"`
 
     if test x"${ffmpeg_major_version}" != x ; then
 
@@ -198,15 +212,15 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
     else
 
       dnl #define LIBAVCODEC_VERSION_TRIPLET 51,50,1
-      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " ${avcodec_h} 
| awk '{print $'3'}' | sed -e "s%,%.%g"`
+      ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION_TRIPLET " 
${versionfile} | awk '{print $'3'}' | sed -e "s%,%.%g"`
 
       if test x"${ffmpeg_version}" = x ; then
 
         dnl NOTE: the [0-9]*d. pattern discards deb-heads rubbish prefix
-        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${avcodec_h} | awk 
'{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
+        ffmpeg_version=`$EGREP "define LIBAVCODEC_VERSION " ${versionfile} | 
awk '{print $'3'}' | sed -e "s%^[[0-9]]d\.%%"` 
 
         if test x"${ffmpeg_version}" = x ; then
-          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${avcodec_h} | awk 
'{print $'3'}'`
+          ffmpeg_version=`$EGREP "define LIBAVCODEC_BUILD " ${versionfile} | 
awk '{print $'3'}'`
         fi
       fi
 

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

Summary of changes:
 macros/ffmpeg.m4                          |   28 +++++++++++++++++++++-------
 testsuite/misc-ming.all/Makefile.am       |   12 ++++++++++++
 testsuite/misc-ming.all/Version4Loader.as |    2 ++
 testsuite/misc-ming.all/Version5Loaded.as |   13 +++++++++++++
 4 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 testsuite/misc-ming.all/Version4Loader.as
 create mode 100644 testsuite/misc-ming.all/Version5Loaded.as


hooks/post-receive
-- 
Gnash