Update mpv to 0.6.1

===================

pkgsrc changes:
---------------

- Add quvi option to support youtube-like sites directly from mpv.
Disabled by default.

upstream changes:
-----------------

Release 0.6.1

Changes

    Don't show message on "osd" command by default (this essentially
	 reverts a change introduced in the last release).
    Add an alternative input configuration that reverts the key binding
	 changes introduced by previous releases
	 (see etc/restore-old-bindings.conf in the sources).
    Automatically install example input configuration files.

Bug fixes

    Fix stream languages with Bluray
    Don't try to create surfaces of size 0 in the VDPAU vo.
    Don't print audio/video init failure message twice.
    Fix playback on the root window on X11 (i.e. when using --wid=0).
    Fix the autodetection of the input format in the vf_stereo3d filter when
	 mpv is built against libav (this makes --video-stereo-mode work with
	 libav as well).
    Fix compilation with PulseAudio 1.0.
    Fix compilation with clang.
    Try harder to decode cover art picture only once.
    Fix cursor autohide (--cursor-autohide) with audio-only files on file
	 change (e.g. when skipping to the next playlist file).

4 files changed, 24 insertions, 10 deletions

diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index ed19973809e..e3e2cc21102 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2014/10/19 22:27:47 alnsn Exp $
+# $NetBSD: Makefile,v 1.10 2014/10/22 19:42:48 gls Exp $
 
-DISTNAME=	mpv-0.6.0
-PKGREVISION=	1
+DISTNAME=	mpv-0.6.1
 CATEGORIES=	multimedia
 MASTER_SITES=	-https://github.com/mpv-player/mpv/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
diff --git a/multimedia/mpv/PLIST b/multimedia/mpv/PLIST
index bb90879f1c2..30f1d8d671a 100644
--- a/multimedia/mpv/PLIST
+++ b/multimedia/mpv/PLIST
@@ -1,8 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1 2014/09/08 11:38:17 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/10/22 19:42:48 gls Exp $
 bin/mpv
 man/man1/mpv.1
 share/applications/mpv.desktop
+share/doc/mpv/example.conf
+share/doc/mpv/input.conf
+share/doc/mpv/mplayer-input.conf
+share/doc/mpv/restore-old-bindings.conf
 share/examples/mpv/encoding-profiles.conf
 share/icons/hicolor/16x16/apps/mpv.png
 share/icons/hicolor/32x32/apps/mpv.png
 share/icons/hicolor/64x64/apps/mpv.png
+@pkgdir etc/mpv
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index 12480b14e21..fa01d5b12eb 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2014/10/12 16:00:30 wiz Exp $
+$NetBSD: distinfo,v 1.6 2014/10/22 19:42:48 gls Exp $
 
-SHA1 (mpv-0.6.0.tar.gz) = 60188f045ab177106b10443cf592184e5a4efd59
-RMD160 (mpv-0.6.0.tar.gz) = f273e8751bfe290ab6e4c3d234c46f0ccd44a6e7
-Size (mpv-0.6.0.tar.gz) = 2598489 bytes
+SHA1 (mpv-0.6.1.tar.gz) = 5d66e5fe6c4e3c84049e9516fa31eb1d6dee13f7
+RMD160 (mpv-0.6.1.tar.gz) = 9a1ea0301179abee90e98b794c637dd32915062c
+Size (mpv-0.6.1.tar.gz) = 2599417 bytes
 SHA1 (patch-waftools_generators_headers.py) = 4309fadacf3406318c342eb5e925178a8ea88ff9
 SHA1 (patch-waftools_waf__customizations.py) = 54d5d4dc7b58b4c3e4e71724276244a2f00413a6
diff --git a/multimedia/mpv/options.mk b/multimedia/mpv/options.mk
index 3d49d4da8a4..b7f306e22cc 100644
--- a/multimedia/mpv/options.mk
+++ b/multimedia/mpv/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.2 2014/09/17 12:07:18 nat Exp $
+# $NetBSD: options.mk,v 1.3 2014/10/22 19:42:48 gls Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mpv
-PKG_SUPPORTED_OPTIONS=	caca lua pulseaudio sdl v4l2
+PKG_SUPPORTED_OPTIONS=	caca lua pulseaudio sdl v4l2 quvi
 PKG_SUGGESTED_OPTIONS=	lua
 
 .include "../../mk/bsd.options.mk"
@@ -54,3 +54,13 @@ WAF_CONFIGURE_ARGS+=	--enable-libv4l2
 .else
 WAF_CONFIGURE_ARGS+=	--disable-libv4l2
 .endif
+
+###
+### Quvi (Youtube) support
+###
+.if !empty(PKG_OPTIONS:Mquvi)
+WAF_CONFIGURE_ARGS+=    --enable-libquvi4
+.include "../../net/libquvi/buildlink3.mk"
+.else
+WAF_CONFIGURE_ARGS+=    --disable-libquvi4
+.endif