From f3917ebd68fb896896933088861fbcbf6189ffff Mon Sep 17 00:00:00 2001 From: landry Date: Fri, 18 Jun 2010 16:55:10 +0000 Subject: [PATCH] I made you a diff to make mplayerplug-in build against xulrunner 1.9.2... but gecko-mediaplayer eated it^Wis its successor, so let's just drop this abandoned upstream cruft. Its developer works on gecko-mediaplayer anyway - so you should use it instead.. agreed/prodded by jasper@ dcoppa@ ajacoutot@ Gleydon Soares (MAINTAINER) --- www/Makefile | 3 +- www/mplayerplug-in/Makefile | 77 ------------------- www/mplayerplug-in/distinfo | 5 -- www/mplayerplug-in/patches/patch-Makefile_in | 32 -------- .../patches/patch-Source_plugin-support_cpp | 20 ----- .../patches/patch-Source_plugin-threads_cpp | 21 ----- www/mplayerplug-in/patches/patch-configure_in | 39 ---------- www/mplayerplug-in/pkg/DESCR | 7 -- www/mplayerplug-in/pkg/PLIST | 44 ----------- 9 files changed, 1 insertion(+), 247 deletions(-) delete mode 100644 www/mplayerplug-in/Makefile delete mode 100644 www/mplayerplug-in/distinfo delete mode 100644 www/mplayerplug-in/patches/patch-Makefile_in delete mode 100644 www/mplayerplug-in/patches/patch-Source_plugin-support_cpp delete mode 100644 www/mplayerplug-in/patches/patch-Source_plugin-threads_cpp delete mode 100644 www/mplayerplug-in/patches/patch-configure_in delete mode 100644 www/mplayerplug-in/pkg/DESCR delete mode 100644 www/mplayerplug-in/pkg/PLIST diff --git a/www/Makefile b/www/Makefile index ec628f31413..fd6738a6ab0 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.458 2010/04/24 00:08:03 jasper Exp $ +# $OpenBSD: Makefile,v 1.459 2010/06/18 16:55:10 landry Exp $ # $FreeBSD: Makefile,v 1.65 1997/11/17 06:31:39 fenner Exp $ SUBDIR = @@ -115,7 +115,6 @@ SUBDIR += moodle SUBDIR += mozilla-firefox SUBDIR += mozplugger - SUBDIR += mplayerplug-in SUBDIR += mycalendar SUBDIR += myreview SUBDIR += nag diff --git a/www/mplayerplug-in/Makefile b/www/mplayerplug-in/Makefile deleted file mode 100644 index fd35e8a3aef..00000000000 --- a/www/mplayerplug-in/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -# $OpenBSD: Makefile,v 1.11 2009/11/24 09:01:47 ajacoutot Exp $ - -SHARED_ONLY= Yes - -COMMENT= embedded video player for mozilla - -DISTNAME= mplayerplug-in-3.55 -PKGNAME= ${DISTNAME}p2 - -CATEGORIES= www - -HOMEPAGE= http://mplayerplug-in.sourceforge.net/ - -MAINTAINER= Gleydson Soares - -# GPLv2 -PERMIT_PACKAGE_CDROM= Yes -PERMIT_PACKAGE_FTP= Yes -PERMIT_DISTFILES_CDROM= Yes -PERMIT_DISTFILES_FTP= Yes - -WANTLIB += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext -WANTLIB += Xfixes Xi Xinerama Xpm Xrandr Xrender Xt atk-1.0 cairo -WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 -WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 -WANTLIB += pangoft2-1.0 pixman-1 png pthread-stubs xcb z - -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mplayerplug-in/} - -MODULES= devel/gettext - -BUILD_DEPENDS= ${MODGNU_AUTOMAKE_DEPENDS} \ - :xulrunner-devel->=1.8,<1.9:devel/xulrunner/1.8,-devel -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 -RUN_DEPENDS= ::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 \ - -I${X11BASE}/include \ - -I${LOCALBASE}/xulrunner/include/xpcom -DBSD" \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" - -NO_REGRESS= Yes - -PLUGINS= mplayerplug-in.so mplayerplug-in-wmp.so \ - mplayerplug-in-qt.so mplayerplug-in-rm.so \ - mplayerplug-in-gmp.so mplayerplug-in-dvx.so - -COMPONENTS= mplayerplug-in.xpt mplayerplug-in-wmp.xpt \ - mplayerplug-in-qt.xpt mplayerplug-in-rm.xpt \ - mplayerplug-in-gmp.xpt mplayerplug-in-dvx.xpt - -post-patch: - @perl -pi -e 's|/etc|${SYSCONFDIR}/mplayerplug-in|g' \ - ${WRKDIST}/Source/plugin-setup.cpp - @cd ${WRKSRC} && \ - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ${LOCALBASE}/bin/aclocal - -do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/mozilla-plugins -.for i in ${PLUGINS} ${COMPONENTS} - ${INSTALL_DATA} ${WRKSRC}/$i \ - ${PREFIX}/lib/mozilla-plugins -.endfor - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mplayerplug-in - ${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.{conf,types} \ - ${PREFIX}/share/examples/mplayerplug-in - @cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \ - ${ALL_FAKE_FLAGS} ${FAKE_TARGET} - -.include diff --git a/www/mplayerplug-in/distinfo b/www/mplayerplug-in/distinfo deleted file mode 100644 index 7ba5456eb5d..00000000000 --- a/www/mplayerplug-in/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -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 --git a/www/mplayerplug-in/patches/patch-Makefile_in b/www/mplayerplug-in/patches/patch-Makefile_in deleted file mode 100644 index 91ba57088e7..00000000000 --- a/www/mplayerplug-in/patches/patch-Makefile_in +++ /dev/null @@ -1,32 +0,0 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2007/12/17 19:25:59 jasper Exp $ ---- Makefile.in.orig Sun Dec 16 02:04:45 2007 -+++ Makefile.in Sun Dec 16 02:05:48 2007 -@@ -17,22 +17,22 @@ LDFLAGS= @LDFLAGS@ @LDFLAGS64@ @LIBS@ @XEXT_LIBS@ @XPM - LIBOBJS= @LIBOBJS@ - OBJ= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \ - plugin-support.o plugin-setup.o plugin-list.o plugin-ui.o \ -- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS) -+ plugin-threads.o $(LIBOBJS) - OBJ_WMP= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \ - plugin-support.o plugin-setup-wmp.o plugin-list.o plugin-ui.o \ -- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS) -+ plugin-threads.o $(LIBOBJS) - OBJ_QT= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \ - plugin-support.o plugin-setup-qt.o plugin-list.o plugin-ui.o \ -- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS) -+ plugin-threads.o $(LIBOBJS) - OBJ_RM= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \ - plugin-support.o plugin-setup-rm.o plugin-list.o plugin-ui.o \ -- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS) -+ plugin-threads.o $(LIBOBJS) - OBJ_GMP= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \ - plugin-support.o plugin-setup-gmp.o plugin-list.o plugin-ui.o \ -- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS) -+ plugin-threads.o $(LIBOBJS) - OBJ_DVX= plugin.o nsScriptablePeer.o npp_gate.o np_entry.o npn_gate.o \ - plugin-support.o plugin-setup-dvx.o plugin-list.o plugin-ui.o \ -- plugin-threads.o strlcpy.o strlcat.o $(LIBOBJS) -+ plugin-threads.o $(LIBOBJS) - INSTALL = @INSTALL@ - SHAREDTARGET=mplayerplug-in - NP_HEADERS= include/npplat.h include/pluginbase.h diff --git a/www/mplayerplug-in/patches/patch-Source_plugin-support_cpp b/www/mplayerplug-in/patches/patch-Source_plugin-support_cpp deleted file mode 100644 index 5a2a189965f..00000000000 --- a/www/mplayerplug-in/patches/patch-Source_plugin-support_cpp +++ /dev/null @@ -1,20 +0,0 @@ -$OpenBSD: patch-Source_plugin-support_cpp,v 1.1 2009/02/11 22:54:01 jasper Exp $ - -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 --git a/www/mplayerplug-in/patches/patch-Source_plugin-threads_cpp b/www/mplayerplug-in/patches/patch-Source_plugin-threads_cpp deleted file mode 100644 index f392ac03911..00000000000 --- a/www/mplayerplug-in/patches/patch-Source_plugin-threads_cpp +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-Source_plugin-threads_cpp,v 1.1 2009/02/11 22:54:01 jasper Exp $ - -Fix mplayer zombie and firefox freeze when closing a movie, -with mplayer still playing it. - ---- 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 --git a/www/mplayerplug-in/patches/patch-configure_in b/www/mplayerplug-in/patches/patch-configure_in deleted file mode 100644 index 01542996864..00000000000 --- a/www/mplayerplug-in/patches/patch-configure_in +++ /dev/null @@ -1,39 +0,0 @@ -$OpenBSD: patch-configure_in,v 1.2 2009/02/11 22:54:01 jasper Exp $ ---- 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 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 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 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` - 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]) --#AC_REPLACE_FUNCS([memmem strlcpy strlcat]) --AC_REPLACE_FUNCS([memmem]) -+AC_REPLACE_FUNCS([memmem strlcpy strlcat]) - - LDFLAGS="$LDFLAGS $INTLLIBS" - LOCALEDIR=/share/locale diff --git a/www/mplayerplug-in/pkg/DESCR b/www/mplayerplug-in/pkg/DESCR deleted file mode 100644 index 6aba137831e..00000000000 --- a/www/mplayerplug-in/pkg/DESCR +++ /dev/null @@ -1,7 +0,0 @@ -mplayerplug-in is a browser plugin that uses mplayer to play digital -media from websites. - -This plug-in gives Mozilla the ability to play media from a website the -net without reading the source html and getting the url manually. Media -is played embedded in the page or in a separate window depending on how -the author of the webpage intended the media to be seen. diff --git a/www/mplayerplug-in/pkg/PLIST b/www/mplayerplug-in/pkg/PLIST deleted file mode 100644 index faa94a94e1d..00000000000 --- a/www/mplayerplug-in/pkg/PLIST +++ /dev/null @@ -1,44 +0,0 @@ -@comment $OpenBSD: PLIST,v 1.2 2009/02/11 22:54:01 jasper Exp $ -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 -@sample ${SYSCONFDIR}/mplayerplug-in/mplayerplug-in.conf -share/examples/mplayerplug-in/mplayerplug-in.types -@sample ${SYSCONFDIR}/mplayerplug-in/mplayerplug-in.types -share/locale/cs/LC_MESSAGES/mplayerplug-in.mo -share/locale/da/LC_MESSAGES/mplayerplug-in.mo -share/locale/de/LC_MESSAGES/mplayerplug-in.mo -share/locale/en_US/ -share/locale/en_US/LC_MESSAGES/ -share/locale/en_US/LC_MESSAGES/mplayerplug-in.mo -share/locale/es/LC_MESSAGES/mplayerplug-in.mo -share/locale/fr/LC_MESSAGES/mplayerplug-in.mo -share/locale/hu/LC_MESSAGES/mplayerplug-in.mo -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 -share/locale/ru/LC_MESSAGES/mplayerplug-in.mo -share/locale/se/ -share/locale/se/LC_MESSAGES/ -share/locale/se/LC_MESSAGES/mplayerplug-in.mo -share/locale/sk/LC_MESSAGES/mplayerplug-in.mo -share/locale/tr/LC_MESSAGES/mplayerplug-in.mo -share/locale/wa/LC_MESSAGES/mplayerplug-in.mo -share/locale/zh_CN/LC_MESSAGES/mplayerplug-in.mo