- Update to 0.8.5

  - List of improvements can be found here: http://www.gnashdev.org/?q=node/67
  - This release features KDE4 support, but kde4-gnash segfaults for now, likely because of weird qt3/qt4 interaction, will be fixed later.

5 files changed, 140 insertions, 54 deletions

diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 009c8076435e..0f545cbc35a3 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	gnash
-PORTVERSION=	0.8.4
-PORTREVISION=	3
+PORTVERSION=	0.8.5
 CATEGORIES=	graphics
-MASTER_SITES=	http://getgnash.org/packages/releases/ \
-		${MASTER_SITE_GNU}
+# getgnash.org is slow
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		http://mirror.amdmi3.ru/ \
+		http://getgnash.org/packages/releases/
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -40,8 +41,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
 		--with-boost-lib="${LOCALBASE}/lib" \
-		--with-npapi-plugindir="${WEBPLUGINS_DIR}" \
-		--with-kde-pluginprefix="${PREFIX}"
+		--disable-testsuite \
+		--with-plugins-install=system
 
 GNASHVER=	${PORTVERSION}
 
@@ -50,38 +51,24 @@ PLIST_SUB+=	GNASHVER="${GNASHVER}"
 
 USE_LDCONFIG=	${PREFIX}/lib/gnash
 
-MAN1=		cygnal.1 gnash.1 gprocessor.1 soldumper.1 dumpshm.1
+MAN1=		cygnal.1 dumpshm.1 flvdumper.1 gnash.1 gprocessor.1 soldumper.1
 
 OPTIONS=	PLUGIN		"Enable browser plugin" on \
 		CYGNAL		"Enable Cygnal media server" off \
 		GTK		"GUI: GTK (required for Mozilla/Firefox plugin)" on \
-		KDE		"GUI: KDE (required for Konqueror plugin)" off \
+		KDE		"GUI: KDE 3.x (required for Konqueror 3.x plugin)" off \
 		AGG		"Renderer: AGG" on \
 		OPENGL		"Renderer: OpenGL (broken)" off \
 		CAIRO		"Renderer: Cairo (experimental)" off \
 		FFMPEG		"Media handler: ffmpeg (+SDL sound output)" on \
-		GSTREAMER	"Media handler: GStreamer" off
+		GSTREAMER	"Media handler: GStreamer" off \
+		SPEEX		"Speex codec support" on
 
-.include <bsd.port.pre.mk>
+# kde4-gnash segfaults, so that's still work in progress; feel free
+# to try though, plist and everything else should be correct
+#		KDE4		"GUI: KDE 4.x (required for Konqueror 4.x plugin)" off \
 
-# Plugin option processing
-.if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN)
-USE_WEBPLUGINS=		native
-WEBPLUGINS_FILES=	libgnashplugin.so
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
-PLIST_SUB+=	FFPLUGIN=""
-.else
-PLIST_SUB+=	FFPLUGIN="@comment "
-CONFIGURE_ARGS+=	--disable-nsapi
-.endif
-
-.if defined(WITH_KDE) && !defined(WITHOUT_PLUGIN)
-PLIST_SUB+=	KONQPLUGIN=""
-USE_LDCONFIG+=	${PREFIX}/lib/kde3
-.else
-PLIST_SUB+=	KONQPLUGIN="@comment "
-CONFIGURE_ARGS+=	--disable-kparts
-.endif
+.include <bsd.port.options.mk>
 
 # Cygnal option processing
 .if defined(WITH_CYGNAL)
@@ -102,6 +89,36 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 #
+# Plugin configuration
+#
+.if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN)
+USE_WEBPLUGINS=		native
+WEBPLUGINS_FILES=	libgnashplugin.so
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
+PLIST_SUB+=	NPAPI=""
+CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGINS_DIR}"
+.else
+PLIST_SUB+=	NPAPI="@comment "
+CONFIGURE_ARGS+=	--disable-npapi
+.endif
+
+.if defined(WITH_KDE) && !defined(WITHOUT_PLUGIN)
+PLIST_SUB+=	KPARTS=""
+USE_LDCONFIG+=	${PREFIX}/lib/kde3
+.else
+PLIST_SUB+=	KPARTS="@comment "
+CONFIGURE_ARGS+=	--disable-kparts
+.endif
+
+.if defined(WITH_KDE4) && !defined(WITHOUT_PLUGIN)
+PLIST_SUB+=	KPARTS4=""
+USE_LDCONFIG+=	${KDE4_PREFIX}/lib/kde4
+.else
+PLIST_SUB+=	KPARTS4="@comment "
+CONFIGURE_ARGS+=	--disable-kparts4
+.endif
+
+#
 # GUI options processing
 #
 GNASH_GUIS=
