@@ -1,5 +1,5 @@ dnl automake/autoconf setup -AC_INIT([moonshine], [0.3]) +AC_INIT([moonshine], [0.4]) AC_CONFIG_SRCDIR(README) AC_CANONICAL_SYSTEM AC_PREREQ(2.13) @@ -17,14 +17,20 @@ AC_PROG_LIBTOOL PKG_PROG_PKG_CONFIG dnl Plugin build configuration -PKG_CHECK_MODULES(MOZILLA, libxul-unstable mozilla-plugin) +PKG_CHECK_MODULES(MOZILLA, libxul mozilla-plugin) PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.14 gmodule-2.0 >= 2.14) AC_SUBST(MOZILLA_CFLAGS) AC_SUBST(CFLAGS) +dnl xulrunner-1.9.1 replaced npupp.h with npfunctions.h +CFLAGS_save="$CFLAGS" +CFLAGS="$CFLAGS $MOZILLA_CFLAGS" +AC_CHECK_HEADERS(npfunctions.h) +CFLAGS="$CFLAGS_SAVE" + dnl xulrunner and XPI configuration MIN_FIREFOX_VERSION="3.0" -MAX_FIREFOX_VERSION="3.1.*" +MAX_FIREFOX_VERSION="3.5.*" MIN_GECKO_VERSION="1.9" MAX_GECKO_VERSION="1.9.*" AC_SUBST([MIN_FIREFOX_VERSION]) configure.ac @@ -63,7 +63,7 @@ function MoonshinePlayer () { })); }; - this.__defineGetter__ ("CenteredOffset", function (y) { + this.__defineSetter__ ("CenteredOffset", function (y) { this.ErrorPopup.CenteredOffsetY = y; this.BufferingPopup.CenteredOffsetY = y; this.AboutPopup.CenteredOffsetY = y; player/moonshine-player.js @@ -7,6 +7,8 @@ // Copyright 2009 Novell, Inc. // +#include <config.h> + #include <string.h> #include "mmp-binder.h" @@ -53,7 +55,7 @@ mmp_binder_load_player_xaml (MoonlightPluginInstance *plugin) if (mmp_script_document_create_element (npp, &document, "script", &script_element)) { if (mmp_script_element_set_property_string (npp, &script_element, "id", MLMP_XAML_DOM_ID) && mmp_script_element_set_property_string (npp, &script_element, "type", "text/xaml") && - mmp_script_document_create_text_node (npp, &document, "<Canvas/>", &xaml_node)) { + mmp_script_document_create_text_node (npp, &document, "<Canvas xmlns=\"http://schemas.microsoft.com/winfx/2006/xaml/presentation\"/>", &xaml_node)) { if (mmp_script_element_append_child (npp, &script_element, &xaml_node)) { if (mmp_script_element_get_property_object (npp, &document, "body", &body)) { plugin/mmp-binder.c @@ -73,7 +73,7 @@ mmp_plugin_proxy_load_module (gchar *prefix) gchar *path = g_module_build_path (prefix, "moonloader"); if (g_file_test (path, G_FILE_TEST_EXISTS)) { - plugin_host->module = g_module_open (path, G_MODULE_BIND_LOCAL); + plugin_host->module = g_module_open (path, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY); if (plugin_host->module != NULL && mmp_plugin_proxy_load_symbol ("NP_Initialize", (gpointer *)&plugin_host->np_initialize) plugin/mmp-plugin-proxy.c @@ -7,6 +7,8 @@ // Copyright 2009 Novell, Inc. // +#include <config.h> + #include <string.h> #include "mmp-plugin.h" plugin/mmp-plugin.c @@ -12,7 +12,11 @@ #include <glib.h> #include <gmodule.h> +#ifdef HAVE_NPFUNCTIONS_H +#include <npfunctions.h> +#else #include <npupp.h> +#endif #define mp_debug(...) g_debug ("libmoonmp-plugin: " __VA_ARGS__) #define mp_error(...) g_warning ("libmoonmp-plugin: " __VA_ARGS__) @@ -31,9 +35,15 @@ typedef struct { MoonEntry_NP_Shutdown np_shutdown; MoonEntry_NP_GetValue np_getvalue; +#ifdef HAVE_NPFUNCTIONS_H + NPP_NewProcPtr moon_npp_new; + NPP_DestroyProcPtr moon_npp_destroy; + NPP_StreamAsFileProcPtr moon_npp_stream_as_file; +#else NPP_NewUPP moon_npp_new; NPP_DestroyUPP moon_npp_destroy; NPP_StreamAsFileUPP moon_npp_stream_as_file; +#endif NPNetscapeFuncs mozilla_funcs; } MoonlightPlugin; plugin/mmp-plugin.h @@ -7,6 +7,8 @@ // Copyright 2009 Novell, Inc. // +#include <config.h> + #include <string.h> #include "mmp-script.h" plugin/mmp-script.c @@ -11,7 +11,11 @@ #define _MMP_SCRIPT_H #include <glib.h> +#ifdef HAVE_NPFUNCTIONS_H +#include <npfunctions.h> +#else #include <npupp.h> +#endif G_BEGIN_DECLS plugin/mmp-script.h b80f974aaa215a59c852209c767a914d171f9d42 Jeffrey Stedfast fejj@gnome.org http://github.com/abock/moonshine/commit/1e6efed14d57c937005f8610e2a4fadfea37cfa4 1e6efed14d57c937005f8610e2a4fadfea37cfa4 2009-09-02T12:53:06-07:00 2009-09-02T12:33:04-07:00 Fixes to work with Moonlight 2.0 2009-09-02 Jeffrey Setdfast <fejj@novell.com> * configure.ac: Update MAX_FIREFOX_VERSION to 3.5.* and add checks for npfunctions.h vs npupp.h. Also bumped Moonshine version to 0.4. * player/moonshine-player.js: Fixed CenetredOffset getter to be a setter as it should have been. * plugin/mmp-binder.c: Silverlight 2.0 requires the toplevel element to have the root XAML namespace. * plugin/mmp-plugin-proxy.c: Need to LAZY-bind libmoonloader.so in order to work with Moonlight 2.0 since it dynamically loads libmoon.so * plugin/mmp-plugin.h: Fixed to build with FF3.5 by conditionally including npfunctions.h instead of npupp.h. * plugin/*.c: Fixed to #include <config.h> so the headers get the proper defines (like HAVE_NPFUNCTIONS_H). 9f86e3093a035e515e3bef043f13574898fcc923 Aaron Bockover abockover@novell.com