diff options
| -rw-r--r-- | www/mplayer-plugin/Makefile | 12 | ||||
| -rw-r--r-- | www/mplayer-plugin/distinfo | 2 | ||||
| -rw-r--r-- | www/mplayer-plugin/files/patch-Makefile | 10 | ||||
| -rw-r--r-- | www/mplayer-plugin/files/patch-Source_mplayerplug-in.c | 42 | ||||
| -rw-r--r-- | www/mplayer-plugin/pkg-plist | 2 |
5 files changed, 56 insertions, 12 deletions
diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile index 6850d594f73b..229bb687c1c6 100644 --- a/www/mplayer-plugin/Makefile +++ b/www/mplayer-plugin/Makefile @@ -6,8 +6,7 @@ # PORTNAME= mplayerplug-in -PORTVERSION= 0.91 -PORTREVISION= 1 +PORTVERSION= 0.95 CATEGORIES= www multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mplayerplug-in @@ -23,7 +22,8 @@ USE_REINPLACE= yes USE_GMAKE= yes post-patch: - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ + s|-lpthread|${PTHREAD_LIBS}|g' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ ${WRKSRC}/Source/mplayerplug-in.c @@ -38,5 +38,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.conf \ ${PREFIX}/etc/mplayerplug-in.conf ; \ fi + ${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.types \ + ${PREFIX}/etc/mplayerplug-in.types.dist + if [ ! -f ${PREFIX}/etc/mplayerplug-in.types ]; then \ + ${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.types \ + ${PREFIX}/etc/mplayerplug-in.types ;\ + fi .include <bsd.port.mk> diff --git a/www/mplayer-plugin/distinfo b/www/mplayer-plugin/distinfo index 9d48bf94df57..62da8cd3f94c 100644 --- a/www/mplayer-plugin/distinfo +++ b/www/mplayer-plugin/distinfo @@ -1 +1 @@ -MD5 (mplayerplug-in-0.91.tar.gz) = 0007f154903e4eb0cbffbf61740fc806 +MD5 (mplayerplug-in-0.95.tar.gz) = bab0cfa1f65748153c2675504424399d diff --git a/www/mplayer-plugin/files/patch-Makefile b/www/mplayer-plugin/files/patch-Makefile index 72a553f0f592..54d381a1e0e1 100644 --- a/www/mplayer-plugin/files/patch-Makefile +++ b/www/mplayer-plugin/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Fri Sep 5 21:48:28 2003 -+++ Makefile Mon Sep 29 00:42:38 2003 +--- Makefile.orig Tue Sep 9 17:02:57 2003 ++++ Makefile Sun Oct 5 02:29:28 2003 @@ -12,9 +12,9 @@ PLUGIN_DEFINES= -DXP_UNIX -Iinclude -fPIC -I/usr/X11R6/include @@ -10,10 +10,10 @@ +CC?= gcc +OPTIMIZER= +CFLAGS+= $(OPTIMIZER) $(PLUGIN_DEFINES) -I. -I/usr/include - #`pkg-config gtk+-2.0 --cflags` STRICTFLAGS= -O3 -Wall -W -Wno-unused-variable -Wno-unused-parameter -Wwrite-strings -Werror - #LDFLAGS = `pkg-config gtk+-2.0 --libs` -@@ -25,7 +25,7 @@ + LDFLAGS= -lpthread + OBJ= mplayerplug-in.o support.o stubs.o ui.o +@@ -24,7 +24,7 @@ default all: $(SHAREDTARGET) $(SHAREDTARGET): $(OBJ) diff --git a/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c b/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c index 463db10b7ad5..928ca0cbbc19 100644 --- a/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c +++ b/www/mplayer-plugin/files/patch-Source_mplayerplug-in.c @@ -1,6 +1,15 @@ ---- Source/mplayerplug-in.c.orig Wed Sep 10 10:34:15 2003 -+++ Source/mplayerplug-in.c Mon Sep 29 00:43:56 2003 -@@ -67,7 +67,7 @@ +--- Source/mplayerplug-in.c.orig Fri Oct 3 10:54:52 2003 ++++ Source/mplayerplug-in.c Sun Oct 5 02:45:25 2003 +@@ -28,7 +28,7 @@ + */ + + #include "mplayerplug-in.h" +-pthread_mutex_t playlist_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; ++pthread_mutex_t playlist_mutex; + + // This routine is only called when the plugin library is newer than the pluginrc file + +@@ -71,7 +71,7 @@ } if (config == NULL) { @@ -9,3 +18,30 @@ } if (config == NULL) { +@@ -148,7 +148,7 @@ + } + + if (customtypes == NULL) { +- customtypes = fopen("/etc/mplayerplug-in.types", "r"); ++ customtypes = fopen("%%PREFIX%%/etc/mplayerplug-in.types", "r"); + } + + if (customtypes != NULL) { +@@ -274,6 +274,7 @@ + char parse[1000]; + char logfile[1000]; + char *cp; ++ pthread_mutexattr_t attr; + + if (instance == NULL) + return NPERR_INVALID_INSTANCE_ERROR; +@@ -281,6 +282,9 @@ + instance->pdata = NPN_MemAlloc(sizeof(PluginInstance)); + This = (PluginInstance *) instance->pdata; + InitPrivateData(instance); ++ pthread_mutexattr_init(&attr); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); ++ pthread_mutex_init(&playlist_mutex, &attr); + + DESTROYED = 0; + diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist index 578609b81e99..ba6487c1312c 100644 --- a/www/mplayer-plugin/pkg-plist +++ b/www/mplayer-plugin/pkg-plist @@ -1,4 +1,6 @@ @unexec if cmp -s %D/etc/mplayerplug-in.conf %D/etc/mplayerplug-in.conf.dist; then rm -f %D/etc/mplayerplug-in.conf; fi etc/mplayerplug-in.conf.dist +@unexec if cmp -s %D/etc/mplayerplug-in.types %D/etc/mplayerplug-in.types.dist; then rm -f %D/etc/mplayerplug-in.types; fi +etc/mplayerplug-in.types.dist lib/browser_plugins/mplayerplug-in.so @unexec rmdir %D/lib/browser_plugins 2>/dev/null || /usr/bin/true |