Update to gnash-0.8.8

From Brad, who also takes maintainership. OK dcoppa@, jasper@
2010-10-12 09:38:16 +00:00 · 2010-10-12 09:38:16 +00:00 · 0037f49f9f
commit 0037f49f9f
parent fe25311b62
16 changed files with 447 additions and 273 deletions
--- a/www/gnash/Makefile
+++ b/www/gnash/Makefile
@ -1,80 +1,82 @@
-# $OpenBSD: Makefile,v 1.28 2010/08/26 21:32:11 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2010/10/12 09:38:16 dcoppa Exp $

 SHARED_ONLY=	Yes

-COMMENT=	flash player with firefox browser plugin
+ONLY_FOR_ARCHS=	${GCC4_ARCHS}

-VER=		0.8.3
+COMMENT=	SWF player with Firefox browser plugin
+
+VER=		0.8.8
 DISTNAME=	gnash-${VER}
-
-REVISION=	6
-
 CATEGORIES=	www
-MASTER_SITES=	http://getgnash.org/packages/releases/
+MASTER_SITES=	${MASTER_SITE_GNU:=gnash/${VER}/}
+
+SHARED_LIBS=	gnashrender	0.0

 HOMEPAGE=	http://gnashdev.org

-MAINTAINER=	Deanna Phillips <deanna@openbsd.org>
+MAINTAINER=	Brad Smith <brad@comstyle.com>

 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
-
-WANTLIB=	c crypto expat freetype fontconfig \
-		glib-2.0 gobject-2.0 gthread-2.0 gmodule-2.0\
-		idn pcre jpeg m pthread ssl stdc++ z \
-		gstbase-0.10 gstreamer-0.10 curl xml2 agg \
-		gdk_pixbuf-2.0 gtk-x11-2.0 gdk-x11-2.0 ltdl \
-		boost_thread-mt boost_date_time-mt \
-		gstpbutils-0.10
+WANTLIB=	ICE SDL.>=8 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+		Xfixes Xi Xinerama Xrandr Xrender Xv agg.>=2 atk-1.0 \
+		avcodec.>=14 avformat.>=13 avutil.>=7 boost_date_time-mt.>=2 \
+		boost_thread-mt.>=2 bz2 c cairo crypto curl.>=5 expat faac \
+		faad freetype fontconfig gdk_pixbuf-2.0 gdk-x11-2.0 gif.>=5 \
+		gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gsm gthread-2.0 \
+		gtk-x11-2.0 idn jpeg.>=63 mp3lame m ogg orc-0.4 pango-1.0 \
+		pangocairo-1.0 pangoft2-1.0 pangox-1.0 pcre pixman-1 png.>=9 \
+		pthread-stubs pthread schroedinger-1.0 sndio speex.>=8 \
+		speexdsp.>=1 ssl stdc++ swscale.>=2 theora usbhid vorbis \
+		vorbisenc x264 xcb xcb-render xcb-render-util z

 MODULES=	devel/gettext
-
-LIB_DEPENDS+=	::net/curl \
-		::textproc/libxml \
-		::graphics/agg \
-		::x11/gtk+2 \
+LIB_DEPENDS=	::archivers/bzip2 \
+		::audio/speex \
 		::devel/boost \
-		::devel/libtool,-ltdl \
-		::multimedia/gstreamer-0.10/plugins-base
-
-RUN_DEPENDS+=	:gstreamer-ffmpeg->=0.10.4p0:multimedia/gstreamer-0.10/plugins-ffmpeg \
-		::multimedia/gstreamer-0.10/plugins-ugly \
-		::multimedia/gstreamer-0.10/plugins-bad \
-		::multimedia/gstreamer-0.10/plugins-good
+		::devel/sdl \
+		::graphics/agg \
+		::graphics/ffmpeg \
+		::graphics/jpeg \
+		::graphics/libungif \
+		::graphics/png \
+		::net/curl \
+		::x11/gtk+2

 USE_X11=	Yes
 USE_GMAKE=	Yes
-USE_LIBTOOL=	Yes
+
+# gnash requires libtool->=2.2, so use the bundled one
+USE_LIBTOOL=	gnu
+LIBTOOL=	${WRKSRC}/libtool
 LIBTOOL_FLAGS+=	--tag=disable-static

 CONFIGURE_STYLE= gnu
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnash
-	${INSTALL_DATA} ${WRKSRC}/libbase/{gnashpluginrc,gnashrc} \
-	${PREFIX}/share/examples/gnash
-
-CONFIGURE_ARGS+=--with-npapi-plugindir=${LOCALBASE}/lib/mozilla/plugins \
-		--disable-cygnal \
+CONFIGURE_ARGS+=--disable-cygnal \
 		--disable-debugger \