@@ -115,19 +132,31 @@ PLIST_SUB+=	GTK="@comment "
 .endif
 
 .if defined(WITH_KDE)
-GNASH_GUIS+=	kde
+GNASH_GUIS+=	kde3
 PLIST_SUB+=	KDE=""
-# We have to use this lame way to depend on kdelibs, as USE_KDELIBS_VER won't
-# work after bsd.port.pre.mk, and bsd.port.options.mk is unavailable until
-# 5.5/6.2 EOL. We could also include bsd.kde.mk here, but that's much more
-# likely to bring more trouble
-LIB_DEPENDS+=	kimproxy:${PORTSDIR}/x11/kdelibs3
+USE_KDELIBS_VER=3
 .else
 PLIST_SUB+=	KDE="@comment "
 .endif
 
+.if defined(WITH_KDE4)
+GNASH_GUIS+=	kde4
+PLIST_SUB+=	KDE4=""
+USE_QT_VER=	4
+QT_COMPONENTS=	moc_build
+USE_KDE4=	kdehier kdelibs
+CONFIGURE_ENV+=	KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
+.else
+PLIST_SUB+=	KDE4="@comment "
+.endif
+
+.if defined(WITH_KDE) && defined defined(WITH_KDE4)
+# This is problem of FreeBSD ports, not Gnash
+IGNORE=		KDE and KDE4 GUIs are mutually exclusive. Please rerun 'make config' and disable one of these
+.endif
+
 .if ${GNASH_GUIS} == ""
-IGNORE=		needs at least one GUI enabled. Please rerun 'make config' and enable GTK, KDE or both GUIs
+IGNORE=		needs at least one GUI enabled. Please rerun 'make config' and enable GTK, KDE or KDE4
 .endif
 
 CONFIGURE_ARGS+=	--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,`
@@ -139,14 +168,17 @@ CONFIGURE_ARGS+=	--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,`
 LIB_DEPENDS+=		agg.2:${PORTSDIR}/graphics/agg
 CONFIGURE_ARGS+=	--enable-renderer=agg
 .elif !defined(WITH_AGG) && defined(WITH_OPENGL) && !defined(WITH_CAIRO)
+.	if defined(WITH_KDE4)
+IGNORE=			doesn't support OpenGL renderer with KDE4 gui yet. Please rerun 'make config' and select different renderer or disable KDE4 GUI
+.	endif
 USE_GL=			yes
 .	if !defined(WITHOUT_GTK)
 LIB_DEPENDS+=		gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
 .	endif
 CONFIGURE_ARGS+=	--enable-renderer=ogl
 .elif !defined(WITH_AGG) && !defined(WITH_OPENGL) && defined(WITH_CAIRO)
-.	if defined(WITH_KDE)
-IGNORE=			doesn't support Cairo renderer with KDE gui. Please rerun 'make config' and select different renderer or disable KDE GUI
+.	if defined(WITH_KDE) || defined(WITH_KDE4)
+IGNORE=			doesn't support Cairo renderer with KDE/KDE4 gui. Please rerun 'make config' and select different renderer or disable KDE/KDE4 GUIs
 .	endif
 LIB_DEPENDS+=		cairo.2:${PORTSDIR}/graphics/cairo
 CONFIGURE_ARGS+=	--enable-renderer=cairo
@@ -171,6 +203,18 @@ CONFIGURE_ARGS+=	--enable-media=none
 IGNORE=			can't be built with multiple media handlers enabled. Please rerun 'make config' and leave one or none of them (ffmpeg|gstreamer)
 .endif
 
