Index: Makefile =================================================================== RCS file: /cvs/ports/www/gecko-mediaplayer/Makefile,v retrieving revision 1.7 diff -N -u -p Makefile --- Makefile 27 Jul 2009 21:44:14 -0000 1.7 +++ Makefile 12 Oct 2009 18:44:45 -0000 @@ -1,8 +1,8 @@ # $OpenBSD: Makefile,v 1.7 2009/07/27 21:44:14 martynas Exp $ COMMENT = gnome-mplayer browser media plugin -DISTNAME = gecko-mediaplayer-0.9.5 -PKGNAME = ${DISTNAME}p3 +V = 0.9.8 +DISTNAME = gecko-mediaplayer-$V CATEGORIES = www MAINTAINER = David Coppa @@ -23,8 +23,8 @@ WANTLIB = ORBit-2 dbus-1 dbus-glib-1 glib-2.0 gmodule MODULES = devel/gettext \ devel/gconf2 -BUILD_DEPENDS = :xulrunner-devel-*:devel/xulrunner/1.8,-devel -RUN_DEPENDS = ::x11/gnome-mplayer +BUILD_DEPENDS = :xulrunner-devel-*:devel/xulrunner/1.9,-devel +RUN_DEPENDS = :gnome-mplayer-=$V:x11/gnome-mplayer USE_X11 = Yes USE_LIBTOOL = Yes @@ -34,7 +34,10 @@ MODGCONF2_SCHEMAS_DIR = gecko-mediaplayer CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include \ -I${X11BASE}/include \ - -I${LOCALBASE}/xulrunner/include/xpcom -DBSD" \ + -I${LOCALBASE}/xulrunner1.9/include \ + -I${LOCALBASE}/xulrunner1.9/include/java \ + -I${LOCALBASE}/xulrunner1.9/include/plugin -DOPENBSD \ + -I${LOCALBASE}/xulrunner1.9/include/pref" \ LDFLAGS="-L${LOCALBASE}/lib \ -L${X11BASE}/lib" CONFIGURE_ARGS = --with-gconf Index: distinfo =================================================================== RCS file: /cvs/ports/www/gecko-mediaplayer/distinfo,v retrieving revision 1.1.1.1 diff -N -u -p distinfo --- distinfo 16 Mar 2009 13:00:19 -0000 1.1.1.1 +++ distinfo 12 Oct 2009 18:44:45 -0000 @@ -1,5 +1,5 @@ -MD5 (gecko-mediaplayer-0.9.5.tar.gz) = 95b83f30a41769e14a3c7bbb422b514e -RMD160 (gecko-mediaplayer-0.9.5.tar.gz) = 674de88a6654c829855094d5d20f8d21bebd768b -SHA1 (gecko-mediaplayer-0.9.5.tar.gz) = 74ad7f5f62f8c7bc0709d25bc14c668f545cec75 -SHA256 (gecko-mediaplayer-0.9.5.tar.gz) = 60cd30e5d44e0ee1e3b96309c3767f5f2eb1cbc29d3d49b7c624cfa60579bf16 -SIZE (gecko-mediaplayer-0.9.5.tar.gz) = 220301 +MD5 (gecko-mediaplayer-0.9.8.tar.gz) = TfAJ0hsalcNcmt/bb7yW/g== +RMD160 (gecko-mediaplayer-0.9.8.tar.gz) = Rq5nnREveFO1gmjefW5aRESkeX0= +SHA1 (gecko-mediaplayer-0.9.8.tar.gz) = ofkBdsBEc3SsZRjx6yOYS8KoiuM= +SHA256 (gecko-mediaplayer-0.9.8.tar.gz) = pR6/AAIbHV1Dg37evQ+yjY9tJiYRHEw5HosPZRUASqE= +SIZE (gecko-mediaplayer-0.9.8.tar.gz) = 257788 Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/www/gecko-mediaplayer/patches/patch-configure,v retrieving revision 1.1.1.1 diff -N -u -p patches/patch-configure --- patches/patch-configure 16 Mar 2009 13:00:19 -0000 1.1.1.1 +++ patches/patch-configure 12 Oct 2009 18:44:45 -0000 @@ -1,10 +1,30 @@ $OpenBSD: patch-configure,v 1.1.1.1 2009/03/16 13:00:19 ajacoutot Exp $ ---- configure.orig Wed Feb 11 15:49:36 2009 -+++ configure Mon Mar 16 12:44:52 2009 -@@ -8375,225 +8375,6 @@ if test -n "$GECKO_CFLAGS"; then - pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ +--- configure.orig Thu Sep 3 13:28:25 2009 ++++ configure Mon Oct 12 06:40:06 2009 +@@ -8699,308 +8699,6 @@ fi + + + +-# Check whether --with-xulrunner-sdk was given. +-if test "${with_xulrunner_sdk+set}" = set; then +- withval=$with_xulrunner_sdk; +- XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk +- GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java" +- GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl" +- +-fi +- +- +-if test "$GECKO_CFLAGS" = ""; then +- +-pkg_failed=no +-{ $as_echo "$as_me:$LINENO: checking for GECKO" >&5 +-$as_echo_n "checking for GECKO... " >&6; } +- +-if test -n "$GECKO_CFLAGS"; then +- pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"mozilla-plugin mozilla-xpcom\"") >&5 - ($PKG_CONFIG --exists --print-errors "mozilla-plugin mozilla-xpcom") 2>&5 - ac_status=$? @@ -224,6 +244,69 @@ $OpenBSD: patch-configure,v 1.1.1.1 2009/03/16 13:00:1 - pkg_cv_GECKO_CFLAGS="$GECKO_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin xulrunner-xpcom\"") >&5 - ($PKG_CONFIG --exists --print-errors "xulrunner-plugin xulrunner-xpcom") 2>&5 - ac_status=$? +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin xulrunner-xpcom\"") >&5 +- ($PKG_CONFIG --exists --print-errors "xulrunner-plugin xulrunner-xpcom") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_GECKO_CFLAGS=`$PKG_CONFIG --cflags "xulrunner-plugin xulrunner-xpcom" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$GECKO_LIBS"; then +- pkg_cv_GECKO_LIBS="$GECKO_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xulrunner-plugin xulrunner-xpcom\"") >&5 +- ($PKG_CONFIG --exists --print-errors "xulrunner-plugin xulrunner-xpcom") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then +- pkg_cv_GECKO_LIBS=`$PKG_CONFIG --libs "xulrunner-plugin xulrunner-xpcom" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GECKO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xulrunner-plugin xulrunner-xpcom" 2>&1` +- else +- GECKO_PKG_ERRORS=`$PKG_CONFIG --print-errors "xulrunner-plugin xulrunner-xpcom" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GECKO_PKG_ERRORS" >&5 +- +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- { $as_echo "$as_me:$LINENO: WARNING: xulrunner-plugin not found, trying another" >&5 +-$as_echo "$as_me: WARNING: xulrunner-plugin not found, trying another" >&2;} +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:$LINENO: WARNING: xulrunner-plugin not found, trying another" >&5 +-$as_echo "$as_me: WARNING: xulrunner-plugin not found, trying another" >&2;} +-else +- GECKO_CFLAGS=$pkg_cv_GECKO_CFLAGS +- GECKO_LIBS=$pkg_cv_GECKO_LIBS +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- +- +-fi +-fi +- + if test "$GECKO_CFLAGS" = ""; then + + pkg_failed=no Index: patches/patch-src_Makefile_in =================================================================== RCS file: /cvs/ports/www/gecko-mediaplayer/patches/patch-src_Makefile_in,v retrieving revision 1.1.1.1 diff -N -u -p patches/patch-src_Makefile_in --- patches/patch-src_Makefile_in 16 Mar 2009 13:00:19 -0000 1.1.1.1 +++ patches/patch-src_Makefile_in 12 Oct 2009 18:44:45 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2009/03/16 13:00:19 ajacoutot Exp $ ---- src/Makefile.in.orig Wed Feb 11 15:51:28 2009 -+++ src/Makefile.in Mon Mar 16 12:44:52 2009 -@@ -266,7 +266,7 @@ COMMONCODE = \ +--- src/Makefile.in.orig Thu Sep 3 13:28:27 2009 ++++ src/Makefile.in Mon Oct 12 05:57:07 2009 +@@ -312,7 +312,7 @@ COMMONCODE = \ npp_gate.cpp \ npupp.h Index: patches/patch-src_plugin_cpp =================================================================== RCS file: patches/patch-src_plugin_cpp diff -N -u -p patches/patch-src_plugin_cpp --- /dev/null 12 Oct 2009 18:44:45 -0000 +++ patches/patch-src_plugin_cpp 12 Oct 2009 18:44:45 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ +--- src/plugin.cpp.orig Mon Oct 12 06:28:37 2009 ++++ src/plugin.cpp Mon Oct 12 06:28:54 2009 +@@ -42,9 +42,9 @@ + #include "plugin_setup.h" + #include "plugin_types.h" + #include "plugin_dbus.h" +-#include "nsIPrefBranch.h" +-#include "nsIPrefService.h" +-#include "nsIServiceManager.h" ++#include ++#include ++#include + + nsIPrefBranch *prefBranch = NULL; + nsIPrefService *prefService = NULL; Index: patches/patch-src_plugin_list_cpp =================================================================== RCS file: patches/patch-src_plugin_list_cpp diff -N -u -p patches/patch-src_plugin_list_cpp --- /dev/null 12 Oct 2009 18:44:45 -0000 +++ patches/patch-src_plugin_list_cpp 12 Oct 2009 18:44:45 -0000 @@ -0,0 +1,21 @@ +$OpenBSD$ +--- src/plugin_list.cpp.orig Mon Oct 12 06:35:56 2009 ++++ src/plugin_list.cpp Mon Oct 12 06:36:40 2009 +@@ -356,7 +356,7 @@ GList *list_parse_qt2(GList * list, ListItem * item) + return list; + } else { + while (p != NULL) { +- urlptr = (gchar *) memmem(p,datalen - (p - data), "url ", 4); ++ urlptr = (gchar *) memmem_compat(p,datalen - (p - data), "url ", 4); + + + if (urlptr == NULL) { +@@ -385,7 +385,7 @@ GList *list_parse_qt2(GList * list, ListItem * item) + item->id = -1; + list = g_list_append(list, newitem); + } +- p = (gchar *) memmem(urlptr,datalen - (urlptr - data),"mmdr",4); ++ p = (gchar *) memmem_compat(urlptr,datalen - (urlptr - data),"mmdr",4); + } + + } Index: patches/patch-src_plugin_types_std_cpp =================================================================== RCS file: /cvs/ports/www/gecko-mediaplayer/patches/patch-src_plugin_types_std_cpp,v retrieving revision 1.1 diff -N -u -p patches/patch-src_plugin_types_std_cpp --- patches/patch-src_plugin_types_std_cpp 14 Apr 2009 09:39:50 -0000 1.1 +++ /dev/null 28 Sep 2008 10:50:08 -0000 @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_plugin_types_std_cpp,v 1.1 2009/04/14 09:39:50 ajacoutot Exp $ ---- src/plugin_types_std.cpp.orig Sun Apr 12 23:23:34 2009 -+++ src/plugin_types_std.cpp Sun Apr 12 23:25:33 2009 -@@ -116,7 +116,7 @@ NPError PluginGetValue(NPPVariable variable, void *val - // some sites use this description to figure out what formats can be played. So we have to make sure the - // description matches the features - if (variable == NPPVpluginNameString) { -- *((const char **) value) = "gecko-mediaplayer " VERSION; -+ *((const char **) value) = "mplayerplug-in is now gecko-mediaplayer " VERSION; - } - if (variable == NPPVpluginDescriptionString) { - *((const char **) value) = Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/gecko-mediaplayer/pkg/PLIST,v retrieving revision 1.2 diff -N -u -p pkg/PLIST --- pkg/PLIST 7 Jun 2009 06:44:42 -0000 1.2 +++ pkg/PLIST 12 Oct 2009 18:44:45 -0000 @@ -13,10 +13,12 @@ share/doc/gecko-mediaplayer/INSTALL share/doc/gecko-mediaplayer/NEWS share/doc/gecko-mediaplayer/README share/doc/gecko-mediaplayer/javascript.txt +share/locale/cs/LC_MESSAGES/gecko-mediaplayer.mo share/locale/es/LC_MESSAGES/gecko-mediaplayer.mo share/locale/fr/LC_MESSAGES/gecko-mediaplayer.mo share/locale/it/LC_MESSAGES/gecko-mediaplayer.mo share/locale/ja/LC_MESSAGES/gecko-mediaplayer.mo +share/locale/nl/LC_MESSAGES/gecko-mediaplayer.mo share/locale/pl/LC_MESSAGES/gecko-mediaplayer.mo share/locale/pt_BR/LC_MESSAGES/gecko-mediaplayer.mo share/locale/tr/LC_MESSAGES/gecko-mediaplayer.mo