- update to git version

- use autoreconf
- add missing direct dependecies
- drop option ffmpeg0
- add more hardware acceleration

18 files changed, 123 insertions, 404 deletions

diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 6b7ac0d45f0e..2a9b82a2955c 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -3,27 +3,32 @@
 
 PORTNAME=	gnash
 PORTVERSION=	0.8.10
-PORTREVISION=	20
+PORTREVISION=	21
 CATEGORIES=	graphics
 MASTER_SITES=	GNU/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES=	http://git.savannah.gnu.org/cgit/gnash.git/snapshot/
+DISTNAME=	gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	GNU Flash movie player
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
-		libltdl.so:devel/libltdl \
-		libcurl.so:ftp/curl \
+LIB_DEPENDS=	libltdl.so:devel/libltdl \
+		libnspr4.so:devel/nspr \
+		libc++.so.1:devel/libc++ \
 		libgif.so:graphics/giflib \
+		libpng.so:graphics/png \
+		libcurl.so:ftp/curl \
 		libspeex.so:audio/speex \
-		libnspr4.so:devel/nspr
+		libspeexdsp.so:audio/speexdsp \
+		libboost_thread.so:devel/boost-libs \
+		libfreetype.so:print/freetype2 \
+		libfontconfig.so:x11-fonts/fontconfig
 
 CONFLICTS=	gnash-devel-[0-9]*
 
-BROKEN=		fails to build with Boost 1.62
-
-USES=		cpe tar:bzip2 pkgconfig gmake libtool jpeg
+USES=		cpe tar:bzip2 compiler:features autoreconf pkgconfig gmake libtool jpeg desktop-file-utils
 CPE_VENDOR=	gnu
 GNU_CONFIGURE=	yes
 WANT_GSTREAMER=	yes
@@ -33,25 +38,28 @@ INSTALLS_ICONS=	yes
 SYSCONFIGDIR=	${PREFIX}/etc
 
 # jemalloc leads to infinite recursion on FreeBSD
+CFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
 		--with-boost-lib="${LOCALBASE}/lib" \
-		--disable-testsuite \
 		--with-plugins-install=prefix \
 		--sysconfdir="${SYSCONFIGDIR}" \
+		--disable-testsuite \
 		--disable-kparts3 \
 		--disable-jemalloc
 
-GNASHVER=	${PORTVERSION}
+GNASHVER=	0.8.11dev
 CONFIG_FILES=	gnashpluginrc gnashrc
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${GNASHVER}
+WRKSRC=		${WRKDIR}/${DISTNAME}
 PLIST_SUB+=	GNASHVER="${GNASHVER}"
 
 USE_LDCONFIG=	${PREFIX}/lib/gnash
 
 OPTIONS_DEFINE=	PLUGIN CYGNAL VAAPI DOCS
 OPTIONS_SINGLE=	MEDIA GUI RENDERER
-OPTIONS_SINGLE_MEDIA=	FFMPEG FFMPEG2 GSTREAMER
+OPTIONS_SINGLE_MEDIA=	FFMPEG GSTREAMER
 OPTIONS_SINGLE_GUI=	GTK2 KDE4
 OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO
 OPTIONS_DEFAULT=GTK2 PLUGIN AGG FFMPEG VAAPI
@@ -61,10 +69,9 @@ OPTIONS_SUB=	yes
 PLUGIN_DESC=	browser plugin
 CYGNAL_DESC=	Cygnal media server
 AGG_DESC=	AGG renderer
-OPENGL_DESC=	OpenGL renderer
-CAIRO_DESC=	Cairo renderer (experimental)
-FFMPEG_DESC=	ffmpeg0 media handler
-FFMPEG2_DESC=	ffmpeg2 media handler (broken)
+OPENGL_DESC=	OpenGL renderer (experimental)
+CAIRO_DESC=	Cairo renderer
+FFMPEG_DESC=	ffmpeg media handler
 GSTREAMER_DESC=	GStreamer media handler
 VAAPI_DESC=	VAAPI support (requires FFMPEG)
 
@@ -106,7 +113,8 @@ CONFIGURE_ARGS+=	--disable-npapi
 
 .if ${PORT_OPTIONS:MKDE4} && ${PORT_OPTIONS:MPLUGIN}
 PLIST_SUB+=	KPARTS4="${KDE_PREFIX}"
-CONFIGURE_ARGS+=	--with-kde4_prefix=${KDE_PREFIX}
+CONFIGURE_ARGS+=	--with-kde4_prefix=${KDE_PREFIX} \
+			--with-kde-appsdatadir=${KDE_PREFIX}/share/apps/klash
 .else
 PLIST_SUB+=	KPARTS4="@comment "
 CONFIGURE_ARGS+=	--disable-kparts4
@@ -118,7 +126,7 @@ CONFIGURE_ARGS+=	--disable-kparts4
 GNASH_GUIS=
 
 .if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20 atk gconf2