+#
+# Other options
+#
+.if !defined(WITHOUT_SPEEX)
+LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+CONFIGURE_ARGS+=	--enable-speex
+.else
+CONFIGURE_ARGS+=	--disable-speex
+.endif
+
+.include <bsd.port.pre.mk>
+
 pre-everything::
 .if defined(WITH_OPENGL)
 	@${ECHO_CMD} "OpenGL support is currently broken (Gnash hangs using 100% CPU). Use at your own risk"
@@ -178,13 +222,16 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/^PTHREAD_[LC][IF]*=/ d' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/^PTHREAD_[LC][IF]*=/ d; s|-lpthread|${PTHREAD_LIBS}|' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
 		s|/lib64|/lib|g; \
 		s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure \
 		${WRKSRC}/macros/libslist ${WRKSRC}/macros/incllist
 	@${REINPLACE_CMD} -e '/sysconfDATA_INSTALL/ s|/$$$$f|&.dist|' \
 		${WRKSRC}/libbase/Makefile.in
+	@${REINPLACE_CMD} -e '/KDE4_APPSDATADIR=/ s|share/kde4|share|' \
+		${WRKSRC}/configure
 
 post-install:
 	if [ ! -f ${PREFIX}/etc/gnashrc ]; then \
@@ -198,6 +245,7 @@ post-install:
 
 .if !defined(WITHOUT_PLUGIN)
 .if !defined(WITHOUT_GTK)
+	${MKDIR} ${WEBPLUGINS_DIR}
 	@cd ${INSTALL_WRKSRC}/plugin && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin
 .endif
@@ -205,6 +253,10 @@ post-install:
 	@cd ${INSTALL_WRKSRC}/plugin/klash && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin
 .endif
+.if defined(WITH_KDE4)
+	@cd ${INSTALL_WRKSRC}/plugin/klash4 && \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin
+.endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gnash/distinfo b/graphics/gnash/distinfo
index 968597bf7c7c..ea31033a2ca3 100644
--- a/graphics/gnash/distinfo
+++ b/graphics/gnash/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnash-0.8.4.tar.bz2) = b47a7ed4b7c66b8c2ebacc2286ef0d4b
-SHA256 (gnash-0.8.4.tar.bz2) = 6ffe4bdbc22de712e59205a27b46aa93a5372c67829c7f02d6b1c1778e9f9224
-SIZE (gnash-0.8.4.tar.bz2) = 2887666
+MD5 (gnash-0.8.5.tar.bz2) = 366f703c2eb1747e4109602b75439ff4
+SHA256 (gnash-0.8.5.tar.bz2) = 16f272214eed2ab50bcd9507d6299b82ed7d20e7e8eb253ab160e594eeb210b3
+SIZE (gnash-0.8.5.tar.bz2) = 3335797
diff --git a/graphics/gnash/files/patch-plugin-klash-klash_part.cpp b/graphics/gnash/files/patch-plugin-klash-klash_part.cpp
new file mode 100644
index 000000000000..edd622becdee
--- /dev/null
+++ b/graphics/gnash/files/patch-plugin-klash-klash_part.cpp
@@ -0,0 +1,11 @@
+--- plugin/klash/klash_part.cpp.orig	2009-03-02 18:29:45.000000000 +0300
++++ plugin/klash/klash_part.cpp	2009-03-06 05:27:45.000000000 +0300
+@@ -160,7 +160,7 @@
+     QString procname;
+     char *gnash_env = getenv("KLASH_PLAYER");
+     if (!gnash_env) {
+-      procname = GNASHBINDIR "/kde-gnash";
++      procname = GNASHBINDIR "/kde3-gnash";
+     } else {
+       procname = gnash_env;
+     }
diff --git a/graphics/gnash/files/patch-plugin-klash4-klash_part.cpp b/graphics/gnash/files/patch-plugin-klash4-klash_part.cpp
new file mode 100644
index 000000000000..31cd5c7a6f28
--- /dev/null
+++ b/graphics/gnash/files/patch-plugin-klash4-klash_part.cpp
@@ -0,0 +1,11 @@
+--- plugin/klash4/klash_part.cpp.orig	2009-03-02 18:29:50.000000000 +0300
++++ plugin/klash4/klash_part.cpp	2009-03-06 05:44:08.000000000 +0300
+@@ -147,7 +147,7 @@
+         }
+     }
+     KParts::Part::setWidget (new KlashView (wparent));
+-    setXMLFile("klashpartui.rc");
++    setXMLFile("klash/klashpartui.rc");
+     setProgressInfoEnabled (false);
+ 
+     if (m_fullscreen)
diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist
index 03107d0aa589..ffd045a8b1a1 100644
--- a/graphics/gnash/pkg-plist
+++ b/graphics/gnash/pkg-plist
@@ -4,14 +4,22 @@ bin/gnash
 bin/gprocessor
 bin/soldumper
 %%GTK%%bin/gtk-gnash
