diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-04-20 12:13:04 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-04-20 12:13:04 +0000 |
| commit | 73ed726252e81ca5fcf9245c26b27068ad55f72a (patch) | |
| tree | d14a1443fd5424c53abb3e44b1021c39d3aa1927 /www/flashplugin-mozilla | |
| parent | b036e51828ff6bfa2caedfd3d661717e492ed794 (diff) | |
| download | ports-73ed726252e81ca5fcf9245c26b27068ad55f72a.tar.gz ports-73ed726252e81ca5fcf9245c26b27068ad55f72a.zip | |
Notes
Diffstat (limited to 'www/flashplugin-mozilla')
| -rw-r--r-- | www/flashplugin-mozilla/Makefile | 7 | ||||
| -rw-r--r-- | www/flashplugin-mozilla/distinfo | 4 | ||||
| -rw-r--r-- | www/flashplugin-mozilla/files/patch-plugin.c | 50 |
3 files changed, 35 insertions, 26 deletions
diff --git a/www/flashplugin-mozilla/Makefile b/www/flashplugin-mozilla/Makefile index e936ad629e21..2aee5a1a739a 100644 --- a/www/flashplugin-mozilla/Makefile +++ b/www/flashplugin-mozilla/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= flashplugin-mozilla -PORTVERSION= 0.4.12 -PORTREVISION= 1 +PORTVERSION= 0.4.13 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gplflash @@ -17,14 +16,13 @@ MAINTAINER= llwang@infor.org COMMENT= A GPL standalone Flash (TM) plugin for Mozilla web browser LIB_DEPENDS= flash.0:${PORTSDIR}/graphics/libflash -RUN_DEPENDS?= mozilla:${PORTSDIR}/www/mozilla WRKSRC= ${WRKDIR}/${DISTNAME}/plugin USE_BZIP2= yes USE_REINPLACE= yes USE_X_PREFIX= yes -PLUGIN_DIR?= lib/browser_plugins +PLUGIN_DIR= lib/browser_plugins PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR} GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-plugin-dir="${PREFIX}/${PLUGIN_DIR}" @@ -36,5 +34,6 @@ post-patch: @${REINPLACE_CMD} -e "s,-L../lib/.libs,-L${LOCALBASE}/lib," \ -e "s/libnpflash.so.0.0.0/libnpflash.so.0/" \ ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|' ${WRKSRC}/npapi.h .include <bsd.port.mk> diff --git a/www/flashplugin-mozilla/distinfo b/www/flashplugin-mozilla/distinfo index 9343a34ff8a0..126c90c44cf1 100644 --- a/www/flashplugin-mozilla/distinfo +++ b/www/flashplugin-mozilla/distinfo @@ -1,2 +1,2 @@ -MD5 (gplflash-0.4.12.tar.bz2) = 7d53803486b255665a80cd834ee3c463 -SIZE (gplflash-0.4.12.tar.bz2) = 378727 +MD5 (gplflash-0.4.13.tar.bz2) = 1b14c21094eb07416842ac0f5298b3f1 +SIZE (gplflash-0.4.13.tar.bz2) = 323128 diff --git a/www/flashplugin-mozilla/files/patch-plugin.c b/www/flashplugin-mozilla/files/patch-plugin.c index a77f089cc89e..13150f221205 100644 --- a/www/flashplugin-mozilla/files/patch-plugin.c +++ b/www/flashplugin-mozilla/files/patch-plugin.c @@ -1,20 +1,30 @@ -*** plugin.c.old Mon Jun 12 10:24:09 2000 ---- plugin.c Mon Sep 30 00:48:40 2002 -*************** -*** 193,198 **** ---- 193,207 ---- - XSync(This->dpy,False); - XFreePixmap(This->dpy, This->canvas); - shmdt(This->segInfo.shmaddr); -+ #ifndef linux -+ { -+ struct shmid_ds buf; -+ -+ if (shmctl(This->segInfo.shmid, IPC_RMID, &buf) < 0) { -+ perror("shmctl"); -+ } -+ } -+ #endif - - FlashClose(This->fh); - This->fh = 0; +--- plugin.c.orig Wed Jan 19 19:30:52 2005 ++++ plugin.c Wed Apr 20 14:10:14 2005 +@@ -194,6 +194,15 @@ + XSync(This->dpy,False); + XFreePixmap(This->dpy, This->canvas); + shmdt(This->segInfo.shmaddr); ++#ifndef linux ++ { ++ struct shmid_ds buf; ++ ++ if (shmctl(This->segInfo.shmid, IPC_RMID, &buf) < 0) { ++ perror("shmctl"); ++ } ++ } ++#endif + + FlashClose(This->fh); + This->fh = 0; +@@ -257,10 +266,10 @@ + static void + flashWakeUp(XtPointer client_data, XtIntervalId *id) + { +- pthread_mutex_lock(&synchro); + PluginInstance* This; + long cmd; + long wakeUp; ++ pthread_mutex_lock(&synchro); + + This = (PluginInstance*)client_data; + |