+USE_GNOME+=	gtk20 pango atk gconf2
 GNASH_GUIS+=	gtk
 .endif
 
@@ -127,7 +135,11 @@ GNASH_GUIS+=	kde4
 USE_QT4=	moc_build
 QT_NONSTANDARD=	yes
 USE_KDE=	kdelibs
+CONFIGURE_ARGS+=	--without-gconf
 CONFIGURE_ENV+=	KDE4_CONFIG="${KDE_PREFIX}/bin/kde4-config"
+.if ${PORT_OPTIONS:MNLS}
+LDFLAGS+=	-lintl
+.endif
 .endif
 
 .if ${GNASH_GUIS} == ""
@@ -147,6 +159,7 @@ GNASH_RENDERERS+=	agg
 .endif
 
 .if ${PORT_OPTIONS:MOPENGL}
+IGNORE=		support for OpenGL is currently broken, use option AGG
 USE_GL=			yes
 GNASH_RENDERERS+=	ogl
 .if ${PORT_OPTIONS:MGTK2}
@@ -166,39 +179,33 @@ GNASH_RENDERERS+=	cairo
 IGNORE=			needs at least one renderer enabled. Please rerun 'make config' and enable AGG, OPENGL or CAIRO
 .endif
 
-CONFIGURE_ARGS+=	--enable-renderer=`${ECHO} ${GNASH_RENDERERS} | ${TR} ' ' ,`
+CONFIGURE_ARGS+=	--enable-renderer=${GNASH_RENDERERS:S/^ //W:S/ /,/gW}
 
 #
 # Hardware acceleration options processing
 #
 .if ${PORT_OPTIONS:MVAAPI}
-.if empty(PORT_OPTIONS:MFFMPEG) && empty(PORT_OPTIONS:MFFMPEG2)
+.if empty(PORT_OPTIONS:MFFMPEG)
 IGNORE=			VAAPI currently works only with FFMPEG. Please rerun 'make config' and enable FFMPEG
 .endif
 LIB_DEPENDS+=		libva.so:multimedia/libva
+CONFIGURE_ARGS+=	--enable-device=egl,x11,vaapi
 .else
 CONFIGURE_ARGS+=	--enable-hwaccel=none # XVideo
+CONFIGURE_ARGS+=	--enable-device=egl,x11
 .endif
 
 #
 # Media handler options processing
 #
-.if ${PORT_OPTIONS:MFFMPEG2} && empty(PORT_OPTIONS:MFFMPEG) && empty(PORT_OPTIONS:MGSTREAMER)
+.if ${PORT_OPTIONS:MFFMPEG} && empty(PORT_OPTIONS:MGSTREAMER)
 LIB_DEPENDS+=		libavcodec.so:multimedia/ffmpeg
 CONFIGURE_ARGS+=	--enable-media=ffmpeg \
 			--with-ffmpeg-incl=${LOCALBASE}/include/libavcodec \
 			--with-ffmpeg-lib=${LOCALBASE}/lib
 USE_SDL+=		sdl
 MAKE_ARGS+=		INCLUDES="-I${LOCALBASE}/include/ffmpeg"
-.elif ${PORT_OPTIONS:MFFMPEG} && empty(PORT_OPTIONS:MFFMPEG2) && empty(PORT_OPTIONS:MGSTREAMER)
-EXTRA_PATCHES+=		${FILESDIR}/ffmpeg0.patch
-LIB_DEPENDS+=		libavcodec0.so:multimedia/ffmpeg0
-CONFIGURE_ARGS+=	--enable-media=ffmpeg \
-			--with-ffmpeg-incl=${LOCALBASE}/include/ffmpeg0/libavcodec \
-			--with-ffmpeg-lib=${LOCALBASE}/lib/ffmpeg0
-USE_SDL+=		sdl
-MAKE_ARGS+=		INCLUDES="-I${LOCALBASE}/include/ffmpeg0"
-.elif ${PORT_OPTIONS:MGSTREAMER} && empty(PORT_OPTIONS:MFFMPEG) && empty(PORT_OPTIONS:MFFMPEG2)
+.elif ${PORT_OPTIONS:MGSTREAMER} && empty(PORT_OPTIONS:MFFMPEG)
 USE_GSTREAMER=		yes
 CONFIGURE_ARGS+=	--enable-media=gst
 USE_SDL+=		sdl
@@ -209,22 +216,14 @@ IGNORE=			can't be built with multiple media handlers enabled. Please rerun 'mak
 
 .include <bsd.port.pre.mk>
 
-pre-everything::
-.if ${PORT_OPTIONS:MOPENGL}
-	@${ECHO_CMD} "OpenGL support is currently broken (Gnash hangs using 100% CPU). Use at your own risk"
-	@sleep 3
-.endif
-
 post-patch:
-	${REINPLACE_CMD} -e '/KDE4_APPSDATADIR=/ s|share/kde4|share|' \
-		-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 '/^pkgconfigdir =/ s|libdir)|exec_prefix)/libdata|' \
-		${WRKSRC}/Makefile.in
-	${REINPLACE_CMD} -e '/^man1dir =/ s|=.*|= ${MAN1PREFIX}/man/man1|' \
-		${WRKSRC}/doc/C/Makefile.in
+	${REINPLACE_CMD} -e 's|lib64|lib|g' -e 's|lib32|lib|g' \
+		${WRKSRC}/macros/libslist
+	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+			-e 's|/usr/X11R6|${LOCALBASE}|g' \
+		${WRKSRC}/macros/incllist
+	${REINPLACE_CMD} -e 's|CODEC_ID_|AV_CODEC_ID_|' \
+		${WRKSRC}/libmedia/ffmpeg/VideoDecoderFfmpegVaapi.cpp
 
 post-install:
 .for conf in ${CONFIG_FILES}
diff --git a/graphics/gnash/distinfo b/graphics/gnash/distinfo
index b84845eff6e7..62de312a3b3d 100644
--- a/graphics/gnash/distinfo
+++ b/graphics/gnash/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gnash-0.8.10.tar.bz2) = 9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224
-SIZE (gnash-0.8.10.tar.bz2) = 4238106
+TIMESTAMP = 1481612892
+SHA256 (gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880.tar.bz2) = 9a88a623ccb4adab0381d4f97afe3019bab95855dd58685709b7a968fd91bb1d
+SIZE (gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880.tar.bz2) = 4856961
diff --git a/graphics/gnash/files/ffmpeg0.patch b/graphics/gnash/files/ffmpeg0.patch
deleted file mode 100644
index 639d25d6b93b..000000000000
--- a/graphics/gnash/files/ffmpeg0.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- configure.orig	2012-01-19 17:19:29.000000000 -0200
-+++ configure	2013-10-09 15:07:40.051081546 -0300
-@@ -9336,7 +9336,7 @@
-     if test x${ffmpeg_top_incl} = x; then
-     { $as_echo "$as_me:${as_lineno-$LINENO}: checking location of avcodec.h" >&5
- $as_echo_n "checking location of avcodec.h... " >&6; }
--        if test x"$PKG_CONFIG" != x; then       if $PKG_CONFIG --exists libavcodec; then                                 ffmpeg_pkg=`$PKG_CONFIG --cflags-only-I libavcodec`
-+        if test x"$PKG_CONFIG" != x; then       if $PKG_CONFIG --exists libavcodec0; then                                 ffmpeg_pkg=`$PKG_CONFIG --cflags-only-I libavcodec0`
-         ffmpeg_top_incl=`echo ${ffmpeg_pkg} | sed  -e 's:-I::'`
-                         for i in "" ffmpeg libavcodec ffmpeg/libavcodec; do
-           if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
-@@ -9568,16 +9568,16 @@
- else
- 
-     if test x"${with_ffmpeg_lib}" != x ; then
--      if test -f ${with_ffmpeg_lib}/libavcodec.a -o -f ${with_ffmpeg_lib}/libavcodec.${shlibext}; then
-+      if test -f ${with_ffmpeg_lib}/libavcodec0.a -o -f ${with_ffmpeg_lib}/libavcodec0.${shlibext}; then
- 	      ac_cv_path_ffmpeg_lib="-L`(cd ${with_ffmpeg_lib}; pwd)`"
--          libavcodec="-lavcodec"
-+          libavcodec="-lavcodec0"
-           LIBS="${ac_cv_path_ffmpeg_lib} $LIBS"           top_lib_dir=${with_ffmpeg_lib}
-       else
- 	      as_fn_error "${with_ffmpeg_lib} directory doesn't contain libavcodec libraries." "$LINENO" 5
-       fi
--      if test -f ${with_ffmpeg_lib}/libavformat.a -o -f ${with_ffmpeg_lib}/libavformat.${shlibext}; then
-+      if test -f ${with_ffmpeg_lib}/libavformat0.a -o -f ${with_ffmpeg_lib}/libavformat0.${shlibext}; then
- 	      ac_cv_path_ffmpeg_lib="-L`(cd ${with_ffmpeg_lib}; pwd)`"
--          libavformat="-lavformat"
-+          libavformat="-lavformat0"
-           top_lib_dir=${with_ffmpeg_lib}
-       else
- 	      as_fn_error "${with_ffmpeg_lib} directory doesn't contain libavformat libraries." "$LINENO" 5
-@@ -9869,13 +9869,13 @@
-                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavutil library" >&5
- $as_echo_n "checking for libavutil library... " >&6; }
-     if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
--      $PKG_CONFIG --exists libavutil && libavutil=`$PKG_CONFIG --libs-only-l libavutil`
-+      $PKG_CONFIG --exists libavutil0 && libavutil=`$PKG_CONFIG --libs-only-l libavutil0`
-     else
-       libavutil=""
-     fi
-     if test x"${libavutil}" = x; then
--      if test -f ${top_lib_dir}/libavutil.a -o -f ${top_lib_dir}/libavutil.${shlibext}; then
--        ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"
-+      if test -f ${top_lib_dir}/libavutil0.a -o -f ${top_lib_dir}/libavutil0.${shlibext}; then
-+        ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil0"
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${top_lib_dir}/libavutil" >&5
- $as_echo "${top_lib_dir}/libavutil" >&6; }
-       else
-@@ -9888,7 +9888,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lavutil  $LIBS"
-+LIBS="-lavutil0  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -9919,7 +9919,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_log" >&5
- $as_echo "$ac_cv_lib_avutil_av_log" >&6; }
- if test "x$ac_cv_lib_avutil_av_log" = x""yes; then :
--  ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"
-+  ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil0"
- fi
- 
-         fi
-@@ -10126,13 +10126,13 @@
-                     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libswscale library" >&5
- $as_echo_n "checking for libswscale library... " >&6; }
-     if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
--      $PKG_CONFIG --exists libswscale  && libsws=`$PKG_CONFIG --libs-only-l libswscale`
-+      $PKG_CONFIG --exists libswscale0  && libsws=`$PKG_CONFIG --libs-only-l libswscale0`
-     else
-       libsws=""
-     fi
-     if test x"${libsws}" = x; then
--      if test -f ${top_lib_dir}/libswscale.a -o -f ${top_lib_dir}/libswscale.${shlibext}; then
--        ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lswscale"
-+      if test -f ${top_lib_dir}/libswscale0.a -o -f ${top_lib_dir}/libswscale0.${shlibext}; then
-+        ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lswscale0"
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-       else
-@@ -10145,7 +10145,7 @@
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lswscale  $LIBS"
-+LIBS="-lswscale0  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -10176,7 +10176,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swscale_sws_scale" >&5
- $as_echo "$ac_cv_lib_swscale_sws_scale" >&6; }
- if test "x$ac_cv_lib_swscale_sws_scale" = x""yes; then :
--  ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lswscale"
-+  ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lswscale0"
- fi
- 
-         fi
diff --git a/graphics/gnash/files/patch-Makefile.am b/graphics/gnash/files/patch-Makefile.am
new file mode 100644
index 000000000000..00267e2b94d0
--- /dev/null
+++ b/graphics/gnash/files/patch-Makefile.am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2016-07-21 14:25:09.000000000 +0200
++++ Makefile.am	2016-12-13 10:23:36.939767000 +0100
+@@ -512,7 +512,7 @@
+ apidoc:
+ 	$(MAKE) -C doc $@
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(exec_prefix)/libdata/pkgconfig
+ pkgconfig_DATA = \
+ 	gnash.pc \
+ 	$(NULL)
diff --git a/graphics/gnash/files/patch-configure b/graphics/gnash/files/patch-configure
deleted file mode 100644
index 6138d27fbed9..000000000000
--- a/graphics/gnash/files/patch-configure
+++ /dev/null
@@ -1,78 +0,0 @@
---- configure.orig	2016-12-02 06:12:03 UTC
-+++ configure
-@@ -30836,12 +30836,17 @@ fi
-       esac
-     fi
- 
-+#  KDE4_PREFIX override
-+    if test x"${with_kde4_prefix}" != x; then
-+        KDE4_PREFIX="${with_kde4_prefix}"
-+    fi
-+
-     if test x"${with_kde4_plugindir}" != x ; then
-       KDE4_PLUGINDIR="${with_kde4_plugindir}"
-     else
--      if test -d ${KDE4_PREFIX}/lib64 -a -f /etc/redhat-release || \
--         test -d ${KDE4_PREFIX}/lib64 -a -f /usr/lib/rpm/suse_macros; then
--        KDE4_PLUGINDIR="${KDE4_PREFIX}/lib64/kde4"
-+      if test -d ${KDE4_PREFIX}/lib -a -f /etc/redhat-release || \
-+         test -d ${KDE4_PREFIX}/lib -a -f /usr/lib/rpm/suse_macros; then
-+        KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
-       else
-         KDE4_PLUGINDIR="${KDE4_PREFIX}/lib/kde4"
-       fi
-@@ -30994,7 +30999,7 @@ $as_echo_n "checking whether NPString ha
- 
-                   #include "npapi.h"
-                   #include "npruntime.h"
--                  int main(int argc, char* argv){
-+                  int main(int argc, char** argv){
- 	            NPString str;
-                     uint32_t len = str.UTF8Length;
- 	            return 0;
-@@ -31356,6 +31361,9 @@ else
-     if test x"${with_x11_incl}" != x ; then
-       if test -f ${with_x11_incl}/X11/X.h ; then
-        ac_cv_path_x11_incl="-I`(cd ${with_x11_incl}; pwd)`"
-+
-+$as_echo "#define HAVE_X11_X_H 1" >>confdefs.h
-+
-       else
-        as_fn_error "${with_x11_incl} directory doesn't contain X.h" "$LINENO" 5
-       fi
-@@ -44135,7 +44143,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-   dirname=""
-   libname=""
-       boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp"
--      boost_libs="thread program_options iostreams"
-+      boost_libs="thread program_options iostreams system"
- 
-       cygnal_boost_libs="serialization date_time"
- 
-@@ -49394,7 +49402,7 @@
- 
- if test x$build_agg = xyes; then # {
-   echo "        AGG Pixel format is: $pixelformat"
--  if test x"$AGG_LIBS" != x -a x"${agg25}" == xyes; then # {
-+  if test x"$AGG_LIBS" != x -a x"${agg25}" = xyes; then # {
-     if test x"$AGG_CFLAGS" != x; then # {
-       echo "        AGG flags are: $AGG_CFLAGS"
-     else # }{
-@@ -50044,7 +50052,7 @@
-   else
- 
-   pkg_out_fd=3
--  echo "          ERROR: `echo "No SSL development package is installed, but it's enabled."" | fold -s -w 62 | sed 's/^/                 /' | tr '\n' '#' | cut -b 18- | tr '#' '\n'`" >&$pkg_out_fd
-+  echo "          ERROR: `echo "No SSL development package is installed, but it's enabled." | fold -s -w 62 | sed 's/^/                 /' | tr '\n' '#' | cut -b 18- | tr '#' '\n'`" >&$pkg_out_fd
-   deb_dest="$deb_err"
-   rpm_dest="$rpm_err"
-   yast_dest="$yast_err"
-@@ -50063,7 +50071,7 @@
-   else
- 
-   pkg_out_fd=3
--  echo "          ERROR: `echo "No SSH development package is installed, but it's enabled."" | fold -s -w 62 | sed 's/^/                 /' | tr '\n' '#' | cut -b 18- | tr '#' '\n'`" >&$pkg_out_fd
-+  echo "          ERROR: `echo "No SSH development package is installed, but it's enabled." | fold -s -w 62 | sed 's/^/                 /' | tr '\n' '#' | cut -b 18- | tr '#' '\n'`" >&$pkg_out_fd
-   deb_dest="$deb_err"
-   rpm_dest="$rpm_err"
-   yast_dest="$yast_err"
diff --git a/graphics/gnash/files/patch-configure.ac b/graphics/gnash/files/patch-configure.ac
new file mode 100644
index 000000000000..fda056143baf
--- /dev/null
+++ b/graphics/gnash/files/patch-configure.ac
@@ -0,0 +1,20 @@
+--- configure.ac.orig	2016-07-21 14:25:09.000000000 +0200
++++ configure.ac	2016-12-13 08:41:26.852652000 +0100
+@@ -4144,7 +4144,7 @@
+     fi
+     echo "        SSL libs are: $SSL_LIBS"
+   else
+-    PKG_ERR([No SSL development package is installed, but it's enabled."])
++    PKG_ERR([No SSL development package is installed, but it's enabled.])
+   fi
+ fi
+ 
+@@ -4157,7 +4157,7 @@
+     fi
+     echo "        SSH libs are: $SSH_LIBS"
+   else
+-    PKG_ERR([No SSH development package is installed, but it's enabled."])
++    PKG_ERR([No SSH development package is installed, but it's enabled.])
+   fi
+ fi
+ 
diff --git a/graphics/gnash/files/patch-libbase_GnashImageGif.cpp b/graphics/gnash/files/patch-libbase_GnashImageGif.cpp
deleted file mode 100644
index 17e67dc5f3a5..000000000000
--- a/graphics/gnash/files/patch-libbase_GnashImageGif.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
---- libbase/GnashImageGif.cpp.orig	2012-01-19 19:17:48 UTC
-+++ libbase/GnashImageGif.cpp
-@@ -121,7 +121,11 @@ GifInput::GifInput(boost::shared_ptr<IOC
- GifInput::~GifInput()
- {
-     // Clean up allocated data.
-+#if GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1 || GIFLIB_MAJOR > 5
-+    DGifCloseFile(_gif, NULL);
-+#else
-     DGifCloseFile(_gif);
-+#endif
- }
- 
- size_t
-@@ -269,7 +273,11 @@ GifInput::processRecord(GifRecordType re
- void
- GifInput::read()
- {
-+#if GIFLIB_MAJOR >= 5
-+    _gif = DGifOpen(_inStream.get(), &readData, NULL); 
-+#else
-     _gif = DGifOpen(_inStream.get(), &readData); 
-+#endif
- 
-     GifRecordType record;
- 
diff --git a/graphics/gnash/files/patch-libbase_GnashSleep.h b/graphics/gnash/files/patch-libbase_GnashSleep.h
deleted file mode 100644
index dca9aef8e9c2..000000000000
--- a/graphics/gnash/files/patch-libbase_GnashSleep.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libbase_GnashSleep.h,v 1.1 2013/02/26 11:04:25 joerg Exp $
-
---- libbase/GnashSleep.h.orig	2013-02-25 18:39:09.000000000 +0000
-+++ libbase/GnashSleep.h
-@@ -38,7 +38,7 @@ inline void gnashSleep(size_t useconds)
-     Sleep(useconds / 1000);
- #else
-     const size_t m = 1000000;
--    const struct timespec t = { useconds / m, (useconds % m) * 1000 };
-+    const struct timespec t = { static_cast<time_t>(useconds / m), static_cast<long>((useconds % m) * 1000) };
-     ::nanosleep(&t, 0);
- #endif
- }
diff --git a/graphics/gnash/files/patch-libbase_IOChannel.h b/graphics/gnash/files/patch-libbase_IOChannel.h
deleted file mode 100644
index 9ed8f16abfdf..000000000000
--- a/graphics/gnash/files/patch-libbase_IOChannel.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-libbase_IOChannel.h,v 1.1 2013/08/31 14:52:14 joerg Exp $
-
---- libbase/IOChannel.h.orig	2013-08-31 11:55:31.000000000 +0000
-+++ libbase/IOChannel.h
-@@ -24,6 +24,7 @@
- #include <string>
- #include <boost/cstdint.hpp> // for boost int types
- #include <iosfwd>
-+#include <ios>
- 
- #include "dsodefs.h" // DSOEXPORT
- #include "GnashException.h" // for IOException inheritance
diff --git a/graphics/gnash/files/patch-libbase_Makefile.am b/graphics/gnash/files/patch-libbase_Makefile.am
new file mode 100644
index 000000000000..b1e893b73a0a
--- /dev/null
+++ b/graphics/gnash/files/patch-libbase_Makefile.am
@@ -0,0 +1,25 @@
+--- libbase/Makefile.am.orig	2016-07-21 14:25:09.000000000 +0200
++++ libbase/Makefile.am	2016-12-13 22:20:48.980088000 +0100
+@@ -135,6 +135,7 @@
+ endif
+ 
+ if HAVE_VAAPI
++if HAVE_VAAPI_GLX
+ libgnashbase_la_SOURCES += \
+ 	GnashVaapiImage.cpp \
+ 	GnashVaapiImage.h \
+@@ -143,6 +144,14 @@
+ 	GnashVaapiTexture.h \
+ 	$(NULL)
+ 
++else
++libgnashbase_la_SOURCES += \
++	GnashVaapiImage.cpp \
++	GnashVaapiImage.h \
++	GnashVaapiImageProxy.h \
++	$(NULL)
++
++endif
+ endif
+ 
+ 
diff --git a/graphics/gnash/files/patch-libbase_accumulator.h b/graphics/gnash/files/patch-libbase_accumulator.h
deleted file mode 100644
index dc64ca15eed4..000000000000
--- a/graphics/gnash/files/patch-libbase_accumulator.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-libbase_accumulator.h,v 1.1 2015/09/23 12:00:53 joerg Exp $
-
---- libbase/accumulator.h.orig	2015-09-17 11:20:41.000000000 +0000
-+++ libbase/accumulator.h
-@@ -60,6 +60,7 @@ public:
-     /// There are no tokens for an accumulator_type
-     virtual unsigned min_tokens() const { return 0; }
-     virtual unsigned max_tokens() const { return 0; }
-+    virtual bool adjacent_tokens_only() const { return true; }
- 
-     /// Accumulating from different sources is silly.
-     virtual bool is_composing() const { return false; }
diff --git a/graphics/gnash/files/patch-libbase_rc.cpp b/graphics/gnash/files/patch-libbase_rc.cpp
deleted file mode 100644
index e879bcb84e95..000000000000
--- a/graphics/gnash/files/patch-libbase_rc.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libbase_rc.cpp,v 1.1 2013/02/26 11:04:25 joerg Exp $
-
---- libbase/rc.cpp.orig	2013-02-25 18:40:46.000000000 +0000
-+++ libbase/rc.cpp
-@@ -83,7 +83,7 @@ RcInitFile::RcInitFile()
-         DEFAULT_FLASH_REV_NUMBER ",0"),
-     // An empty string leaves detection to VM.cpp:
-     _flashSystemOS(""),
--    _flashSystemManufacturer("Gnash "DEFAULT_FLASH_SYSTEM_OS),
-+    _flashSystemManufacturer("Gnash " DEFAULT_FLASH_SYSTEM_OS),
-     _actionDump(false),
-     _parserDump(false),
-     _verboseASCodingErrors(false),
diff --git a/graphics/gnash/files/patch-libcore_DragState.h b/graphics/gnash/files/patch-libcore_DragState.h
deleted file mode 100644
index 524395169fe6..000000000000
--- a/graphics/gnash/files/patch-libcore_DragState.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libcore_DragState.h,v 1.1 2014/08/19 13:39:24 joerg Exp $
-
---- libcore/DragState.h.orig	2014-08-19 11:01:44.000000000 +0000
-+++ libcore/DragState.h
-@@ -60,7 +60,7 @@ public:
-     boost::int32_t yOffset() const { return _yoffset; }
- 
-     bool hasBounds() const {
--        return (_bounds);
-+        return bool(_bounds);
-     }
- 
-     /// \brief
diff --git a/graphics/gnash/files/patch-libcore_swf_DefineButtonTag.h b/graphics/gnash/files/patch-libcore_swf_DefineButtonTag.h
deleted file mode 100644
index a603b27399cd..000000000000
--- a/graphics/gnash/files/patch-libcore_swf_DefineButtonTag.h
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-libcore_swf_DefineButtonTag.h,v 1.2 2013/12/15 19:42:04 joerg Exp $
-
---- libcore/swf/DefineButtonTag.h.orig	2012-01-19 19:17:48.000000000 +0000
-+++ libcore/swf/DefineButtonTag.h
-@@ -98,7 +98,7 @@ public:
-     /// A ButtonRecord is invalid if it refers to a DisplayObject
-     /// which has not been defined.
-     bool valid() const {
--        return (_definitionTag);
-+        return bool(_definitionTag);
-     }
- 
- private:
-@@ -157,8 +157,6 @@ public:
-         return (_conditions & KEYPRESS);
-     }
- 
--private:
--
-     /// Return the keycode triggering this action
-     //
-     /// Return 0 if no key is supposed to trigger us
-@@ -166,6 +164,8 @@ private:
-         return (_conditions & KEYPRESS) >> 9;
-     }
- 
-+private:
-+
-     enum Condition
-     {
-         IDLE_TO_OVER_UP = 1 << 0,
diff --git a/graphics/gnash/files/patch-libmedia_FLVParser.cpp b/graphics/gnash/files/patch-libmedia_FLVParser.cpp
deleted file mode 100644
index 754072493005..000000000000
--- a/graphics/gnash/files/patch-libmedia_FLVParser.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libmedia_FLVParser.cpp,v 1.1 2013/08/31 14:52:14 joerg Exp $
-
---- libmedia/FLVParser.cpp.orig	2013-08-31 11:58:57.000000000 +0000
-+++ libmedia/FLVParser.cpp
-@@ -447,7 +447,7 @@ FLVParser::parseNextTag(bool index_only)
- 		}
- 
- 		boost::mutex::scoped_lock lock(_metaTagsMutex);
--		_metaTags.insert(std::make_pair(flvtag.timestamp, metaTag.release()));
-+		_metaTags.insert(std::make_pair(boost::uint64_t(flvtag.timestamp), boost::shared_ptr<SimpleBuffer>(metaTag.release())));
- 	}
- 	else
- 	{
diff --git a/graphics/gnash/files/patch-libmedia_ffmpeg_VideoDecoderFfmpeg.cpp b/graphics/gnash/files/patch-libmedia_ffmpeg_VideoDecoderFfmpeg.cpp
new file mode 100644
index 000000000000..938c2bab6d82
--- /dev/null
+++ b/graphics/gnash/files/patch-libmedia_ffmpeg_VideoDecoderFfmpeg.cpp
@@ -0,0 +1,12 @@
+--- libmedia/ffmpeg/VideoDecoderFfmpeg.cpp.orig	2016-07-21 14:25:09.000000000 +0200
++++ libmedia/ffmpeg/VideoDecoderFfmpeg.cpp	2016-12-13 21:47:28.602555000 +0100
+@@ -544,7 +544,9 @@
+     vaapi_set_surface(pic, surface);
+ 
+     static unsigned int pic_num = 0;
++#if LIBAVCODEC_VERSION_MAJOR < 57
+     pic->type = FF_BUFFER_TYPE_USER;
++#endif
+ #if LIBAVCODEC_VERSION_MAJOR < 54
+     // This field has been unused for longer but has been removed with
+     // libavcodec 54.
diff --git a/graphics/gnash/files/patch-plugin_npapi_plugin.cpp b/graphics/gnash/files/patch-plugin_npapi_plugin.cpp
deleted file mode 100644
index f4fbb12018a7..000000000000
--- a/graphics/gnash/files/patch-plugin_npapi_plugin.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-plugin_npapi_plugin.cpp,v 1.1 2013/02/26 11:04:26 joerg Exp $
-
---- plugin/npapi/plugin.cpp.orig	2012-01-19 19:17:50.000000000 +0000
-+++ plugin/npapi/plugin.cpp
-@@ -50,17 +50,17 @@
- // The name must be this value to get flash movies that check the
- // plugin version to load.
- #define PLUGIN_NAME    "Shockwave Flash"
--#define MIME_TYPES_DESCRIPTION  MIME_TYPES_HANDLED":swf:"PLUGIN_NAME
-+#define MIME_TYPES_DESCRIPTION  MIME_TYPES_HANDLED ":swf:" PLUGIN_NAME
- 
- // Some javascript plugin detectors use the description
- // to decide the flash version to display. They expect the
- // form (major version).(minor version) r(revision).
- // e.g. "8.0 r99."
--#define FLASH_VERSION DEFAULT_FLASH_MAJOR_VERSION"."\
--    DEFAULT_FLASH_MINOR_VERSION" r"DEFAULT_FLASH_REV_NUMBER"."
-+#define FLASH_VERSION DEFAULT_FLASH_MAJOR_VERSION "."\
-+    DEFAULT_FLASH_MINOR_VERSION" r" DEFAULT_FLASH_REV_NUMBER "."
- 
- #define PLUGIN_DESCRIPTION \
--  "Shockwave Flash "FLASH_VERSION"<br>Gnash "VERSION", the GNU SWF Player. \
-+  "Shockwave Flash " FLASH_VERSION "<br>Gnash " VERSION ", the GNU SWF Player. \
-   Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 \
-   <a href=\"http://www.fsf.org\">Free \
-   Software Foundation</a>, Inc. <br> \
-@@ -71,7 +71,7 @@
-   href=\"http://www.gnu.org/software/gnash/\"> \
-   http://www.gnu.org/software/gnash</a>. \
-   <br>\
--  Compatible Shockwave Flash "FLASH_VERSION
-+  Compatible Shockwave Flash " FLASH_VERSION
- 
- #include "plugin.h" 
- #include "GnashSystemIOHeaders.h"
diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist
index e79e8d5e444a..5e5ccf5a3523 100644
--- a/graphics/gnash/pkg-plist
+++ b/graphics/gnash/pkg-plist
@@ -1,9 +1,10 @@
+bin/eglinfo
 bin/gnash
 %%GTK2%%bin/gnash-gtk-launcher
 %%GTK2%%bin/gtk-gnash
 %%KDE4%%bin/gnash-qt-launcher
-%%KDE4%%bin/kde4-gnash
 bin/gprocessor
+%%KDE4%%bin/qt4-gnash
 bin/rtmpget
 %%GSTREAMER%%bin/findmicrophones
 %%GSTREAMER%%bin/findwebcams
@@ -151,24 +152,18 @@ 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/jemalloc.h
-include/gnash/jemalloc_gnash.h
-include/gnash/jemalloc_rb.h
-include/gnash/jemalloc_types.h
 include/gnash/log.h
 include/gnash/net_pkg.h
 include/gnash/noseek_fd_adapter.h
 include/gnash/parser/movie_definition.h
 include/gnash/rc.h
 include/gnash/ref_counted.h
-include/gnash/sharedlib.h
 include/gnash/snappingrange.h
 include/gnash/string_table.h
 include/gnash/text_pkg.h
@@ -206,6 +201,8 @@ lib/gnash/libgnashrender-%%GNASHVER%%.so
 lib/gnash/libgnashrender.so
 lib/gnash/libgnashsound-%%GNASHVER%%.so
 lib/gnash/libgnashsound.so
+%%VAAPI%%lib/gnash/libgnashvaapi-%%GNASHVER%%.so
+%%VAAPI%%lib/gnash/libgnashvaapi.so
 libdata/pkgconfig/gnash.pc
 %%GTK2%%share/applications/gnash.desktop
 %%KDE4%%share/applications/klash.desktop
@@ -220,7 +217,7 @@ man/man1/soldumper.1.gz
 %%GTK2%%man/man1/gnash-gtk-launcher.1.gz
 %%GTK2%%man/man1/gtk-gnash.1.gz
 %%KDE4%%man/man1/gnash-qt-launcher.1.gz
-%%KDE4%%man/man1/kde4-gnash.1.gz
+%%KDE4%%man/man1/qt4-gnash.1.gz
 %%DATADIR%%/GnashG.png
 %%DATADIR%%/gnash-splash.swf
 %%DATADIR%%/gnash_128_96.ico
@@ -240,6 +237,8 @@ share/locale/fr/LC_MESSAGES/gnash.mo
 share/locale/it/LC_MESSAGES/gnash.mo
 share/locale/ja/LC_MESSAGES/gnash.mo
 share/locale/km/LC_MESSAGES/gnash.mo
+share/locale/nb/LC_MESSAGES/gnash.mo
 share/locale/ne/LC_MESSAGES/gnash.mo
 share/locale/ru/LC_MESSAGES/gnash.mo
+share/locale/zh_CN/LC_MESSAGES/gnash.mo
 share/locale/zh_TW/LC_MESSAGES/gnash.mo