Hi,
- update to 3.55
- sync wantlib
- install plugins to ${PREFIX}/lib/mozilla-plugins, requested by
claudio@, with help from martynas@
- patches which resolve mplayer zombies and firefox freeze when closing
movie when mplayer is still playing it
Sum of all: finaly this plugin works for me as expected. Please review.
Tested on i386.
--
best regards
q#
diff -ruN -xCVS mplayerplug-in.orig/Makefile mplayerplug-in/Makefile
--- mplayerplug-in.orig/Makefile Thu Aug 21 03:56:21 2008
+++ mplayerplug-in/Makefile Wed Feb 11 02:15:50 2009
@@ -4,8 +4,7 @@
COMMENT= embedded video player for mozilla
-DISTNAME= mplayerplug-in-3.50
-PKGNAME= ${DISTNAME}p0
+DISTNAME= mplayerplug-in-3.55
CATEGORIES= www
@@ -22,22 +21,25 @@
WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xpm Xrandr Xrender Xt atk-1.0 cairo \
expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
- glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \
+ gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \
gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
- png z
+ pixman-1 png z
+
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mplayerplug-in/}
MODULES= devel/gettext
-BUILD_DEPENDS= :xulrunner-devel-*:devel/xulrunner,-devel
-RUN_DEPENDS= ::www/mozilla-firefox \
+BUILD_DEPENDS= :automake-1.4.*:devel/automake/1.4 \
+ :xulrunner-devel-*:devel/xulrunner,-devel
+RUN_DEPENDS= :mozilla-firefox-*|firefox3-*:www/mozilla-firefox \
::x11/mplayer
USE_X11= yes
USE_GMAKE= yes
AUTOCONF_VERSION= 2.61
+AUTOMAKE_VERSION= 1.4
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS+= --enable-gmp
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
@@ -47,8 +49,6 @@
NO_REGRESS= Yes
-WRKDIST= ${WRKDIR}/mplayerplug-in/
-
PLUGINS= mplayerplug-in.so mplayerplug-in-wmp.so \
mplayerplug-in-qt.so mplayerplug-in-rm.so \
mplayerplug-in-gmp.so mplayerplug-in-dvx.so
@@ -59,18 +59,15 @@
post-patch:
@perl -pi -e 's|/etc|${SYSCONFDIR}/mplayerplug-in|g' \
- ${WRKDIST}/Source/plugin-setup.cpp
+ ${WRKDIST}/Source/plugin-setup.cpp
+ @cd ${WRKSRC} && \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ${LOCALBASE}/bin/aclocal
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/mozilla-firefox/plugins
- ${INSTALL_DATA_DIR} ${PREFIX}/mozilla-firefox/components
-.for i in ${PLUGINS}
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/mozilla-plugins
+.for i in ${PLUGINS} ${COMPONENTS}
${INSTALL_DATA} ${WRKSRC}/$i \
- ${PREFIX}/mozilla-firefox/plugins
-.endfor
-.for i in ${COMPONENTS}
- ${INSTALL_DATA} ${WRKSRC}/$i \
- ${PREFIX}/mozilla-firefox/components
+ ${PREFIX}/lib/mozilla-plugins
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mplayerplug-in
${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.{conf,types} \
diff -ruN -xCVS mplayerplug-in.orig/distinfo mplayerplug-in/distinfo
--- mplayerplug-in.orig/distinfo Mon Dec 17 21:30:10 2007
+++ mplayerplug-in/distinfo Sun Jul 20 13:19:22 2008
@@ -1,5 +1,5 @@
-MD5 (mplayerplug-in-3.50.tar.gz) = epMGw59lUAkMFrnB2H4xaA==
-RMD160 (mplayerplug-in-3.50.tar.gz) = brYd8MBuG59hGL5Pdb8FZIu429g=
-SHA1 (mplayerplug-in-3.50.tar.gz) = VOXXo7M/UDgwGDVF97wnjTfLidU=
-SHA256 (mplayerplug-in-3.50.tar.gz) =
BGuOZe5ORWhFO3dJ1+YPUhqHwvmZD0bQIdooPihfTAI=
-SIZE (mplayerplug-in-3.50.tar.gz) = 452730
+MD5 (mplayerplug-in-3.55.tar.gz) = y1nTIiHPvQS2qLO7VVk0hA==
+RMD160 (mplayerplug-in-3.55.tar.gz) = 4BIksUiDqTIRdFvgoymj9STznYw=
+SHA1 (mplayerplug-in-3.55.tar.gz) = aXJtThZSOxo5woTv7ggcMbDqf38=
+SHA256 (mplayerplug-in-3.55.tar.gz) =
ulr/3kxdWonIv5h66TJtqrv46oJ5/M1YlHTlFX/Ge34=
+SIZE (mplayerplug-in-3.55.tar.gz) = 281845
diff -ruN -xCVS mplayerplug-in.orig/patches/patch-Source_plugin-support_cpp
mplayerplug-in/patches/patch-Source_plugin-support_cpp
--- mplayerplug-in.orig/patches/patch-Source_plugin-support_cpp Thu Jan 1
01:00:00 1970
+++ mplayerplug-in/patches/patch-Source_plugin-support_cpp Mon Feb 9
11:32:54 2009
@@ -0,0 +1,20 @@
+$OpenBSD$
+
+http://www.freebsd.org/cgi/cvsweb.cgi/ports/www/mplayer-plugin/files/patch-Source_plugin-support.cpp
+
+--- Source/plugin-support.cpp.orig Wed May 28 15:50:46 2008
++++ Source/plugin-support.cpp Mon Feb 9 11:32:08 2009
+@@ -505,9 +505,13 @@ void killmplayer(nsPluginInstance * instance)
+ if (instance->paused == 1)
+ sendCommand(instance, "pause\n");
+ sendCommand(instance, "quit\n");
++#ifndef BSD
+ pthread_mutex_lock(&(instance->read_mutex));
++#endif
+ instance->cancelled = 1;
++#ifndef BSD
+ pthread_mutex_unlock(&(instance->read_mutex));
++#endif
+
+ /* count = 0;
+ while (count < 500) {
diff -ruN -xCVS mplayerplug-in.orig/patches/patch-Source_plugin-threads_cpp
mplayerplug-in/patches/patch-Source_plugin-threads_cpp
--- mplayerplug-in.orig/patches/patch-Source_plugin-threads_cpp Thu Jan 1
01:00:00 1970
+++ mplayerplug-in/patches/patch-Source_plugin-threads_cpp Wed Feb 11
01:59:00 2009
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- Source/plugin-threads.cpp.orig Fri Jun 13 04:38:37 2008
++++ Source/plugin-threads.cpp Wed Feb 11 01:58:54 2009
+@@ -14,8 +14,11 @@ extern int errno;
+
+ static void sig_child(int signo)
+ {
+- // Not used, so commented out
+- // wait(NULL);
++ pid_t pid;
++ int status;
++
++ pid = wait(&status);
++ return;
+ }
+
+
diff -ruN -xCVS mplayerplug-in.orig/patches/patch-configure_in
mplayerplug-in/patches/patch-configure_in
--- mplayerplug-in.orig/patches/patch-configure_in Wed Jan 23 16:36:03 2008
+++ mplayerplug-in/patches/patch-configure_in Wed Jul 23 16:11:52 2008
@@ -1,30 +1,33 @@
$OpenBSD: patch-configure_in,v 1.1 2008/01/23 16:36:03 martynas Exp $
---- configure.in.orig Sun Dec 2 01:23:04 2007
-+++ configure.in Mon Jan 14 00:56:00 2008
-@@ -53,22 +53,7 @@ if test "$use_rpath" = "yes"; then
+--- configure.in.orig Tue Jun 24 14:12:43 2008
++++ configure.in Wed Jul 23 16:10:56 2008
+@@ -53,25 +53,7 @@ if test "$use_rpath" = "yes"; then
fi
],[
- AC_MSG_NOTICE([Determining mozilla/firefox packages to build against])
-- PKG_CHECK_MODULES(MOZPLUG,[mozilla-plugin],[AC_SUBST(MOZPLUG_CFLAGS)
MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir
mozilla-plugin`"
+- PKG_CHECK_MODULES(MOZPLUG,[mozilla-plugin
mozilla-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir mozilla-plugin`"
-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir mozilla-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir mozilla-xpcom`
-],[AC_MSG_WARN([mozilla-plugin not found])])
-
if test "$MOZPLUG_CFLAGS" = ""; then
- PKG_CHECK_MODULES(MOZPLUG,[firefox-plugin
firefox-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir firefox-plugin`"
-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir firefox-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir firefox-xpcom`
-],[AC_MSG_WARN([firefox-plugin not found])])
- fi
- if test "$MOZPLUG_CFLAGS" = ""; then
--
PKG_CHECK_MODULES(MOZPLUG,[seamonkey-plugin],[AC_SUBST(MOZPLUG_CFLAGS)
MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir
seamonkey-plugin`"
+- PKG_CHECK_MODULES(MOZPLUG,[seamonkey-plugin
seamonkey-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir seamonkey-plugin`"
-MOZILLA_HOME=`$PKG_CONFIG --variable=libdir seamonkey-plugin`
+-GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir seamonkey-xpcom`
-],[AC_MSG_WARN([seamonkey-plugin not found])])
- fi
- if test "$MOZPLUG_CFLAGS" = ""; then
-
PKG_CHECK_MODULES(MOZPLUG,[xulrunner-plugin],[AC_SUBST(MOZPLUG_CFLAGS)
MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir
xulrunner-plugin`"
+ PKG_CHECK_MODULES(MOZPLUG,[xulrunner-plugin
xulrunner-xpcom],[AC_SUBST(MOZPLUG_CFLAGS) MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS}
-I`$PKG_CONFIG --variable=includedir xulrunner-plugin`"
MOZILLA_HOME=`$PKG_CONFIG --variable=libdir xulrunner-plugin`
- ],[AC_MSG_WARN([xulrunner-plugin not found])])
-@@ -194,8 +179,7 @@ AC_TYPE_SIZE_T
+ GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir xulrunner-xpcom`
+@@ -212,8 +194,7 @@ AC_TYPE_SIZE_T
AC_FUNC_MALLOC
AC_FUNC_FORK
AC_CHECK_FUNCS([memset strcasecmp strchr strdup strncasecmp strstr strrchr
snprintf mkfifo dup2 gettimeofday strerror strtol mkdir setlocale])
diff -ruN -xCVS mplayerplug-in.orig/pkg/PLIST mplayerplug-in/pkg/PLIST
--- mplayerplug-in.orig/pkg/PLIST Fri Oct 12 20:57:56 2007
+++ mplayerplug-in/pkg/PLIST Sun Sep 14 21:27:38 2008
@@ -1,16 +1,17 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2007/10/12 19:57:56 jasper Exp $
-mozilla-firefox/components/mplayerplug-in-dvx.xpt
-mozilla-firefox/components/mplayerplug-in-gmp.xpt
-mozilla-firefox/components/mplayerplug-in-qt.xpt
-mozilla-firefox/components/mplayerplug-in-rm.xpt
-mozilla-firefox/components/mplayerplug-in-wmp.xpt
-mozilla-firefox/components/mplayerplug-in.xpt
-mozilla-firefox/plugins/mplayerplug-in-dvx.so
-mozilla-firefox/plugins/mplayerplug-in-gmp.so
-mozilla-firefox/plugins/mplayerplug-in-qt.so
-mozilla-firefox/plugins/mplayerplug-in-rm.so
-mozilla-firefox/plugins/mplayerplug-in-wmp.so
-mozilla-firefox/plugins/mplayerplug-in.so
+lib/mozilla-plugins/
+lib/mozilla-plugins/mplayerplug-in-dvx.so
+lib/mozilla-plugins/mplayerplug-in-dvx.xpt
+lib/mozilla-plugins/mplayerplug-in-gmp.so
+lib/mozilla-plugins/mplayerplug-in-gmp.xpt
+lib/mozilla-plugins/mplayerplug-in-qt.so
+lib/mozilla-plugins/mplayerplug-in-qt.xpt
+lib/mozilla-plugins/mplayerplug-in-rm.so
+lib/mozilla-plugins/mplayerplug-in-rm.xpt
+lib/mozilla-plugins/mplayerplug-in-wmp.so
+lib/mozilla-plugins/mplayerplug-in-wmp.xpt
+lib/mozilla-plugins/mplayerplug-in.so
+lib/mozilla-plugins/mplayerplug-in.xpt
share/examples/mplayerplug-in/
@sample ${SYSCONFDIR}/mplayerplug-in/
share/examples/mplayerplug-in/mplayerplug-in.conf
@@ -29,6 +30,7 @@
share/locale/it/LC_MESSAGES/mplayerplug-in.mo
share/locale/ja/LC_MESSAGES/mplayerplug-in.mo
share/locale/ko/LC_MESSAGES/mplayerplug-in.mo
+share/locale/nb/LC_MESSAGES/mplayerplug-in.mo
share/locale/nl/LC_MESSAGES/mplayerplug-in.mo
share/locale/pl/LC_MESSAGES/mplayerplug-in.mo
share/locale/pt_BR/LC_MESSAGES/mplayerplug-in.mo
