Update to 0.6.0:

Changes

Map ESC to exiting fullscreen.
Run the vo inside its own thread.
Enable the demuxer thread by default.
Prefer the opengl vo over the vdpau one.
Complete profile names in the zsh completion script.
Raise dsound ao buffer size to 200ms and make it configurable.
Bind ctrl+c to quit, so that it works both in the terminal and the player window.
Automatically load playlists without needing --load-unsafe-playlists or --playlist. Unsafe URLs are still rejected (e.g. remote playlists can't load local files).
Remove quvi-format property (which never really worked).
Wait until all Lua scripts are loaded on start.
Use separate threads for input sources (terminal, lirc, joystick) instead of using a central I/O loop.
Complete values for options that take file names in the zsh completion script.
Use libwaio for pipe input on Windows (if you want --input-file to work on Windows you need libwaio as an additional dependency).
Remove the --volstep option (users should change the argument to the "add" function in input.conf instead).
Always show the OSD message when changing volume, gamma, panscan, etc along with the OSD bar.
When changing a property always show it on the OSD (except for "pause" and "fullscreen").
Prefer the libavcodec decoder over libmpg123 for mp3 decoding (ffmpeg/libav support for gapless audio works better for mpv's use-case).
Allow passing number of loops to --loop-file.
Change --keep-open option semantics to not terminate the player when playing or seeking past the end of the file and there's no next file to be played.
Disable the sndio ao by default and prefer other outputs even if it's enabled.

New features

Add new framedrop mode that limits the frequency of new video frames displayed based on the display framerate (this is enabled by default, the old decoder-based mode can be enabled with --framedrop=decoder).
Add --demuxer-readahead-secs option to control the readahead buffer using a duration value.
Add estimated-frame-count and estimated-frame-number properties.
Add --cache-secs option which overrides the value of --demuxer-readahead-secs if the stream cache is active.
Add demuxer-cache-duration and demuxer-cache-idle properties.
Make --cache-file create a temporary file if the string "TMP" is passed instead of a file name.
Add support for Matroska 3D (if a file is marked as 3D using the StereoMode element, an automatic conversion filter is added).
Add --osd-playing-msg option to show a message on the OSD when the playback starts.
Add --media-title option to force the content of the media-title property.
Add --osd-msg1, --osd-msg2 and --osd-msg3 options to override the OSD message for the corresponding OSD level (before only level 3 could be overridden with --osd-status-message).
Add support for digital passthrough in the pulse ao.
Add support for opening DVD and Blu-ray directories directly.
Add --input-x11-keyboard option to control whether keyboard input should be enabled on the X11 window ot not (this is disabled by default when using the libmpv library).

4 files changed, 6 insertions, 112 deletions

diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 901b36dc817..f944ab8e9cf 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2014/10/04 12:49:06 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/10/07 07:31:38 wiz Exp $
 
-DISTNAME=	mpv-0.5.1
-PKGREVISION=	4
+DISTNAME=	mpv-0.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	-https://github.com/mpv-player/mpv/archive/v${PKGVERSION_NOREV}${EXTRACT_SUFX}
 
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index d55ae0c000b..fd57ca98e9d 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2014/09/16 21:44:52 wiz Exp $
+$NetBSD: distinfo,v 1.4 2014/10/07 07:31:38 wiz Exp $
 
-SHA1 (mpv-0.5.1.tar.gz) = a72be602156497545eeb78ee6adfe98720650f27
-RMD160 (mpv-0.5.1.tar.gz) = f341e4647257cc35b902c3fe1787840f82a4052e
-Size (mpv-0.5.1.tar.gz) = 2578630 bytes
-SHA1 (patch-audio_out_ao__oss.c) = 8f28abfad37f4b0391e58ac52ed4c105548bf5e6
-SHA1 (patch-audio_out_push.c) = bde00289d2490fcfe839e6d7c80d65e4f72dd482
+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
diff --git a/multimedia/mpv/patches/patch-audio_out_ao__oss.c b/multimedia/mpv/patches/patch-audio_out_ao__oss.c
deleted file mode 100644
index 05abb287168..00000000000
--- a/multimedia/mpv/patches/patch-audio_out_ao__oss.c
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-audio_out_ao__oss.c,v 1.2 2014/09/16 21:44:52 wiz Exp $
-
-https://github.com/mpv-player/mpv/issues/1080
-
---- audio/out/ao_oss.c.orig	2014-08-26 08:27:40.000000000 +0000
-+++ audio/out/ao_oss.c
-@@ -450,7 +450,7 @@ static void drain(struct ao *ao)
- #endif
- }
- 
--#ifndef SNDCTL_DSP_RESET
-+#if !defined(SNDCTL_DSP_RESET) || defined(__NetBSD__) 
- static void close_device(struct ao *ao)
- {
-     struct priv *p = ao->priv;
-@@ -464,7 +464,7 @@ static void reset(struct ao *ao)
- {
-     struct priv *p = ao->priv;
-     int oss_format;
--#ifdef SNDCTL_DSP_RESET
-+#if defined(SNDCTL_DSP_RESET) && !defined(__NetBSD__)
-     ioctl(p->audio_fd, SNDCTL_DSP_RESET, NULL);
- #else
-     close_device(ao);
-@@ -502,6 +502,9 @@ static int get_space(struct ao *ao)
-     struct priv *p = ao->priv;
-     int playsize = p->outburst;
- 
-+    if (p->audio_fd < 0)
-+    	return p->outburst / ao->sstride;
-+
- #ifdef SNDCTL_DSP_GETOSPACE
-     if (ioctl(p->audio_fd, SNDCTL_DSP_GETOSPACE, &p->zz) != -1) {
-         // calculate exact buffer space:
-@@ -531,8 +534,12 @@ static int get_space(struct ao *ao)
- static void audio_pause(struct ao *ao)
- {
-     struct priv *p = ao->priv;
-+
-+    if (p->audio_fd < 0)
-+	return;
-+
-     p->prepause_space = get_space(ao) * ao->sstride;
--#ifdef SNDCTL_DSP_RESET
-+#if defined(SNDCTL_DSP_RESET) && !defined(__NetBSD__)
-     ioctl(p->audio_fd, SNDCTL_DSP_RESET, NULL);
- #else
-     close_device(ao);
-@@ -552,7 +559,10 @@ static int play(struct ao *ao, void **da
-         len /= p->outburst;
-         len *= p->outburst;
-     }
--    len = write(p->audio_fd, data[0], len);
-+
-+    if (p->audio_fd >= 0)
-+        len = write(p->audio_fd, data[0], len);
-+
-     return len / ao->sstride;
- }
- 
-@@ -560,9 +570,15 @@ static int play(struct ao *ao, void **da
- static void audio_resume(struct ao *ao)
- {
-     struct priv *p = ao->priv;
--#ifndef SNDCTL_DSP_RESET
-+#if !defined (SNDCTL_DSP_RESET) || defined(__NetBSD__)
-     reset(ao);
- #endif
-+    if (p->audio_fd < 0) {
-+	ao->untimed = true;
-+	return;
-+    } else
-+	ao->untimed=false;
-+
-     int fillframes = get_space(ao) - p->prepause_space / ao->sstride;
-     if (fillframes > 0)
-         ao_play_silence(ao, fillframes);
-@@ -572,6 +588,10 @@ static void audio_resume(struct ao *ao)
- static float get_delay(struct ao *ao)
- {
-     struct priv *p = ao->priv;
-+
-+    if (p->audio_fd < 0)
-+	return 0.0250;
-+
-     /* Calculate how many bytes/second is sent out */
-     if (p->audio_delay_method == 2) {
- #ifdef SNDCTL_DSP_GETODELAY
diff --git a/multimedia/mpv/patches/patch-audio_out_push.c b/multimedia/mpv/patches/patch-audio_out_push.c
deleted file mode 100644
index aa6a51441f9..00000000000
--- a/multimedia/mpv/patches/patch-audio_out_push.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-audio_out_push.c,v 1.1 2014/09/15 17:31:18 wiz Exp $
-
-https://github.com/mpv-player/mpv/issues/1080
-
---- audio/out/push.c.orig	2014-08-26 08:27:40.000000000 +0000
-+++ audio/out/push.c
-@@ -296,7 +296,7 @@ static void *playthread(void *arg)
-         // Request new data from decoder if buffer goes below "full".
-         // Allow a small margin of missing data for AOs that use timeouts.
-         double margin = ao->driver->wait ? 0 : ao->device_buffer / 8;
--        if (!p->buffers_full && unlocked_get_space(ao) > margin) {
-+        if (!p->paused && !p->buffers_full && unlocked_get_space(ao) > margin) {
-             if (!p->requested_data)
-                 mp_input_wakeup(ao->input_ctx);
-             p->requested_data = true;