+		--disable-jemalloc \
+		--disable-silent-rules \
 		--enable-renderer=agg \
 		--enable-gui=gtk \
-		--with-libintl-prefix=${LOCALBASE}
-
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GST_REGISTRY=${WRKDIR}/registry.${MACHINE_ARCH}.bin
+		--enable-media=ffmpeg \
+		--with-libintl-prefix=${LOCALBASE} \
+		--with-npapi-plugindir=${LOCALBASE}/lib/mozilla/plugins
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"

 INSTALL_TARGET=	install install-plugins

 NO_REGRESS=	testsuite available at http://www.gnashdev.org/testcases/

-SHARED_LIBS=	gnashnet 0.0 \
-		mozsdk 0.0
-
 SUBST_VARS=	VER

+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnash
+	${INSTALL_DATA} ${WRKSRC}/libbase/{gnashpluginrc,gnashrc} \
+	    ${PREFIX}/share/examples/gnash
+
 .include <bsd.port.mk>
--- a/www/gnash/distinfo
+++ b/www/gnash/distinfo
@ -1,5 +1,5 @@
-MD5 (gnash-0.8.3.tar.gz) = Emvoezhmq916nqMvy0Q2Pg==
-RMD160 (gnash-0.8.3.tar.gz) = rR/1kwmTFGF0WeUtiK7SI0jmHjI=
-SHA1 (gnash-0.8.3.tar.gz) = yaqdr0TKClcjSyOVJfVRtj1ZedA=
-SHA256 (gnash-0.8.3.tar.gz) = dDAQrTkjJL6r5BiGkKuIPtVsYL6nKXjT8hDqnHMWqFM=
-SIZE (gnash-0.8.3.tar.gz) = 4002062
+MD5 (gnash-0.8.8.tar.gz) = rsQU7jvruJAQVIGPrnNSFA==
+RMD160 (gnash-0.8.8.tar.gz) = GSh9Mg4+fKKXlrk9T0ijBo5bnzQ=
+SHA1 (gnash-0.8.8.tar.gz) = BkP5VpMCK5/mxXR5nz6Q4NDrZlU=
+SHA256 (gnash-0.8.8.tar.gz) = Pxnd8dGLoorZSftOs0aHhs0oq7WRVKaKACVR7k5n9eQ=
+SIZE (gnash-0.8.8.tar.gz) = 5074764
--- a/www/gnash/patches/patch-configure
+++ b/www/gnash/patches/patch-configure
@ -1,16 +1,126 @@
-$OpenBSD: patch-configure,v 1.3 2008/06/28 15:46:33 deanna Exp $
--- configure.orig	Fri Jun 13 12:35:20 2008
-+++ configure	Fri Jun 13 12:38:34 2008
-@@ -56827,10 +56827,10 @@ CONFIG_RPATH!$CONFIG_RPATH$ac_delim
- GREP!$GREP$ac_delim
- EGREP!$EGREP$ac_delim
- INTL_MACOSX_LIBS!$INTL_MACOSX_LIBS$ac_delim
-LIBICONV!$LIBICONV$ac_delim
-+LIBICONV!$LTLIBICONV$ac_delim
- LTLIBICONV!$LTLIBICONV$ac_delim
- INTLLIBS!$INTLLIBS$ac_delim
-LIBINTL!$LIBINTL$ac_delim
-+LIBINTL!$LTLIBINTL$ac_delim
- LTLIBINTL!$LTLIBINTL$ac_delim
- POSUB!$POSUB$ac_delim
- HAS_GETTEXT_TRUE!$HAS_GETTEXT_TRUE$ac_delim
+$OpenBSD: patch-configure,v 1.4 2010/10/12 09:38:16 dcoppa Exp $
+--- configure.orig	Sat Aug 21 13:30:15 2010
+++ configure	Sun Oct 10 14:48:18 2010
+@@ -21058,70 +21058,6 @@ $as_echo "$as_me: ffmpeg top lib dir is $top_lib_dir" 
+ 
+               if test x"${ac_cv_path_ffmpeg_lib}" != x; then
+ 
+-                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdts library" >&5
+-$as_echo_n "checking for libdts library... " >&6; }
+-    if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
+-      $PKG_CONFIG --exists libdts && libdts=`$PKG_CONFIG --libs-only-l libdts`
+-    else
+-      libdts=""
+-    fi
+-    if test x"${libdts}" = x; then
+-      if test -f ${top_lib_dir}/libdts.a -o -f ${top_lib_dir}/libdts.${shlibext}; then
+-        ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldts"
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${top_lib_dir}/libdts" >&5
+-$as_echo "${top_lib_dir}/libdts" >&6; }
+-      else
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-        if test x${cross_compiling} = xno; then
+-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dts_init in -ldts" >&5
+-$as_echo_n "checking for dts_init in -ldts... " >&6; }
+-if test "${ac_cv_lib_dts_dts_init+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldts  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dts_init ();
+-int
+-main ()
+-{
+-return dts_init ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_dts_dts_init=yes
+-else
+-  ac_cv_lib_dts_dts_init=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dts_dts_init" >&5
+-$as_echo "$ac_cv_lib_dts_dts_init" >&6; }
+-if test "x$ac_cv_lib_dts_dts_init" = x""yes; then :
+-  ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldts"
+-fi
+-
+-        fi
+-      fi
+-    else
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${libdts}" >&5
+-$as_echo "${libdts}" >&6; }
+-      ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libdts}"
+-    fi
+-
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libvorbisenc library" >&5
+ $as_echo_n "checking for libvorbisenc library... " >&6; }
+     if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
+@@ -32317,51 +32253,6 @@ _ACEOF
+ fi
+ 
+ done
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_free in -llber" >&5
+-$as_echo_n "checking for ber_free in -llber... " >&6; }
+-if test "${ac_cv_lib_lber_ber_free+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-llber  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char ber_free ();
+-int
+-main ()
+-{
+-return ber_free ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_lber_ber_free=yes
+-else
+-  ac_cv_lib_lber_ber_free=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_free" >&5
+-$as_echo "$ac_cv_lib_lber_ber_free" >&6; }
+-if test "x$ac_cv_lib_lber_ber_free" = x""yes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBLBER 1
+-_ACEOF
+-
+-  LIBS="-llber $LIBS"
+-
+-fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzopen in -lbz2" >&5
+ $as_echo_n "checking for BZ2_bzopen in -lbz2... " >&6; }
--- a/www/gnash/patches/patch-doc_C_Makefile_in
+++ b/www/gnash/patches/patch-doc_C_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_C_Makefile_in,v 1.1 2010/10/12 09:38:16 dcoppa Exp $
+--- doc/C/Makefile.in.orig	Sat Aug 21 14:04:38 2010
+++ doc/C/Makefile.in	Wed Aug 25 20:22:57 2010
+@@ -492,7 +492,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-man1dir = ${prefix}/share/man/man1
+man1dir = ${mandir}/man1
+ docname = gnash
+ lang = C
+ omffile = gnash-C.omf
--- a/www/gnash/patches/patch-gui_Makefile_in
+++ b/www/gnash/patches/patch-gui_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-gui_Makefile_in,v 1.1 2010/10/12 09:38:16 dcoppa Exp $
+--- gui/Makefile.in.orig	Tue Sep 14 04:01:39 2010
+++ gui/Makefile.in	Tue Sep 14 04:08:43 2010
+@@ -1438,7 +1438,7 @@ INSTALL_INFO = @INSTALL_INFO@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-INTLLIBS = @INTLLIBS@
+INTLLIBS = @LTLIBINTL@
+ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ JAVA = @JAVA@
+ JPEG_CFLAGS = @JPEG_CFLAGS@
--- a/www/gnash/patches/patch-gui_gtk_cpp
+++ b/www/gnash/patches/patch-gui_gtk_cpp
@ -1,19 +0,0 @@
-$OpenBSD: patch-gui_gtk_cpp,v 1.1 2008/06/28 15:46:33 deanna Exp $
--- gui/gtk.cpp.orig	Sat Jun 21 19:04:24 2008
-+++ gui/gtk.cpp	Sat Jun 21 19:05:06 2008
-@@ -2098,6 +2098,7 @@ GtkGui::createControlMenu(GtkWidget *obj)
-     gtk_widget_show (separator1);
-     gtk_container_add (GTK_CONTAINER (menu), separator1);
- 
-+#if 0 // Presently disabled, see gnash bug #23612
- // Restart
- // 
-     GtkImageMenuItem *menuitem_restart =
-@@ -2108,6 +2109,7 @@ GtkGui::createControlMenu(GtkWidget *obj)
-     gtk_widget_show(GTK_WIDGET(menuitem_restart));
-     g_signal_connect ((gpointer) menuitem_restart, "activate",
-         G_CALLBACK (&menuitem_restart_callback), this);
-+#endif
- 
- #if 0 // Presently disabled
- 
--- a/www/gnash/patches/patch-libbase_Makefile_in
+++ b/www/gnash/patches/patch-libbase_Makefile_in
@ -1,18 +1,23 @@
-$OpenBSD: patch-libbase_Makefile_in,v 1.1 2008/06/28 15:46:33 deanna Exp $
--- libbase/Makefile.in.orig	Fri Jun 13 12:12:59 2008
-+++ libbase/Makefile.in	Fri Jun 13 12:14:16 2008
-@@ -948,14 +948,6 @@ mostlyclean-libtool:
- clean-libtool:
- 	-rm -rf .libs _libs
- install-sysconfDATA: $(sysconf_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
-	@list='$(sysconf_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
-	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-	done
+$OpenBSD: patch-libbase_Makefile_in,v 1.2 2010/10/12 09:38:16 dcoppa Exp $
+--- libbase/Makefile.in.orig	Sat Aug 21 14:04:42 2010
+++ libbase/Makefile.in	Tue Sep 14 02:32:53 2010
+@@ -445,8 +445,8 @@ LIBADD_DLOPEN = @LIBADD_DLOPEN@
+ LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
+ LIBAVCODEC_IDENT = @LIBAVCODEC_IDENT@
+ LIBEXT = @LIBEXT@
+-LIBICONV = @LIBICONV@
+-LIBINTL = @LIBINTL@
+LIBICONV = @LTLIBICONV@
+LIBINTL = @LTLIBINTL@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+ LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
+@@ -1393,7 +1393,7 @@ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+ 
+-install-exec-am: install-pkglibLTLIBRARIES install-sysconfDATA
+install-exec-am: install-pkglibLTLIBRARIES
+ 
+ install-html: install-html-am
 
- uninstall-sysconfDATA:
- 	@$(NORMAL_UNINSTALL)
--- a/www/gnash/patches/patch-libbase_rc_cpp
+++ b/www/gnash/patches/patch-libbase_rc_cpp
@ -1,11 +1,11 @@
-$OpenBSD: patch-libbase_rc_cpp,v 1.1 2008/06/28 15:46:33 deanna Exp $
--- libbase/rc.cpp.orig	Tue Jun  3 17:34:10 2008
-+++ libbase/rc.cpp	Tue Jun  3 17:35:48 2008
-@@ -128,6 +128,7 @@ RcInitFile::loadFiles()
+$OpenBSD: patch-libbase_rc_cpp,v 1.2 2010/10/12 09:38:16 dcoppa Exp $
+--- libbase/rc.cpp.orig	Sat Aug 21 10:26:58 2010
+++ libbase/rc.cpp	Sun Aug 22 14:14:23 2010
+@@ -152,6 +152,7 @@ RcInitFile::loadFiles()
 
-     // Check the default system location
-     std::string loadfile = SYSCONFDIR;
+ #if !defined(__OS2__ ) && ! defined(__amigaos4__)
+     // On OS/2 only look in %HOME%
 +    loadfile.append("/gnash");
     loadfile.append("/gnashrc");
     parseFile(loadfile);
-     
+ #endif
--- a/www/gnash/patches/patch-plugin_npapi_plugin_cpp
+++ b/www/gnash/patches/patch-plugin_npapi_plugin_cpp
@ -0,0 +1,11 @@
+$OpenBSD: patch-plugin_npapi_plugin_cpp,v 1.1 2010/10/12 09:38:16 dcoppa Exp $
+--- plugin/npapi/plugin.cpp.orig	Mon Aug 16 11:46:55 2010
+++ plugin/npapi/plugin.cpp	Sun Aug 22 21:03:34 2010
+@@ -208,6 +208,7 @@ NS_PluginInitialize()
+ 
+ #if !defined(__OS2__ ) && ! defined(__amigaos4__)
+     newGnashRc.append(SYSCONFDIR);
+    newGnashRc.append("/gnash");
+     newGnashRc.append("/gnashpluginrc");
+ #endif
+ 
--- a/www/gnash/patches/patch-plugin_plugin_cpp
+++ b/www/gnash/patches/patch-plugin_plugin_cpp
@ -1,11 +0,0 @@
-$OpenBSD: patch-plugin_plugin_cpp,v 1.1 2008/06/28 15:46:33 deanna Exp $
--- plugin/plugin.cpp.orig	Tue Jun  3 17:36:08 2008
-+++ plugin/plugin.cpp	Tue Jun  3 17:36:46 2008
-@@ -200,6 +200,7 @@ NS_PluginInitialize()
- 		}
- 
- 		newGnashRc.append(SYSCONFDIR);
-+		newGnashRc.append("/gnash");
- 		newGnashRc.append("/gnashpluginrc");
- 
- 		char *home = getenv("HOME");
--- a/www/gnash/patches/patch-server_as_value_h
+++ b/www/gnash/patches/patch-server_as_value_h
@ -1,23 +0,0 @@
-$OpenBSD: patch-server_as_value_h,v 1.1 2008/07/29 18:46:08 martynas Exp $
--- server/as_value.h.orig	Tue Jul 29 01:25:32 2008
-+++ server/as_value.h	Tue Jul 29 01:25:34 2008
-@@ -65,6 +65,7 @@ class asName;
- // The following template works just like its C counterpart, with added
- // type safety (i.e., they will only compile for floating point arguments).
- 
-+#ifndef isnan
- template <typename T>
- inline bool
- isnan(const T& num, typename boost::enable_if<boost::is_floating_point<T> >::type* dummy = 0)
-@@ -72,8 +73,11 @@ isnan(const T& num, typename boost::enable_if<boost::i
- 	UNUSED(dummy);
- 	return num != num;
- }
-+#endif
- 
-+#ifndef isinf
- #define isinf(x) (isnan(x - x))
-+#endif
- 
- /// Use this methods to obtain a properly-formatted property name
- /// The methods will convert the name to lowercase if the current VM target
--- a/www/gnash/patches/patch-server_asobj_NetStreamGst_cpp
+++ b/www/gnash/patches/patch-server_asobj_NetStreamGst_cpp
@ -1,74 +0,0 @@
-$OpenBSD: patch-server_asobj_NetStreamGst_cpp,v 1.1 2008/06/28 15:46:33 deanna Exp $
--- server/asobj/NetStreamGst.cpp.orig	Tue Jun  3 20:11:29 2008
-+++ server/asobj/NetStreamGst.cpp	Tue Jun 24 20:10:07 2008
-@@ -84,6 +84,7 @@ NetStreamGst::NetStreamGst()
- 
-   // Setup video conversion and sink
- 
-+  GstElement* video_queue = gst_element_factory_make ("queue", "gnash_videoqueue");
- 
-   // setup the video colorspaceconverter converter
-   GstElement* colorspace = gst_element_factory_make ("ffmpegcolorspace", "gnash_colorspace");
-@@ -112,21 +113,27 @@ NetStreamGst::NetStreamGst()
- 
-   // Create the video pipeline and link the elements. The pipeline will
-   // dereference the elements when they are destroyed.
-  gst_bin_add_many (GST_BIN (_videobin), colorspace, videoscale, videocaps, videosink, NULL);
-+  gst_bin_add_many (GST_BIN (_videobin), video_queue, colorspace, videoscale,
-+		    videocaps, videosink, NULL);
-   
-  if (!colorspace || !videoscale || !videocaps || !videosink) {
-+  if (!video_queue || !colorspace || !videoscale || !videocaps || !videosink) {
-     log_error(_("Couldn't create the Gstreamer video conversion elements. "
-                 "Please make sure Gstreamer and gstreamer-plugins-base are "
-                 "correctly installed. Video playback will not be possible."));
-   }
-   
-  rv = gst_element_link_many(colorspace, videoscale, videocaps, videosink, NULL);
-+  rv = gst_element_link_many(video_queue, colorspace, videoscale, videocaps, videosink, NULL);
-   if (!rv) {
-     log_error(_("Failed to link video conversion elements. Video playback will"
-                 " not be possible"));
-   }
- 
-+  GstPad* target_videopad = gst_element_get_static_pad (video_queue, "sink");
-+  gst_element_add_pad(_videobin, gst_ghost_pad_new ("sink", target_videopad));
-+  gst_object_unref(GST_OBJECT(target_videopad));
-+
-   // Setup audio sink
-+  GstElement* audio_queue = gst_element_factory_make ("queue", "gnash_audioqueue");
-   GstElement* audioconvert = gst_element_factory_make ("audioconvert", NULL);	
-   GstElement* audioresample = gst_element_factory_make ("audioresample", NULL);
-   
-@@ -143,27 +150,20 @@ NetStreamGst::NetStreamGst()
-     audiosink = gst_element_factory_make ("fakesink", NULL);
-   }
- 
-  gst_bin_add_many(GST_BIN(_audiobin), audioconvert, audioresample, audiosink, NULL);
-+  gst_bin_add_many(GST_BIN(_audiobin), audio_queue, audioconvert, audioresample, audiosink, NULL);
- 
-  if (!audioconvert || !audiosink || !audioresample) {
-+  if (!audio_queue || !audioconvert || !audiosink || !audioresample) {
-     log_error("Couldn't create Gstreamer audio elements. Audio playback will "
-               "not be possible");
-   }
-  rv = gst_element_link_many(audioconvert, audioresample, audiosink, NULL);
-+  rv = gst_element_link_many(audio_queue, audioconvert, audioresample, audiosink, NULL);
-   if (!rv) {
-     log_error("Couldn't link audio elements. There will be no audio playback.");
-   }
- 
-  GstPad* target_audiopad = gst_element_get_static_pad (audioconvert, "sink");
-  GstPad* target_videopad = gst_element_get_static_pad (colorspace, "sink");
-  
-  gst_element_add_pad(_videobin, gst_ghost_pad_new ("sink", target_videopad));
-+  GstPad* target_audiopad = gst_element_get_static_pad (audio_queue, "sink");
-   gst_element_add_pad(_audiobin, gst_ghost_pad_new ("sink", target_audiopad));
-  
-  gst_object_unref(GST_OBJECT(target_videopad));
-   gst_object_unref(GST_OBJECT(target_audiopad));
-
-
- }
- 
- NetStreamGst::~NetStreamGst()
--- a/www/gnash/patches/patch-server_asobj_SoundGst_cpp
+++ b/www/gnash/patches/patch-server_asobj_SoundGst_cpp
@ -1,21 +0,0 @@
-$OpenBSD: patch-server_asobj_SoundGst_cpp,v 1.1 2008/06/28 15:46:33 deanna Exp $
--- server/asobj/SoundGst.cpp.orig	Fri Jun 27 08:13:34 2008
-+++ server/asobj/SoundGst.cpp	Fri Jun 27 08:15:11 2008
-@@ -228,7 +228,7 @@ SoundGst::getDuration()
-   }
-   
-   GstFormat fmt = GST_FORMAT_TIME;
-  boost::int64_t len;
-+  gint64 len;
- 
-   if (_pipeline && gst_element_query_duration (_pipeline, &fmt, &len)) {
-     return static_cast<unsigned int>(len / GST_MSECOND);
-@@ -249,7 +249,7 @@ SoundGst::getPosition()
-   if (!_pipeline) return 0;
- 
-   GstFormat fmt = GST_FORMAT_TIME;
-  boost::int64_t pos;
-+  gint64 pos;
-   GstStateChangeReturn ret;
-   GstState current, pending;
- 
--- a/www/gnash/patches/patch-utilities_Makefile_in
+++ b/www/gnash/patches/patch-utilities_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-utilities_Makefile_in,v 1.1 2010/10/12 09:38:16 dcoppa Exp $
+--- utilities/Makefile.in.orig	Tue Sep 14 04:13:30 2010
+++ utilities/Makefile.in	Tue Sep 14 04:13:49 2010
+@@ -385,7 +385,7 @@ LIBADD_SHL_LOAD = @LIBADD_SHL_LOAD@
+ LIBAVCODEC_IDENT = @LIBAVCODEC_IDENT@
+ LIBEXT = @LIBEXT@
+ LIBICONV = @LIBICONV@
+-LIBINTL = @LIBINTL@
+LIBINTL = @LTLIBINTL@
+ LIBLTDL = @LIBLTDL@
+ LIBOBJS = @LIBOBJS@
+ LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
--- a/www/gnash/pkg/DESCR
+++ b/www/gnash/pkg/DESCR
@ -1,3 +1,3 @@
-Gnash is the GNU Flash movie player, which can be run standalone on
+Gnash is the GNU SWF movie player, which can be run standalone on
 the desktop or an embedded device, as well as as a plugin for several
 browsers.
--- a/www/gnash/pkg/PLIST
+++ b/www/gnash/pkg/PLIST
@ -1,34 +1,210 @@
-@comment $OpenBSD: PLIST,v 1.6 2010/08/26 12:09:07 ajacoutot Exp $
-@bin bin/dumpshm
+@comment $OpenBSD: PLIST,v 1.7 2010/10/12 09:38:16 dcoppa Exp $
 bin/gnash
@bin bin/gprocessor
@bin bin/gtk-gnash
-@bin bin/soldumper
+@bin bin/rtmpget
+include/gnash/
+include/gnash/AMF.h
+include/gnash/BevelFilter_as.h
+include/gnash/BitmapData_as.h
+include/gnash/BitmapFilterQuality_as.h
+include/gnash/BitmapFilterType_as.h
+include/gnash/BitmapFilter_as.h
+include/gnash/BitsReader.h
+include/gnash/BlurFilter_as.h
+include/gnash/CachedBitmap.h
+include/gnash/ClockTime.h
+include/gnash/ColorMatrixFilter_as.h
+include/gnash/ColorTransform_as.h
+include/gnash/ConvolutionFilter_as.h
+include/gnash/DisplacementMapFilterMode_as.h
+include/gnash/DisplacementMapFilter_as.h
+include/gnash/DropShadowFilter_as.h
+include/gnash/ExternalInterface_as.h
+include/gnash/FileTypes.h
+include/gnash/GC.h
+include/gnash/GlowFilter_as.h
+include/gnash/GnashAlgorithm.h
+include/gnash/GnashException.h
+include/gnash/GnashFactory.h
+include/gnash/GnashFileUtilities.h
+include/gnash/GnashImage.h
+include/gnash/GnashImageJpeg.h
+include/gnash/GnashNumeric.h
+include/gnash/GnashSleep.h
+include/gnash/GnashSystemFDHeaders.h
+include/gnash/GnashSystemIOHeaders.h
+include/gnash/GnashSystemNetHeaders.h
+include/gnash/GradientBevelFilter_as.h
+include/gnash/GradientGlowFilter_as.h
+include/gnash/IOChannel.h
+include/gnash/Matrix_as.h
+include/gnash/NamingPolicy.h
+include/gnash/NetworkAdapter.h
+include/gnash/Point2d.h
+include/gnash/Point_as.h
+include/gnash/RTMP.h
+include/gnash/Range2d.h
+include/gnash/Rectangle_as.h
+include/gnash/SharedMem.h
+include/gnash/SimpleBuffer.h
+include/gnash/Socket.h
+include/gnash/StringPredicates.h
+include/gnash/Transform_as.h
+include/gnash/URL.h
+include/gnash/WallClockTimer.h
+include/gnash/arg_parser.h
+include/gnash/asobj/
+include/gnash/asobj/AMFConverter.h
+include/gnash/asobj/Accessibility_as.h
+include/gnash/asobj/Array_as.h
+include/gnash/asobj/AsBroadcaster.h
+include/gnash/asobj/Boolean_as.h
+include/gnash/asobj/Camera_as.h
+include/gnash/asobj/CharacterProxy.h
+include/gnash/asobj/Color_as.h
+include/gnash/asobj/ContextMenuItem_as.h
+include/gnash/asobj/ContextMenu_as.h
+include/gnash/asobj/ControlTag.h
+include/gnash/asobj/CustomActions.h
+include/gnash/asobj/Date_as.h
+include/gnash/asobj/DefinitionTag.h
+include/gnash/asobj/DisplayList.h
+include/gnash/asobj/DisplayObject.h
+include/gnash/asobj/DisplayObjectContainer.h
+include/gnash/asobj/DynamicShape.h
+include/gnash/asobj/Error_as.h
+include/gnash/asobj/FillStyle.h
+include/gnash/asobj/Geometry.h
+include/gnash/asobj/Global_as.h
+include/gnash/asobj/Globals.h
+include/gnash/asobj/GnashKey.h
+include/gnash/asobj/InteractiveObject.h
+include/gnash/asobj/Key_as.h
+include/gnash/asobj/LineStyle.h
+include/gnash/asobj/LoadVars_as.h
+include/gnash/asobj/LoadableObject.h
+include/gnash/asobj/LocalConnection_as.h
+include/gnash/asobj/Math_as.h
+include/gnash/asobj/Microphone_as.h
+include/gnash/asobj/MouseButtonState.h
+include/gnash/asobj/Mouse_as.h
+include/gnash/asobj/Movie.h
+include/gnash/asobj/MovieClip.h
+include/gnash/asobj/MovieClipLoader.h
+include/gnash/asobj/MovieClip_as.h
+include/gnash/asobj/MovieFactory.h
+include/gnash/asobj/NativeFunction.h
+include/gnash/asobj/NetConnection_as.h
+include/gnash/asobj/NetStream_as.h
+include/gnash/asobj/Number_as.h
+include/gnash/asobj/Object.h
+include/gnash/asobj/ObjectURI.h
+include/gnash/asobj/PlayHead.h
+include/gnash/asobj/PropFlags.h
+include/gnash/asobj/Property.h
+include/gnash/asobj/PropertyList.h
+include/gnash/asobj/RGBA.h
+include/gnash/asobj/Relay.h
+include/gnash/asobj/RunResources.h
+include/gnash/asobj/SWF.h
+include/gnash/asobj/SWFMatrix.h
+include/gnash/asobj/SWFRect.h
+include/gnash/asobj/Selection_as.h
+include/gnash/asobj/ShapeRecord.h
+include/gnash/asobj/SharedObject_as.h
+include/gnash/asobj/Sound_as.h
+include/gnash/asobj/Stage_as.h
+include/gnash/asobj/StreamProvider.h
+include/gnash/asobj/String_as.h
+include/gnash/asobj/System_as.h
+include/gnash/asobj/TagLoadersTable.h
+include/gnash/asobj/TextField_as.h
+include/gnash/asobj/TextFormat_as.h
+include/gnash/asobj/TextSnapshot_as.h
+include/gnash/asobj/UserFunction.h
+include/gnash/asobj/Video.h
+include/gnash/asobj/XMLNode_as.h
+include/gnash/asobj/XMLSocket_as.h
+include/gnash/asobj/XML_as.h
+include/gnash/asobj/as_environment.h
+include/gnash/asobj/as_function.h
+include/gnash/asobj/as_object.h
+include/gnash/asobj/as_value.h
+include/gnash/asobj/builtin_function.h
+include/gnash/asobj/cxform.h
+include/gnash/asobj/drag_state.h
+include/gnash/asobj/event_id.h
+include/gnash/asobj/gnash.h
+include/gnash/asobj/movie_root.h
+include/gnash/asobj/namedStrings.h
+include/gnash/display_pkg.h
+include/gnash/dsodefs.h
+include/gnash/extension.h
+include/gnash/external_pkg.h
+include/gnash/filters_pkg.h
+include/gnash/geom_pkg.h
+include/gnash/getclocktime.hpp
+include/gnash/gettext.h
+include/gnash/gmemory.h
+include/gnash/jemtree.h
+include/gnash/log.h
+include/gnash/net_pkg.h
+include/gnash/noseek_fd_adapter.h
+include/gnash/ogl.h
+include/gnash/parser/
+include/gnash/parser/movie_definition.h
+include/gnash/rc.h
+include/gnash/ref_counted.h
+include/gnash/sharedlib.h
+include/gnash/smart_ptr.h
+include/gnash/snappingrange.h
+include/gnash/string_table.h
+include/gnash/text_pkg.h
+include/gnash/tree.hh
+include/gnash/tu_file.h
+include/gnash/tu_opengl_includes.h
+include/gnash/utf8.h
+include/gnash/utility.h
+include/gnash/vm/
+include/gnash/vm/ASHandlers.h
+include/gnash/vm/ActionExec.h
+include/gnash/vm/CallStack.h
+include/gnash/vm/ExecutableCode.h
+include/gnash/vm/Machine.h
+include/gnash/vm/SafeStack.h
+include/gnash/vm/VM.h
+include/gnash/vm/fn_call.h
+include/gnash/zlib_adapter.h
 lib/gnash/
-lib/gnash/libgnashamf-${VER}.so
-lib/gnash/libgnashamf.la
-lib/gnash/libgnashamf.so
 lib/gnash/libgnashbase-${VER}.so
 lib/gnash/libgnashbase.la
 lib/gnash/libgnashbase.so
+lib/gnash/libgnashcore-${VER}.so
+lib/gnash/libgnashcore.la
+lib/gnash/libgnashcore.so
 lib/gnash/libgnashmedia-${VER}.so
 lib/gnash/libgnashmedia.la
 lib/gnash/libgnashmedia.so
-lib/gnash/libgnashnet.la
-@lib lib/gnash/libgnashnet.so.${LIBgnashnet_VERSION}
-lib/gnash/libgnashserver-${VER}.so
-lib/gnash/libgnashserver.la
-lib/gnash/libgnashserver.so
-lib/gnash/libmozsdk.la
-@lib lib/gnash/libmozsdk.so.${LIBmozsdk_VERSION}
+lib/gnash/libgnashrender.la
+@lib lib/gnash/libgnashrender.so.${LIBgnashrender_VERSION}
+lib/gnash/libgnashsound-${VER}.so
+lib/gnash/libgnashsound.la
+lib/gnash/libgnashsound.so
 lib/mozilla/
 lib/mozilla/plugins/
 lib/mozilla/plugins/libgnashplugin.so
-@man man/man1/cygnal.1
-@man man/man1/dumpshm.1
+lib/pkgconfig/gnash.pc
+@comment @man man/man1/cygnal.1
+@man man/man1/findmicrophones.1
+@man man/man1/findwebcams.1
+@comment @man man/man1/flvdumper.1
@man man/man1/gnash.1
@man man/man1/gprocessor.1
-@man man/man1/soldumper.1
+@man man/man1/gtk-gnash.1
+@comment @man man/man1/kde4-gnash.1
+@man man/man1/rtmpget.1
+@comment @man man/man1/soldumper.1
 share/doc/gnash/
 share/doc/gnash/gnashref.html
 share/doc/gnash/gnashuser.html
@ -44,28 +220,10 @@ share/examples/gnash/gnashrc
 share/gnash/
 share/gnash/GnashG.png
 share/gnash/gnash_128_96.ico
-share/locale/
-share/locale/cs/
-share/locale/cs/LC_MESSAGES/
 share/locale/cs/LC_MESSAGES/gnash.mo
-share/locale/de/
-share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/gnash.mo
-share/locale/es/
-share/locale/es/LC_MESSAGES/
 share/locale/es/LC_MESSAGES/gnash.mo
-share/locale/fi/
-share/locale/fi/LC_MESSAGES/
 share/locale/fi/LC_MESSAGES/gnash.mo
-share/locale/fr/
-share/locale/fr/LC_MESSAGES/
 share/locale/fr/LC_MESSAGES/gnash.mo
-share/locale/it/
-share/locale/it/LC_MESSAGES/
 share/locale/it/LC_MESSAGES/gnash.mo
-share/locale/ja/
-share/locale/ja/LC_MESSAGES/
 share/locale/ja/LC_MESSAGES/gnash.mo
-share/locale/sv/
-share/locale/sv/LC_MESSAGES/
-share/locale/sv/LC_MESSAGES/gnash.mo