[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-465-g945bc55

[Bastiaan Jacques]

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  945bc55badd175f36cdf53c132b59a73372073a8 (commit)
       via  1b866bc0018a852909aaf7e92a0b17f20c9811c7 (commit)
       via  1c6726c63dc15ca653b2d5ef899c2df935486bb3 (commit)
      from  da77735f1cc38eeeb860ccf27d1651ba7da97d83 (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=945bc55badd175f36cdf53c132b59a73372073a8


commit 945bc55badd175f36cdf53c132b59a73372073a8
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Apr 2 00:51:01 2011 +0200

    Don't automatically link libz2.

diff --git a/configure.ac b/configure.ac
index f1aaa6b..0015f41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1865,7 +1865,7 @@ dnl libcurl3-dev on Ubuntu has a dependency on lber, and 
Gnash won't link
 dnl on most machines without it. While it isn't diretly used by Gnash at all,
 dnl it's to work around an Ubuntu packaging bug.
 AC_CHECK_LIB(lber, ber_free)
-AC_CHECK_LIB(bz2, BZ2_bzopen)
+AC_CHECK_LIB(bz2, BZ2_bzopen, [AC_SUBST(BZ2_LIBS, -lbz2)])
 AC_CHECK_LIB(c, getpwnam, AC_DEFINE(HAVE_GETPWNAM, 1, [Has getpwnam] ))
 
 dnl X11 is needed for fltk (at least),

http://git.savannah.gnu.org/cgit//commit/?id=1b866bc0018a852909aaf7e92a0b17f20c9811c7


commit 1b866bc0018a852909aaf7e92a0b17f20c9811c7
Author: Bastiaan Jacques <address@hidden>
Date:   Sat Apr 2 00:23:14 2011 +0200

    Remove IRIX hack that does nothing, and in any event the same test is 
repeated later.

diff --git a/configure.ac b/configure.ac
index edcd618..f1aaa6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1849,26 +1849,6 @@ dnl 
-----------------------------------------------------------------
 dnl END OF PLUGIN RELATED STUFF
 dnl -----------------------------------------------------------------
 
-dnl IRIX-hack.
-case $host in
-  *-*-irix*)
-  dnl ABI-check
-  save_LIBS=$LIBS
-  dir="/usr/lib /usr/lib32 /usr/lib/lib64"
-  for i in $dir; do
-    LIBS=-L$i
-    AC_SEARCH_LIBS(XDisableAccessControl, X11, [
-      xpathed=$i
-      break
-    ])
-    unset ac_cv_search_XDisableAccessControl
-  done
-  ac_x_libraries=$xpathed
-  x_libraries=$xpathed
-  LIBS=$save_LIBS
-  ;;
-esac
-
 AM_CONDITIONAL(LIRC, [test x$lirc_ext = xyes])
 
 AC_CHECK_HEADERS(endian.h machine/endian.h)

http://git.savannah.gnu.org/cgit//commit/?id=1c6726c63dc15ca653b2d5ef899c2df935486bb3


commit 1c6726c63dc15ca653b2d5ef899c2df935486bb3
Author: Bastiaan Jacques <address@hidden>
Date:   Thu Mar 31 22:19:39 2011 +0200

    Provide a fallback implementation of NPN_ReleaseVariantValue for old NPAPI 
implementations.

diff --git a/plugin/npapi/mozilla-sdk/npn_gate.cpp 
b/plugin/npapi/mozilla-sdk/npn_gate.cpp
index 3a34004..b4268c4 100644
--- a/plugin/npapi/mozilla-sdk/npn_gate.cpp
+++ b/plugin/npapi/mozilla-sdk/npn_gate.cpp
@@ -32,6 +32,8 @@
 #include "npfunctions.h"
 #endif
 
+#include "GnashNPVariant.h"
+
 #ifndef HIBYTE
 #define HIBYTE(x) ((((uint32_t)(x)) & 0xff00) >> 8)
 #endif
@@ -358,7 +360,16 @@ NPN_HasMethod(NPP npp, NPObject* obj, NPIdentifier 
methodName)
 void
 NPN_ReleaseVariantValue(NPVariant *variant)
 {
-    NPNFuncs.releasevariantvalue(variant);
+    if (NPNFuncs.releasevariantvalue) {
+        NPNFuncs.releasevariantvalue(variant);
+    } else {
+        if (variant->type == NPVariantType_String) {
+           
NPN_MemFree((void*)gnash::GetNPStringChars(NPVARIANT_TO_STRING(*variant)));
+        } else if (variant->type == NPVariantType_Object) {
+           NPN_ReleaseObject(NPVARIANT_TO_OBJECT(*variant));
+        }
+        VOID_TO_NPVARIANT(*variant);
+    }
 }
 
 void

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

Summary of changes:
 configure.ac                          |   22 +---------------------
 plugin/npapi/mozilla-sdk/npn_gate.cpp |   13 ++++++++++++-
 2 files changed, 13 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
Gnash