Hello community, here is the log from the commit of package moonshine for openSUSE:Factory checked in at Wed Apr 21 01:59:38 CEST 2010. -------- --- moonshine/moonshine.changes 2009-03-31 23:46:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/moonshine/moonshine.changes 2010-03-16 21:04:51.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Feb 23 03:21:34 UTC 2010 - bgmerrell@novell.com + +- Moonlight two changes part of the install path from "moon" to + "moonlight". Add a patch (moonshine-search-prefix.patch) has + been added to search the new paths (in additional to the old + ones). + +------------------------------------------------------------------- +Sun Feb 21 07:56:09 UTC 2010 - bgmerrell@novell.com + +- Version 0.4 + * Compatible with Moonlight 2 + * Other bug fixes +- Add patch to support both packaged and XPI versions of moon + (moonshine-loader.patch) +- Add patch to fix problem with downloading codecs properly + (moonshine-downloader.patch) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- moonshine-0.3.tar.bz2 New: ---- moonshine-0.4.tar.bz2 moonshine-downloader.patch moonshine-loader.patch moonshine-search-prefix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ moonshine.spec ++++++ --- /var/tmp/diff_new_pack.UD1mfn/_old 2010-04-21 01:59:31.000000000 +0200 +++ /var/tmp/diff_new_pack.UD1mfn/_new 2010-04-21 01:59:31.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package moonshine (Version 0.3) +# spec file for package moonshine (Version 0.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,17 +19,21 @@ Name: moonshine -License: X11/MIT +License: MIT Group: Productivity/Multimedia/Video/Players Summary: Desktop Shell for the Moonshine Media Player Plugin Url: http://moonshine.cc/ -Version: 0.3 -Release: 2 +Version: 0.4 +Release: 1 Source: %{name}-%{version}.tar.bz2 +Patch0: moonshine-loader.patch +Patch1: moonshine-downloader.patch +Patch2: moonshine-search-prefix.patch ExclusiveArch: %ix86 x86_64 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkg-config update-desktop-files -BuildRequires: glib2-devel mozilla-xulrunner190-devel +BuildRequires: glib2-devel mozilla-xulrunner191-devel +Requires: moonlight-plugin Requires: moonshine-plugin = %{version} %description @@ -45,10 +49,11 @@ Aaron Bockover <abockover@novell.com> %package plugin -License: X11/MIT +License: MIT Group: Productivity/Multimedia/Video/Players Summary: Moonlight-based Browser Plugin for Windows Media Support Requires: moonlight-plugin >= 1.0.1 +Conflicts: totem-browser-plugin-gmp %description plugin Moonshine leverages the Windows Media capabilities from Silverlight, @@ -63,7 +68,10 @@ Aaron Bockover <abockover@novell.com> %prep -%setup -q +%setup -q -n %{name}-%{version} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %{?env_options} ++++++ moonshine-0.3.tar.bz2 -> moonshine-0.4.tar.bz2 ++++++ ++++ 4508 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/INSTALL new/moonshine-0.4/INSTALL --- old/moonshine-0.3/INSTALL 2009-02-24 02:53:43.000000000 +0100 +++ new/moonshine-0.4/INSTALL 2010-02-21 08:40:00.000000000 +0100 @@ -2,15 +2,15 @@ ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. +2006, 2007, 2008, 2009 Free Software Foundation, Inc. -This file is free documentation; the Free Software Foundation gives + This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== -Briefly, the shell commands `./configure; make; make install' should + Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. @@ -73,9 +73,9 @@ Compilers and Options ===================== -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. + Some systems require unusual options for compilation or linking that +the `configure' script does not know about. Run `./configure --help' +for details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -88,7 +88,7 @@ Compiling For Multiple Architectures ==================================== -You can compile the package for more than one kind of computer at the + You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run @@ -100,10 +100,24 @@ installed the package for one architecture, use `make distclean' before reconfiguring for another architecture. + On MacOS X 10.5 and later systems, you can create libraries and +executables that work on multiple system types--known as "fat" or +"universal" binaries--by specifying multiple `-arch' options to the +compiler but only a single `-arch' option to the preprocessor. Like +this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you +may have to build one architecture at a time and combine the results +using the `lipo' tool if you have problems. + Installation Names ================== -By default, `make install' installs the package's commands under + By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving `configure' the option `--prefix=PREFIX'. @@ -126,7 +140,7 @@ Optional Features ================= -Some packages pay attention to `--enable-FEATURE' options to + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -138,14 +152,46 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. +Particular systems +================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU +CC is not installed, it is recommended to use the following options in +order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + +and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot +parse its `<wchar.h>' header file. The option `-nodtk' can be used as +a workaround. If GNU CC is not installed, it is therefore recommended +to try + + ./configure CC="cc" + +and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the + There may be some features `configure' cannot figure out +automatically, but needs to determine by the type of machine the package +will run on. Usually, assuming the package is built to be run on the +_same_ architectures, `configure' can figure that out, but if it prints +a message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -153,7 +199,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't @@ -171,9 +218,9 @@ Sharing Defaults ================ -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. + If you want to set default values for `configure' scripts to share, +you can create a site shell script called `config.site' that gives +default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -182,7 +229,7 @@ Defining Variables ================== -Variables not defined in a site shell script can be set in the + Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -201,11 +248,19 @@ `configure' Invocation ====================== -`configure' recognizes the following options to control how it operates. + `configure' recognizes the following options to control how it +operates. `--help' `-h' - Print a summary of the options to `configure', and exit. + Print a summary of all of the options to `configure', and exit. + +`--help=short' +`--help=recursive' + Print a summary of the options unique to this package's + `configure', and exit. The `short' variant lists options used + only in the top level, while the `recursive' variant lists options + also present in any nested packages. `--version' `-V' @@ -232,6 +287,16 @@ Look for the package's source code in directory DIR. Usually `configure' can determine that directory automatically. +`--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + +`--no-create' +`-n' + Run the configure checks, but stop before creating any output + files. + `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/config.h.in new/moonshine-0.4/config.h.in --- old/moonshine-0.3/config.h.in 2009-02-24 02:53:42.000000000 +0100 +++ new/moonshine-0.4/config.h.in 2010-02-21 08:39:58.000000000 +0100 @@ -9,6 +9,9 @@ /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H +/* Define to 1 if you have the <npfunctions.h> header file. */ +#undef HAVE_NPFUNCTIONS_H + /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/configure.ac new/moonshine-0.4/configure.ac --- old/moonshine-0.3/configure.ac 2009-02-24 02:53:35.000000000 +0100 +++ new/moonshine-0.4/configure.ac 2010-02-21 05:44:21.000000000 +0100 @@ -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 @@ 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]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/missing new/moonshine-0.4/missing --- old/moonshine-0.3/missing 2009-02-24 02:53:43.000000000 +0100 +++ new/moonshine-0.4/missing 2010-02-21 08:40:00.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see http://www.gnu.org/licenses/. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create `y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes `gnu-', `gnu', and +`g' are ignored when checking the name. + Send bug reports to <bug-automake@gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: `tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified `acconfig.h' or `${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: `$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: `$1' $msg. You should only need it if you modified a `.y' file. You may need the `Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.l' file. You may need the `Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: `$1' is $msg. You should only need it if you modified a `.texi' or `.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/player/moonshine-player.js new/moonshine-0.4/player/moonshine-player.js --- old/moonshine-0.3/player/moonshine-player.js 2009-02-24 02:56:41.000000000 +0100 +++ new/moonshine-0.4/player/moonshine-player.js 2010-02-21 05:44:21.000000000 +0100 @@ -63,7 +63,7 @@ })); }; - this.__defineGetter__ ("CenteredOffset", function (y) { + this.__defineSetter__ ("CenteredOffset", function (y) { this.ErrorPopup.CenteredOffsetY = y; this.BufferingPopup.CenteredOffsetY = y; this.AboutPopup.CenteredOffsetY = y; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/plugin/mmp-binder.c new/moonshine-0.4/plugin/mmp-binder.c --- old/moonshine-0.3/plugin/mmp-binder.c 2009-02-24 00:40:54.000000000 +0100 +++ new/moonshine-0.4/plugin/mmp-binder.c 2010-02-21 05:44:21.000000000 +0100 @@ -7,6 +7,8 @@ // Copyright 2009 Novell, Inc. // +#include <config.h> + #include <string.h> #include "mmp-binder.h" @@ -53,7 +55,7 @@ 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)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/plugin/mmp-plugin-proxy.c new/moonshine-0.4/plugin/mmp-plugin-proxy.c --- old/moonshine-0.3/plugin/mmp-plugin-proxy.c 2009-02-24 01:51:42.000000000 +0100 +++ new/moonshine-0.4/plugin/mmp-plugin-proxy.c 2010-02-21 05:44:21.000000000 +0100 @@ -73,7 +73,7 @@ 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) @@ -165,9 +165,12 @@ NULL, NULL, NULL, + (gchar *)"/usr/lib/moon/plugin", + (gchar *)"/usr/lib64/moon/plugin", + (gchar *)"/usr/local/lib/moon/plugin", + (gchar *)"/usr/local/lib64/moon/plugin", (gchar *)INSTALL_PREFIX "/lib/moon/plugin", - (gchar *)INSTALL_PREFIX "/lib64/moon/plugin", - (gchar *)INSTALL_PREFIX + (gchar *)INSTALL_PREFIX "/lib64/moon/plugin" }; MoonlightPlugin *plugin_host = MMP_HANDLE (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/plugin/mmp-plugin.c new/moonshine-0.4/plugin/mmp-plugin.c --- old/moonshine-0.3/plugin/mmp-plugin.c 2009-02-09 18:53:59.000000000 +0100 +++ new/moonshine-0.4/plugin/mmp-plugin.c 2010-02-21 05:44:21.000000000 +0100 @@ -7,6 +7,8 @@ // Copyright 2009 Novell, Inc. // +#include <config.h> + #include <string.h> #include "mmp-plugin.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/plugin/mmp-plugin.h new/moonshine-0.4/plugin/mmp-plugin.h --- old/moonshine-0.3/plugin/mmp-plugin.h 2009-02-09 18:54:03.000000000 +0100 +++ new/moonshine-0.4/plugin/mmp-plugin.h 2010-02-21 05:44:21.000000000 +0100 @@ -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 @@ 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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/plugin/mmp-script.c new/moonshine-0.4/plugin/mmp-script.c --- old/moonshine-0.3/plugin/mmp-script.c 2009-02-12 22:03:15.000000000 +0100 +++ new/moonshine-0.4/plugin/mmp-script.c 2010-02-21 05:44:21.000000000 +0100 @@ -7,6 +7,8 @@ // Copyright 2009 Novell, Inc. // +#include <config.h> + #include <string.h> #include "mmp-script.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/plugin/mmp-script.h new/moonshine-0.4/plugin/mmp-script.h --- old/moonshine-0.3/plugin/mmp-script.h 2009-02-09 18:54:19.000000000 +0100 +++ new/moonshine-0.4/plugin/mmp-script.h 2010-02-21 05:44:21.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/xulrunner/chrome/content/player/moonshine-player.js new/moonshine-0.4/xulrunner/chrome/content/player/moonshine-player.js --- old/moonshine-0.3/xulrunner/chrome/content/player/moonshine-player.js 2009-02-24 02:56:41.000000000 +0100 +++ new/moonshine-0.4/xulrunner/chrome/content/player/moonshine-player.js 2010-02-21 05:44:21.000000000 +0100 @@ -63,7 +63,7 @@ })); }; - this.__defineGetter__ ("CenteredOffset", function (y) { + this.__defineSetter__ ("CenteredOffset", function (y) { this.ErrorPopup.CenteredOffsetY = y; this.BufferingPopup.CenteredOffsetY = y; this.AboutPopup.CenteredOffsetY = y; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/xulrunner/chrome/locale/en-US/version.dtd new/moonshine-0.4/xulrunner/chrome/locale/en-US/version.dtd --- old/moonshine-0.3/xulrunner/chrome/locale/en-US/version.dtd 2009-02-24 02:55:54.000000000 +0100 +++ new/moonshine-0.4/xulrunner/chrome/locale/en-US/version.dtd 2010-02-21 08:40:15.000000000 +0100 @@ -1 +1 @@ -<!ENTITY moonshine.version "0.3"> +<!ENTITY moonshine.version "0.4"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/moonshine-0.3/xulrunner/defaults/preferences/debug.js new/moonshine-0.4/xulrunner/defaults/preferences/debug.js --- old/moonshine-0.3/xulrunner/defaults/preferences/debug.js 2009-02-09 14:27:03.000000000 +0100 +++ new/moonshine-0.4/xulrunner/defaults/preferences/debug.js 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -pref("browser.dom.window.dump.enabled", true); -pref("javascript.options.showInConsole", true); -pref("javascript.options.strict", true); -pref("nglayout.debug.disable_xul_cache", true); -pref("nglayout.debug.disable_xul_fastload", true); - ++++++ moonshine-downloader.patch ++++++ diff -dupr a/plugin/mmp-binder.c b/plugin/mmp-binder.c --- a/plugin/mmp-binder.c 2010-02-20 21:44:21.000000000 -0700 +++ b/plugin/mmp-binder.c 2010-02-21 00:54:51.000000000 -0700 @@ -170,8 +170,8 @@ mmp_binder_npp_destroy (NPP instance, NP typedef enum { STREAM_NOTIFY_NONE = 0, STREAM_NOTIFY_SOURCE = 1, - STREAM_NOTIFY_DOWNLOADER = 2, - STREAM_NOTIFY_REQUEST = 3 + STREAM_NOTIFY_SPLASHSOURCE = 2, + STREAM_NOTIFY_DOWNLOADER = 3 } StreamNotifyFlags; typedef struct { ++++++ moonshine-loader.patch ++++++ diff --git a/plugin/mmp-plugin-proxy.c b/plugin/mmp-plugin-proxy.c index 05a13d3..88a07c5 100644 --- a/plugin/mmp-plugin-proxy.c +++ b/plugin/mmp-plugin-proxy.c @@ -70,29 +70,38 @@ static gboolean mmp_plugin_proxy_load_module (gchar *prefix) { MoonlightPlugin *plugin_host = MMP_HANDLE (); + + // Moonlight's loader is named libmoonloader if it is installed as a + // package, and libmoonloaderxpi if it is installed as an XPI 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 | G_MODULE_BIND_LAZY); - - if (plugin_host->module != NULL - && mmp_plugin_proxy_load_symbol ("NP_Initialize", (gpointer *)&plugin_host->np_initialize) - && mmp_plugin_proxy_load_symbol ("NP_Shutdown", (gpointer *)&plugin_host->np_shutdown) - && mmp_plugin_proxy_load_symbol ("NP_GetValue", (gpointer *)&plugin_host->np_getvalue)) { - mp_debug ("Loaded Moonlight plugin: %s", path); + if (!g_file_test (path, G_FILE_TEST_EXISTS)) { + g_free (path); + path = g_module_build_path (prefix, "moonloaderxpi"); + if (!g_file_test (path, G_FILE_TEST_EXISTS)) { g_free (path); - return TRUE; - } else if (plugin_host->module != NULL) { - if (!g_module_close (plugin_host->module)) { - mp_error ("Could not unload library that was loaded but had invalid symbols: %s (%s)", - path, g_module_error ()); - } - plugin_host->module = NULL; + return FALSE; } - - mp_error ("Could not load Moonlight plugin: %s (%s)", path, g_module_error ()); } + 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) + && mmp_plugin_proxy_load_symbol ("NP_Shutdown", (gpointer *)&plugin_host->np_shutdown) + && mmp_plugin_proxy_load_symbol ("NP_GetValue", (gpointer *)&plugin_host->np_getvalue)) { + mp_debug ("Loaded Moonlight plugin: %s", path); + g_free (path); + return TRUE; + } else if (plugin_host->module != NULL) { + if (!g_module_close (plugin_host->module)) { + mp_error ("Could not unload library that was loaded but had invalid symbols: %s (%s)", + path, g_module_error ()); + } + plugin_host->module = NULL; + } + + mp_error ("Could not load Moonlight plugin: %s (%s)", path, g_module_error ()); + g_free (path); return FALSE; } ++++++ moonshine-search-prefix.patch ++++++ diff --git a/plugin/mmp-plugin-proxy.c b/plugin/mmp-plugin-proxy.c index 88a07c5..0aff9b3 100644 --- a/plugin/mmp-plugin-proxy.c +++ b/plugin/mmp-plugin-proxy.c @@ -174,10 +174,16 @@ mmp_plugin_proxy_load_moonlight () NULL, NULL, NULL, + (gchar *)"/usr/lib/moonlight/plugin", + (gchar *)"/usr/lib64/moonlight/plugin", (gchar *)"/usr/lib/moon/plugin", (gchar *)"/usr/lib64/moon/plugin", + (gchar *)"/usr/local/lib/moonlight/plugin", + (gchar *)"/usr/local/lib64/moonlight/plugin", (gchar *)"/usr/local/lib/moon/plugin", (gchar *)"/usr/local/lib64/moon/plugin", + (gchar *)INSTALL_PREFIX "/lib/moonlight/plugin", + (gchar *)INSTALL_PREFIX "/lib64/moonlight/plugin", (gchar *)INSTALL_PREFIX "/lib/moon/plugin", (gchar *)INSTALL_PREFIX "/lib64/moon/plugin" }; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org