[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1236-g45044b0

[Rob Savoye]

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  45044b09e2fec37a1192828bbe8c8fb2e3ac76f4 (commit)
       via  bb1c0c67a4091e7fbdc2ae456e1f0d8a864f2fa9 (commit)
       via  35dde18b987210a6c138e89987379db1cbfc1928 (commit)
       via  0b89905945c47b7df2dfc226e472bb6b15df9250 (commit)
       via  86083cc55859ad351509ed3815cb8a5bac681e0c (commit)
      from  8063f6e7496d653ae1216b6a0a58b7cf1e0beb47 (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=45044b09e2fec37a1192828bbe8c8fb2e3ac76f4


commit 45044b09e2fec37a1192828bbe8c8fb2e3ac76f4
Author: Rob Savoye <address@hidden>
Date:   Thu Nov 24 09:02:31 2011 -0700

    Fix #34708, but breaks #32956. YouTube video player is now the correct size

diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 30a9beb..9297149 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -264,6 +264,9 @@ GtkGui::init(int argc, char **argv[])
 bool
 GtkGui::run()
 {
+    // Kick-start before setting the interval timeout
+    advance_movie(this);
+
     gtk_main();
     return true;
 }

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


commit bb1c0c67a4091e7fbdc2ae456e1f0d8a864f2fa9
Author: Rob Savoye <address@hidden>
Date:   Thu Nov 24 08:59:10 2011 -0700

    BZ2_LIBS needs to be in the link when using --as-needed

diff --git a/gui/gtk/gtk.am b/gui/gtk/gtk.am
index 645a736..b4e3604 100644
--- a/gui/gtk/gtk.am
+++ b/gui/gtk/gtk.am
@@ -33,6 +33,7 @@ gtk_gnash_LDADD = \
        $(top_builddir)/librender/libgnashrender.la \
        $(GNASH_LIBS) \
        $(GTK_LIBS) \
+       $(BZ2_LIBS) \
        $(NULL)
 
 #gtk_gnash_DEPENDENCIES = .configline

http://git.savannah.gnu.org/cgit//commit/?id=35dde18b987210a6c138e89987379db1cbfc1928


commit 35dde18b987210a6c138e89987379db1cbfc1928
Author: Rob Savoye <address@hidden>
Date:   Thu Nov 24 08:57:58 2011 -0700

    const is needed for some of the NPAPI functions for Oneiric with firefox-dev

diff --git a/plugin/npapi/mozilla-sdk/np_entry.cpp 
b/plugin/npapi/mozilla-sdk/np_entry.cpp
index 5c00038..d58e47d 100644
--- a/plugin/npapi/mozilla-sdk/np_entry.cpp
+++ b/plugin/npapi/mozilla-sdk/np_entry.cpp
@@ -238,6 +238,9 @@ NP_Initialize(NPNetscapeFuncs* aNPNFuncs, NPPluginFuncs* 
aNPPFuncs)
     return NS_PluginInitialize();
 }
 
+#ifdef NPAPI_CONST
+const
+#endif
 char *
 NP_GetMIMEDescription(void)
 {
diff --git a/plugin/npapi/plugin.cpp b/plugin/npapi/plugin.cpp
index 04950e6..2272fd8 100644
--- a/plugin/npapi/plugin.cpp
+++ b/plugin/npapi/plugin.cpp
@@ -129,6 +129,9 @@ NPBool plugInitialized = FALSE;
 }
 
 /// \brief Return the MIME Type description for this plugin.
+#ifdef NPAPI_CONST
+const
+#endif
 char*
 NPP_GetMIMEDescription(void)
 {

http://git.savannah.gnu.org/cgit//commit/?id=0b89905945c47b7df2dfc226e472bb6b15df9250


commit 0b89905945c47b7df2dfc226e472bb6b15df9250
Author: Rob Savoye <address@hidden>
Date:   Thu Nov 24 08:57:24 2011 -0700

    const is needed for some of the NPAPI functions for Oneiric with firefox-dev

diff --git a/configure.ac b/configure.ac
index 1c73ec2..4a21850 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1103,13 +1103,6 @@ AC_ARG_ENABLE(device,
   done
 )
 
-dnl Lenny doesn't support this filed for Linux Input events
-AC_TRY_COMPILE([#include <linux/input.h>], [
-  struct input_absinfo abs;
-  abs.resolution = 0;; ],
- AC_DEFINE([ABSINFO_RESOLUTION], [1], [ABS Resolution field])
-)
-
 if test x"${have_ffmpeg_vaapi}" = x"yes" -a x"${build_vaapi_device}" = x"yes"; 
then
   use_libva=no
   use_libva_x11=no
@@ -2043,6 +2036,25 @@ fi
 
 GNASH_PATH_FIREFOX
 
+dnl 
+dnl New versions of the NPAPI require const for this prototype, which currently
+dnl seems to only be wit Ubuntu Oneiric.
+AC_MSG_CHECKING([for const needed for NPP_GetMIMEDescription() prototype])
+npapi_flags="`echo "${NPAPI_CFLAGS}" | sed -e 's/-I//' -e 's/-DXP_UNIX//' | tr 
-d ' '`/npapi.h"
+const_test="`grep NPP_GetMIMEDescription ${npapi_flags} | grep -c const`"
+if test ${const_test} -eq 1; then
+  AC_DEFINE(NPAPI_CONST, [1], [Newer versions use const in prototypes])
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+
+AC_TRY_COMPILE([#include <linux/input.h>], [
+  struct input_absinfo abs;
+  abs.resolution = 0;; ],
+ AC_DEFINE([ABSINFO_RESOLUTION], [1], [ABS Resolution field])
+)
+
 dnl -----------------------------------------------------------------
 dnl END OF PLUGIN RELATED STUFF
 dnl -----------------------------------------------------------------
@@ -3908,7 +3920,8 @@ if test x"$npapi" = xyes; then
   else
     PKG_ERR([No xulrunner development package is installed!])
     PKG_SUGGEST([Install it from 
http://releases.mozilla.org/pub/mozilla.org/xulrunner])
-    DEB_INSTALL([xulrunner-dev])
+    DEB_INSTALL([xulrunner-dev]) or 
+    DEB_INSTALL([firefox-dev])
     RPM_INSTALL([xulrunner-devel])
   fi
 else

http://git.savannah.gnu.org/cgit//commit/?id=86083cc55859ad351509ed3815cb8a5bac681e0c


commit 86083cc55859ad351509ed3815cb8a5bac681e0c
Author: Rob Savoye <address@hidden>
Date:   Thu Nov 24 08:52:47 2011 -0700

    add xulrunner-dev or firefox-dev for Build Deps

diff --git a/packaging/debian/control b/packaging/debian/control
index f91e72c..35ce700 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -34,7 +34,8 @@ Build-Depends: dpkg-dev (>= 1.13.19),
               libavcodec-dev,
               libavutil-dev,
               libswscale-dev,
-              lsb-release
+              lsb-release,
+              xulrunner-dev | firefox-dev
 # OpenGL packages are disabled for now
 # libgl1-mesa-dev, libglu1-mesa-dev, libgtkglext1-dev, libqt4-opengl-dev, 
 Standards-Version: 3.8.4

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

Summary of changes:
 configure.ac                          |   29 +++++++++++++++++++++--------
 gui/gtk/gtk.am                        |    1 +
 gui/gtk/gtk.cpp                       |    3 +++
 packaging/debian/control              |    3 ++-
 plugin/npapi/mozilla-sdk/np_entry.cpp |    3 +++
 plugin/npapi/plugin.cpp               |    3 +++
 6 files changed, 33 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Gnash