-%%KDE%%bin/kde-gnash
+%%KDE%%bin/kde3-gnash
+%%KDE4%%bin/kde4-gnash
 %%CYGNAL%%bin/cygnal
-%%FFPLUGIN%%%%WEBPLUGINS_DIR%%/libgnashplugin.so
-%%KONQPLUGIN%%share/apps/klash/pluginsinfo
-%%KONQPLUGIN%%share/apps/klash/klashpartui.rc
-%%KONQPLUGIN%%share/services/klash_part.desktop
-%%KONQPLUGIN%%lib/kde3/libklashpart.so
-%%KONQPLUGIN%%lib/kde3/libklashpart.la
+%%NPAPI%%%%WEBPLUGINS_DIR%%/libgnashplugin.so
+@comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
+%%KDE%%share/apps/klash/pluginsinfo
+%%KPARTS%%share/apps/klash/klashpartui.rc
+@comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
+%%KDE%%share/services/klash_part.desktop
+%%KPARTS%%lib/kde3/libklashpart.so
+%%KPARTS%%lib/kde3/libklashpart.la
+%%KPARTS4%%kde4/share/apps/klash/pluginsinfo
+%%KPARTS4%%kde4/share/apps/klash/klashpartui.rc
+%%KPARTS4%%kde4/share/kde4/services/klash_part.desktop
+%%KPARTS4%%kde4/lib/kde4/libklashpart.so
+%%KPARTS4%%kde4/lib/kde4/libklashpart.la
 @unexec if cmp -s %D/etc/gnashpluginrc.dist %D/etc/gnashpluginrc; then rm -f %D/etc/gnashpluginrc; fi
 etc/gnashpluginrc.dist
 @exec if [ ! -f %B/gnashpluginrc ]; then cp -p %D/%F %B/gnashpluginrc; fi
@@ -33,9 +41,12 @@ lib/gnash/libgnashmedia.so
 lib/gnash/libgnashnet.la
 lib/gnash/libgnashnet.so
 lib/gnash/libgnashnet.so.0
-%%GTK%%lib/gnash/libmozsdk.la
-%%GTK%%lib/gnash/libmozsdk.so
-%%GTK%%lib/gnash/libmozsdk.so.0
+lib/gnash/libgnashsound-%%GNASHVER%%.so
+lib/gnash/libgnashsound.la
+lib/gnash/libgnashsound.so
+%%NPAPI%%lib/gnash/libmozsdk.la
+%%NPAPI%%lib/gnash/libmozsdk.so
+%%NPAPI%%lib/gnash/libmozsdk.so.0
 %%DOCSDIR%%/gnashuser.html
 %%DOCSDIR%%/images/car_crash.png
 %%DOCSDIR%%/images/rtmp.png
@@ -49,10 +60,11 @@ share/locale/fi/LC_MESSAGES/gnash.mo
 share/locale/fr/LC_MESSAGES/gnash.mo
 share/locale/it/LC_MESSAGES/gnash.mo
 share/locale/ja/LC_MESSAGES/gnash.mo
-share/locale/sv/LC_MESSAGES/gnash.mo
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%/images
 @dirrm %%DOCSDIR%%
 @dirrm lib/gnash
-%%KONQPLUGIN%%@dirrm share/apps/klash
-%%FFPLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%%
+@comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
+%%KDE%%@dirrm share/apps/klash
+%%KPARTS4%%@dirrm kde4/share/apps/klash
+%%NPAPI%%@dirrmtry %%WEBPLUGINS_DIR%%