From dbcf9a00bf4e7724b6a9dc3a95e89182810d0fa3 Mon Sep 17 00:00:00 2001 From: nork Date: Sun, 29 Feb 2004 13:52:25 +0000 Subject: o A DDDD IIII OOA SSSS A A D D II OO OO S A A D D II OO OO SSS AAAAA D D II OO OO S A A DDDD IIII OO SSSS linuxthreads! o Accordingly, Flash6 plugin was more stable and robust with libc_r. Maybe, I'll stop to hear that some browsers (firefox, epiphany, etc..) will be overrun on own exit. o With the result, /etc/libmap.conf sould be updated. Please be careful. [libflashplayer.so] libpthread.so.0 liblthread.so.3 to libpthread.so.0 pluginwrapper/flash6.so o Acrobat plugin became beta1 quality state and more stable. You will be able to view PDF on native browsers with PTHREAD(KSE/THR), but I'm afraid that /usr/local/Acrobat5/Reader/intellinux/bin/acroread will not exit. Because acrobat plugin cannot stop it. I think that I should add more (some?) pthread(3) functions. Please be careful: Native browsers with acrobat requires libKSE/THR/PTHREAD. On libc_r, these will be overrun. o Major errno (ENOENT, ...) are almost same between FreeBSD's and Linux's. So I didn't convert it. But EAGAIN is not same between these. So I fixed this, and acrobat became good. Not tested on: 4-stable Tested on: 5.2-current Obtained from: Using the Linux flash plugin on Solaris x86 http://www.tools.de/solaris/flash/ --- www/linuxpluginwrapper/Makefile | 17 +++-------------- www/linuxpluginwrapper/distinfo | 4 ++-- www/linuxpluginwrapper/pkg-message | 19 ++++++------------- 3 files changed, 11 insertions(+), 29 deletions(-) (limited to 'www') diff --git a/www/linuxpluginwrapper/Makefile b/www/linuxpluginwrapper/Makefile index e7fb90e..a6bdba5 100644 --- a/www/linuxpluginwrapper/Makefile +++ b/www/linuxpluginwrapper/Makefile @@ -6,11 +6,11 @@ # PORTNAME= linuxpluginwrapper -PORTVERSION= 20040208 +PORTVERSION= 20040229 PORTREVISION= 1 CATEGORIES= www linux -MASTER_SITES= ${MASTER_SITE_LOCAL} \ - http://people.FreeBSD.org/~nork/distfiles/ +MASTER_SITES= http://people.FreeBSD.org/~nork/distfiles/ \ + ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= nork MAINTAINER= nork@FreeBSD.org @@ -18,7 +18,6 @@ COMMENT= A wrapper allowing use of linux-plugins with native applications .include -LIB_DEPENDS= lthread.${LTHREAD_MAJOR}:${PORTSDIR}/devel/linuxthreads RUN_DEPENDS= ${LOCALBASE}/Acrobat5/Browsers/intellinux/nppdf.so:${PORTSDIR}/print/acroread5 \ ${LOCALBASE}/lib/linux-flashplugin6/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin6 @@ -30,16 +29,6 @@ USE_REINPLACE= yes PKGMESSAGE= ${WRKDIR}/pkg-message CONFLICTS= flashpluginwrapper-* -.if ${OSVERSION} >= 500035 && defined(LINUXTHREADS_WRAP_API) -LTHREAD_MAJOR= 5 -.elif ${OSVERSION} >= 500035 -LTHREAD_MAJOR= 3 -.elif ${OSVERSION} < 500035 && defined(LINUXTHREADS_WRAP_API) -LTHREAD_MAJOR= 4 -.elif ${OSVERSION} < 500035 -LTHREAD_MAJOR= 2 -.endif - .if ${OSVERSION} >= 500000 LIBMAPCONF= ${WRKSRC}/misc/libmap.conf-FreeBSD5.x .else diff --git a/www/linuxpluginwrapper/distinfo b/www/linuxpluginwrapper/distinfo index b230e84..6865bda 100644 --- a/www/linuxpluginwrapper/distinfo +++ b/www/linuxpluginwrapper/distinfo @@ -1,2 +1,2 @@ -MD5 (linuxpluginwrapper-20040208.tar.gz) = 317d064ce700c528c11c2d7aad5ce33e -SIZE (linuxpluginwrapper-20040208.tar.gz) = 11992 +MD5 (linuxpluginwrapper-20040229.tar.gz) = 89ae2b69d27ef3fe55e9eec944e853da +SIZE (linuxpluginwrapper-20040229.tar.gz) = 12828 diff --git a/www/linuxpluginwrapper/pkg-message b/www/linuxpluginwrapper/pkg-message index b0e99a6..9d51745 100644 --- a/www/linuxpluginwrapper/pkg-message +++ b/www/linuxpluginwrapper/pkg-message @@ -1,22 +1,15 @@ - - DDDD OOOO NN NN TTTTTT NN NN EEEE EEEE DDDD !! - DD DD OO OO NNN NN TT NNN NN EE EE DD DD !! - DD DD OO OO NN NNN TT NN NNN EEEE EEEE DD DD !! - DD DD OO OO NN NN TT NN NN EE EE D DD - DDDD OOOO NN NN TT NN NN EEEE EEEE DDDD !! - ================================================================ ** PLEASE REMOVE FOLLOWING LINES FROM %%X11BASE%%/bin/mozilla ** LD_PRELOAD=%%PREFIX%%/lib/pluginwrapper.so export LD_PRELOAD -================================================================ - DDDD OOOO NN NN TTTTTT NN NN EEEE EEEE DDDD !! - DD DD OO OO NNN NN TT NNN NN EE EE DD DD !! - DD DD OO OO NN NNN TT NN NNN EEEE EEEE DD DD !! - DD DD OO OO NN NN TT NN NN EE EE D DD - DDDD OOOO NN NN TT NN NN EEEE EEEE DDDD !! +** PLEASE CHANGE FOLLOWING LINES FROM /etc/libmap.conf ** +libpthread.so.0 liblthread.so.3 + to +libpthread.so.0 pluginwrapper/flash6.so + +================================================================ Setup your /etc/libmap.conf. -- cgit v1.1