Fix crash with screenshot filter.

Bump revision

Minor changes:
* Add LICENSE
* Remove trailing white-spaces

5 files changed, 28 insertions, 10 deletions

diff --git a/multimedia/mplayer-share/Makefile b/multimedia/mplayer-share/Makefile
index 66f6136c01b..3ae44d6eb91 100644
--- a/multimedia/mplayer-share/Makefile
+++ b/multimedia/mplayer-share/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2018/03/12 11:17:14 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2018/04/04 11:02:07 triaxx Exp $
 
-PKGREVISION= 9
+PKGREVISION=	10
 .include "Makefile.common"
 
 PKGNAME=	mplayer-share-${MPLAYER_VERSION}
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 94e0f816818..4ed5fdf3cda 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.58 2016/03/05 09:03:02 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.59 2018/04/04 11:02:07 triaxx Exp $
 # used by multimedia/gmplayer/Makefile
 # used by multimedia/mencoder/Makefile
 # used by multimedia/mplayer/Makefile
@@ -16,6 +16,7 @@ DIST_SUBDIR=		mplayer
 
 MAINTAINER?=		pkgsrc-users@NetBSD.org
 HOMEPAGE?=		http://www.mplayerhq.hu/
+LICENSE=		gnu-gpl-v2
 
 #
 # NOTE: gmplayer has its own distinfo file. if you are also updating
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo
index ddf02d944f6..8947ad392b1 100644
--- a/multimedia/mplayer-share/distinfo
+++ b/multimedia/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.92 2017/10/23 10:38:22 ryoon Exp $
+$NetBSD: distinfo,v 1.93 2018/04/04 11:02:07 triaxx Exp $
 
 SHA1 (mplayer/MPlayer-1.3.0.tar.xz) = 11db20434a4e1aabb9c52f7712241dae1b3730e3
 RMD160 (mplayer/MPlayer-1.3.0.tar.xz) = b6688b186f41267ca3cec59c67afe34396c51ade
@@ -10,6 +10,7 @@ SHA1 (patch-ae) = 286f5ac075ea4123a1a6276f97e02a4dda9b3e67
 SHA1 (patch-an) = 330c427e30b686165fda15a85b730a3f53e0d217
 SHA1 (patch-gui_interface.c) = 04c347b6cb0a54132e6b089142c8ed282f583a1c
 SHA1 (patch-libao2_ao_sun.c) = ce7042b394b9b8c051597c734b70290c8bf0a8d5
+SHA1 (patch-libmpcodecs_vf__screenshot.c) = a99f81ae7fb3da72e623b0169124e4aa2e20ce37
 SHA1 (patch-libvo_vo__corevideo.h) = c29a24266edb6727dda68a378fac413b5b0ab7ec
 SHA1 (patch-libvo_vo__gif89a.c) = f7ee649bebef4b7f3fd4659613f61667109ee825
 SHA1 (patch-libvo_vo__vdpau.c) = df3de0e079f7047228065bf36390aa3ad01b7f97
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index 59603d8eea5..dfd5a45bd21 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.58 2017/09/27 13:50:27 wiz Exp $
+# $NetBSD: options.mk,v 1.59 2018/04/04 11:02:07 triaxx Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -317,11 +317,11 @@ CONFIGURE_ARGS+=	--disable-xvid
 .endif
 
 .if !empty(PKG_OPTIONS:Mmplayer-ssse3)
-.  if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*)        
-     # needs a recent assembler                         
-.    include "../../devel/binutils/buildlink3.mk"      
-.    include "../../devel/binutils/override-as.mk"      
-.  endif                                               
+.  if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*)
+     # needs a recent assembler
+.    include "../../devel/binutils/buildlink3.mk"
+.    include "../../devel/binutils/override-as.mk"
+.  endif
 .else
 CONFIGURE_ARGS+=	--disable-ssse3
 .endif
diff --git a/multimedia/mplayer-share/patches/patch-libmpcodecs_vf__screenshot.c b/multimedia/mplayer-share/patches/patch-libmpcodecs_vf__screenshot.c
new file mode 100644
index 00000000000..2b18161c6f3
--- /dev/null
+++ b/multimedia/mplayer-share/patches/patch-libmpcodecs_vf__screenshot.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-libmpcodecs_vf__screenshot.c,v 1.1 2018/04/04 11:02:07 triaxx Exp $
+
+Fix crash with screenshot filter.
+From upstream r37875.
+
+--- libmpcodecs/vf_screenshot.c.orig	2016-02-14 20:36:28.000000000 +0000
++++ libmpcodecs/vf_screenshot.c
+@@ -81,6 +81,8 @@ static int config(struct vf_instance *vf
+         vf->priv->avctx->pix_fmt = AV_PIX_FMT_RGB24;
+         vf->priv->avctx->width = d_width;
+         vf->priv->avctx->height = d_height;
++        vf->priv->avctx->time_base.num = 1;
++        vf->priv->avctx->time_base.den = 1;
+         vf->priv->avctx->compression_level = 0;
+         if (avcodec_open2(vf->priv->avctx, avcodec_find_encoder(AV_CODEC_ID_PNG), NULL)) {
+             mp_msg(MSGT_VFILTER, MSGL_FATAL, "Could not open libavcodec PNG encoder\n");