- Update to version 0.4.12 Remove file: files/patch-aa
Dear maintainer of FreeBSD port www/flashplugin-mozilla, please take a look at http://www.freebsd.org/cgi/query-pr.cgi?q=73081 Do you approve this update? -- Pav Lucistnik <pav@oook.cz> <pav@FreeBSD.org> An arrow (+0,+0) {@f0} finds a mark. It dies.
State Changed From-To: open->feedback Asked maintainer for approval.
Responsible Changed From-To: freebsd-ports-bugs->pav Handle.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, It does not make much sense updating www/flashplugin-mozilla but not graphics/libflash, for the core is in libflash; flashplugin-mozilla is just a wrapper to that library. I will make patches to update both ports and take maintainership of graphics/libflash which is currently ports@ sometime next week after my midterm. Cheers. - -- Leland Wang -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBfak8CQM7t5B2mhARAjSSAJoDRYmXxUm0bgvd9VTYbolVXW2mCgCfazTo MEfMz92ooGqnHcMWqTfLqRc= =jQtc -----END PGP SIGNATURE-----
V út, 26. 10. 2004 v 03:32, Li-Lun Wang (Leland Wang) pí¹e: > Hi, > > It does not make much sense updating www/flashplugin-mozilla but not > graphics/libflash, for the core is in libflash; flashplugin-mozilla > is just a wrapper to that library. I will make patches to update > both ports and take maintainership of graphics/libflash which is > currently ports@ sometime next week after my midterm. Cheers. Oh, note that libflash and standalong flashplayer ports are already updated to 0.4.12! -- Pav Lucistnik <pav@oook.cz> <pav@FreeBSD.org> It's the classic Microsoft security-bulletin formula: "The vulnerability is important (never dangerous); you have nothing to fear and no reason to regret trusting us; we have no intention of apologizing for it or even explaining it adequately; now go get your patch, shut up, and be grateful nothing bad has happened. -- The Register
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Tue, Oct 26, 2004 at 10:08:58AM +0200, Pav Lucistnik wrote: > Oh, note that libflash and standalong flashplayer ports are already > updated to 0.4.12! I see... However, I doubt if it is appropriate to build it in the current way. In 0.4.12, there is a configure script. Shouldn't we use HAVE_CONFIGURE? - -- Leland Wang -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBfiKvCQM7t5B2mhARAqyfAJ9u3f8kCYV7i397jN5d6sgF4fj3DwCcCitm GhXmLUThMYdbMLLAtLOV6P8= =Hi24 -----END PGP SIGNATURE-----
V út, 26. 10. 2004 v 12:10, Li-Lun Wang (Leland Wang) pí¹e: > On Tue, Oct 26, 2004 at 10:08:58AM +0200, Pav Lucistnik wrote: > > Oh, note that libflash and standalong flashplayer ports are already > > updated to 0.4.12! > > I see... > However, I doubt if it is appropriate to build it in the current way. > In 0.4.12, there is a configure script. Shouldn't we use HAVE_CONFIGURE? Care to submit an alternative patch for the update? -- Pav Lucistnik <pav@oook.cz> <pav@FreeBSD.org> Squish. Larger than the normal icky things, and twice as icky.
State Changed From-To: feedback->closed Committed, thanks!
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Tue, Oct 26, 2004 at 01:13:35PM +0200, Pav Lucistnik wrote: > Care to submit an alternative patch for the update? Sorry for being late on this. I have made alternative patches for graphics/libflash, graphics/flashplayer, and www/flashplugin-mozilla, which make use the configure script. Furthermore, www/flashplugin-mozilla-devel should be no longer needed since www/flashplugin-mozilla installs to lib/browser_plugins. Can you commit these? diff -urN graphics/libflash.orig/Makefile graphics/libflash/Makefile - --- graphics/libflash.orig/Makefile Mon Oct 25 17:48:23 2004 +++ graphics/libflash/Makefile Sun Nov 14 21:47:13 2004 @@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR= gplflash DISTNAME= gplflash-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= llwang@infor.org COMMENT= GPL Flash (TM) Library LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ @@ -22,7 +22,10 @@ USE_BZIP2= yes INSTALLS_SHLIB= yes - -MAKEFILE= ${FILESDIR}/Makefile - -MAKE_ARGS= NOPROFILE=true +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} .include <bsd.port.mk> diff -urN graphics/libflash.orig/files/Makefile graphics/libflash/files/Makefile - --- graphics/libflash.orig/files/Makefile Wed Oct 27 14:14:31 2004 +++ graphics/libflash/files/Makefile Wed Dec 31 18:00:00 1969 @@ -1,22 +0,0 @@ - -# $FreeBSD: ports/graphics/libflash/files/Makefile,v 1.4 2004/10/25 22:48:23 pav Exp $ - - - -LIB= flash - -SHLIB_MAJOR?= 0 - -SHLIB_MINOR?= 4 - -CXXFLAGS+= -fno-rtti -DXP_UNIX \ - - -I${LOCALBASE}/include \ - - -DCHECK_TEXT_PLAIN - -LDADD= -lz \ - - -L${LOCALBASE}/lib -ljpeg -lmad - -SRCS= adpcm.cc bitmap.cc button.cc character.cc cxform.cc \ - - displaylist.cc flash.cc font.cc graphic.cc graphic16.cc \ - - graphic24.cc graphic32.cc matrix.cc movie.cc \ - - program.cc script.cc shape.cc sound.cc \ - - sprite.cc sqrt.cc text.cc - -INCS= flash.h - -NOMAN= YES - -LIBDIR= ${LOCALBASE}/lib - -INCSDIR= ${LOCALBASE}/include - -INCDIR= ${INCSDIR} # for pre-bsd.incs.mk API - - - -.include <bsd.lib.mk> diff -urN graphics/libflash.orig/pkg-plist graphics/libflash/pkg-plist - --- graphics/libflash.orig/pkg-plist Sat Oct 14 04:28:52 2000 +++ graphics/libflash/pkg-plist Sun Nov 14 21:50:44 2004 @@ -1,4 +1,5 @@ include/flash.h - -lib/libflash.a +lib/libflash-0.4.so +lib/libflash-0.4.so.12 +lib/libflash.la lib/libflash.so - -lib/libflash.so.0 diff -urN graphics/flashplayer.orig/Makefile graphics/flashplayer/Makefile - --- graphics/flashplayer.orig/Makefile Wed Oct 27 14:14:27 2004 +++ graphics/flashplayer/Makefile Sun Nov 14 22:10:28 2004 @@ -12,17 +12,20 @@ MASTER_SITE_SUBDIR= gplflash DISTNAME= gplflash-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= llwang@infor.org COMMENT= GPL standalone Flash (TM) player - -LIB_DEPENDS= flash.0:${PORTSDIR}/graphics/libflash +LIB_DEPENDS= flash-0.4.12:${PORTSDIR}/graphics/libflash WRKSRC= ${WRKDIR}/${DISTNAME}/player USE_BZIP2= yes USE_X_PREFIX= yes - -MAKEFILE= ${FILESDIR}/Makefile - - +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} PLIST_FILES= bin/swfplayer .include <bsd.port.mk> diff -urN graphics/flashplayer.orig/files/Makefile graphics/flashplayer/files/Makefile - --- graphics/flashplayer.orig/files/Makefile Sat Sep 7 19:17:22 2002 +++ graphics/flashplayer/files/Makefile Wed Dec 31 18:00:00 1969 @@ -1,10 +0,0 @@ - -# $FreeBSD: ports/graphics/flashplayer/files/Makefile,v 1.3 2002/09/08 00:17:22 kris Exp $ - - - -PROG_CXX= swfplayer - -SRCS= main.c - -CFLAGS= ${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include - -LDADD= -L${LOCALBASE}/lib -lflash -L${X11BASE}/lib -lX11 -lXext -lm - -NOMAN= YES - -BINDIR= ${X11BASE}/bin - - - -.include <bsd.prog.mk> diff -urN www/flashplugin-mozilla.orig/Makefile www/flashplugin-mozilla/Makefile - --- www/flashplugin-mozilla.orig/Makefile Sun Nov 14 20:43:43 2004 +++ www/flashplugin-mozilla/Makefile Sun Nov 14 23:13:15 2004 @@ -5,7 +5,7 @@ # $FreeBSD: ports/www/flashplugin-mozilla/Makefile,v 1.19 2004/11/14 22:11:41 pav Exp $ # - -PORTNAME?= flashplugin-mozilla +PORTNAME= flashplugin-mozilla PORTVERSION= 0.4.12 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -15,24 +15,25 @@ 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 +LIB_DEPENDS= flash-0.4.12:${PORTSDIR}/graphics/libflash WRKSRC= ${WRKDIR}/${DISTNAME}/plugin USE_BZIP2= yes +USE_REINPLACE= yes USE_X_PREFIX= yes PLUGIN_DIR?= lib/browser_plugins PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR} - - - -do-build: - - cd ${WRKSRC} && ${CC} ${CFLAGS} -shared -fPIC -DXP_UNIX \ - - -I${.CURDIR}../lib -I${LOCALBASE}/include -I${X11BASE}/include \ - - -o npflash.so plugin.c npunix.c \ - - -L${LOCALBASE}/lib -L${X11BASE}/lib -lflash -lXt - - - -do-install: - - @${MKDIR} ${PREFIX}/${PLUGIN_DIR} - - @${INSTALL_PROGRAM} ${WRKSRC}/npflash.so ${PREFIX}/${PLUGIN_DIR} +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix="${PREFIX}" \ + --with-plugin-dir="${PREFIX}/${PLUGIN_DIR}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} + +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 .include <bsd.port.mk> diff -urN www/flashplugin-mozilla.orig/pkg-plist www/flashplugin-mozilla/pkg-plist - --- www/flashplugin-mozilla.orig/pkg-plist Sun Nov 14 20:43:43 2004 +++ www/flashplugin-mozilla/pkg-plist Sun Nov 14 23:01:35 2004 @@ -1,2 +1,2 @@ - -%%PLUGIN_DIR%%/npflash.so +%%PLUGIN_DIR%%/libnpflash.so @unexec rmdir %D/%%PLUGIN_DIR%% 2>/dev/null || true -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBmD3sCQM7t5B2mhARAhlvAKCBb8GcrK38Rs83FgFysFpSWXgn6wCdE1/G MbQqoi7I6WU5y9+SFWxA8ho= =oQCC -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Pav, Would you take a look at this and see if it is okay this time? In order to keep the single digit shared library version number, I have to discard the release information that is meant to be passed to libtool; is it okay? - -- Leland Wang diff -urN graphics/libflash.orig/Makefile graphics/libflash/Makefile - --- graphics/libflash.orig/Makefile Mon Oct 25 17:48:23 2004 +++ graphics/libflash/Makefile Wed Nov 17 20:28:52 2004 @@ -12,17 +12,19 @@ MASTER_SITE_SUBDIR= gplflash DISTNAME= gplflash-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= llwang@infor.org COMMENT= GPL Flash (TM) Library LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ jpeg.9:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/${DISTNAME}/lib - - +USE_LIBTOOL_VER= 15 +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} USE_BZIP2= yes INSTALLS_SHLIB= yes - -MAKEFILE= ${FILESDIR}/Makefile - -MAKE_ARGS= NOPROFILE=true .include <bsd.port.mk> diff -urN graphics/libflash.orig/files/Makefile graphics/libflash/files/Makefile - --- graphics/libflash.orig/files/Makefile Mon Oct 25 17:48:23 2004 +++ graphics/libflash/files/Makefile Wed Dec 31 18:00:00 1969 @@ -1,22 +0,0 @@ - -# $FreeBSD: ports/graphics/libflash/files/Makefile,v 1.4 2004/10/25 22:48:23 pav Exp $ - - - -LIB= flash - -SHLIB_MAJOR?= 0 - -SHLIB_MINOR?= 4 - -CXXFLAGS+= -fno-rtti -DXP_UNIX \ - - -I${LOCALBASE}/include \ - - -DCHECK_TEXT_PLAIN - -LDADD= -lz \ - - -L${LOCALBASE}/lib -ljpeg -lmad - -SRCS= adpcm.cc bitmap.cc button.cc character.cc cxform.cc \ - - displaylist.cc flash.cc font.cc graphic.cc graphic16.cc \ - - graphic24.cc graphic32.cc matrix.cc movie.cc \ - - program.cc script.cc shape.cc sound.cc \ - - sprite.cc sqrt.cc text.cc - -INCS= flash.h - -NOMAN= YES - -LIBDIR= ${LOCALBASE}/lib - -INCSDIR= ${LOCALBASE}/include - -INCDIR= ${INCSDIR} # for pre-bsd.incs.mk API - - - -.include <bsd.lib.mk> diff -urN graphics/libflash.orig/files/patch-ah graphics/libflash/files/patch-ah - --- graphics/libflash.orig/files/patch-ah Sat Oct 14 04:28:52 2000 +++ graphics/libflash/files/patch-ah Mon Nov 15 22:24:12 2004 @@ -1,5 +1,5 @@ - ---- cxform.cc.orig Tue May 2 04:18:33 2000 - -+++ cxform.cc Thu Oct 12 14:44:03 2000 +--- lib/cxform.cc.orig Tue May 2 04:18:33 2000 ++++ lib/cxform.cc Thu Oct 12 14:44:03 2000 @@ -26,6 +26,10 @@ static char *rcsid = "$Id"; #endif diff -urN graphics/libflash.orig/files/patch-ai graphics/libflash/files/patch-ai - --- graphics/libflash.orig/files/patch-ai Mon Oct 25 17:48:23 2004 +++ graphics/libflash/files/patch-ai Mon Nov 15 22:24:21 2004 @@ -1,5 +1,5 @@ - ---- sound.cc.orig Sat Oct 16 03:16:19 2004 - -+++ sound.cc Sat Oct 23 17:44:05 2004 +--- lib/sound.cc.orig Sat Oct 16 03:16:19 2004 ++++ lib/sound.cc Sat Oct 23 17:44:05 2004 @@ -20,7 +20,7 @@ // Author : Olivier Debon <odebon@club-internet.fr> // diff -urN graphics/libflash.orig/files/patch-configure graphics/libflash/files/patch-configure - --- graphics/libflash.orig/files/patch-configure Wed Dec 31 18:00:00 1969 +++ graphics/libflash/files/patch-configure Wed Nov 17 16:07:09 2004 @@ -0,0 +1,11 @@ +--- configure.orig Fri Oct 15 13:35:02 2004 ++++ configure Wed Nov 17 16:04:44 2004 +@@ -1529,7 +1529,7 @@ + + # libtool versioning + LT_RELEASE=$FLASH_MAJOR_VERSION.$FLASH_MINOR_VERSION +-LT_CURRENT=`expr $FLASH_MICRO_VERSION - $FLASH_INTERFACE_AGE` ++LT_CURRENT=$FLASH_MAJOR_VERSION + LT_REVISION=$FLASH_INTERFACE_AGE + LT_AGE=`expr $FLASH_BINARY_AGE - $FLASH_INTERFACE_AGE` + diff -urN graphics/libflash.orig/files/patch-lib::Makefile.in graphics/libflash/files/patch-lib::Makefile.in - --- graphics/libflash.orig/files/patch-lib::Makefile.in Wed Dec 31 18:00:00 1969 +++ graphics/libflash/files/patch-lib::Makefile.in Wed Nov 17 16:06:06 2004 @@ -0,0 +1,12 @@ +--- lib/Makefile.in.orig Fri Oct 15 13:34:57 2004 ++++ lib/Makefile.in Wed Nov 17 16:03:58 2004 +@@ -256,8 +256,7 @@ + + libflash_includedir = $(includedir) + libflash_la_LDFLAGS = \ +- -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ +- -release $(LT_RELEASE) \ ++ -version-info $(LT_CURRENT) \ + -export-dynamic \ + $(LIBJPEG) $(LIBZ) $(LIBMAD) + diff -urN graphics/flashplayer.orig/Makefile graphics/flashplayer/Makefile - --- graphics/flashplayer.orig/Makefile Tue Oct 26 16:45:22 2004 +++ graphics/flashplayer/Makefile Wed Nov 17 20:43:54 2004 @@ -12,17 +12,18 @@ MASTER_SITE_SUBDIR= gplflash DISTNAME= gplflash-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= llwang@infor.org COMMENT= GPL standalone Flash (TM) player LIB_DEPENDS= flash.0:${PORTSDIR}/graphics/libflash WRKSRC= ${WRKDIR}/${DISTNAME}/player - - USE_BZIP2= yes USE_X_PREFIX= yes - -MAKEFILE= ${FILESDIR}/Makefile - - +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} PLIST_FILES= bin/swfplayer .include <bsd.port.mk> diff -urN graphics/flashplayer.orig/files/Makefile graphics/flashplayer/files/Makefile - --- graphics/flashplayer.orig/files/Makefile Sat Sep 7 19:17:22 2002 +++ graphics/flashplayer/files/Makefile Wed Dec 31 18:00:00 1969 @@ -1,10 +0,0 @@ - -# $FreeBSD: ports/graphics/flashplayer/files/Makefile,v 1.3 2002/09/08 00:17:22 kris Exp $ - - - -PROG_CXX= swfplayer - -SRCS= main.c - -CFLAGS= ${CXXFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include - -LDADD= -L${LOCALBASE}/lib -lflash -L${X11BASE}/lib -lX11 -lXext -lm - -NOMAN= YES - -BINDIR= ${X11BASE}/bin - - - -.include <bsd.prog.mk> diff -urN www/flashplugin-mozilla.orig/Makefile www/flashplugin-mozilla/Makefile - --- www/flashplugin-mozilla.orig/Makefile Sun Nov 14 16:11:41 2004 +++ www/flashplugin-mozilla/Makefile Wed Nov 17 20:57:25 2004 @@ -5,7 +5,7 @@ # $FreeBSD: ports/www/flashplugin-mozilla/Makefile,v 1.19 2004/11/14 22:11:41 pav Exp $ # - -PORTNAME?= flashplugin-mozilla +PORTNAME= flashplugin-mozilla PORTVERSION= 0.4.12 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -16,23 +16,23 @@ 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 PLIST_SUB+= PLUGIN_DIR=${PLUGIN_DIR} - - - -do-build: - - cd ${WRKSRC} && ${CC} ${CFLAGS} -shared -fPIC -DXP_UNIX \ - - -I${.CURDIR}../lib -I${LOCALBASE}/include -I${X11BASE}/include \ - - -o npflash.so plugin.c npunix.c \ - - -L${LOCALBASE}/lib -L${X11BASE}/lib -lflash -lXt - - - -do-install: - - @${MKDIR} ${PREFIX}/${PLUGIN_DIR} - - @${INSTALL_PROGRAM} ${WRKSRC}/npflash.so ${PREFIX}/${PLUGIN_DIR} +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --with-plugin-dir="${PREFIX}/${PLUGIN_DIR}" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME} + +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 .include <bsd.port.mk> diff -urN www/flashplugin-mozilla.orig/pkg-plist www/flashplugin-mozilla/pkg-plist - --- www/flashplugin-mozilla.orig/pkg-plist Sun Nov 14 16:11:41 2004 +++ www/flashplugin-mozilla/pkg-plist Mon Nov 15 22:11:09 2004 @@ -1,2 +1,2 @@ - -%%PLUGIN_DIR%%/npflash.so +%%PLUGIN_DIR%%/libnpflash.so @unexec rmdir %D/%%PLUGIN_DIR%% 2>/dev/null || true -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (FreeBSD) iD8DBQFBnBIvCQM7t5B2mhARApfoAJ9eoJqzCV94gc7YANkz8H/1y+UTAwCfbOje MBsodZ8vDBlgTkaGAbTUz9c= =vX9v -----END PGP SIGNATURE-----