Index: head/multimedia/mpv/Makefile
===================================================================
--- head/multimedia/mpv/Makefile
+++ head/multimedia/mpv/Makefile
@@ -2,11 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	mpv
-PORTVERSION=	0.18.1
+PORTVERSION=	0.19.0
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 
+PATCH_SITES=	https://github.com/mpv-player/mpv/commit/
+PATCHFILES=	12e251c29e1b.patch:-p1
+
 MAINTAINER=	cpm@FreeBSD.org
 COMMENT=	Free and open-source general-purpose video player
 
@@ -14,12 +17,13 @@
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
-BUILD_DEPENDS=	rst2man:textproc/py-docutils
+BUILD_DEPENDS=	rst2man:textproc/py-docutils \
+		rst2html:textproc/py-docutils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mpv-player waf-project:waf
 GH_PROJECT=	waf:waf
-GH_TAGNAME=	waf-1.9.1:waf
+GH_TAGNAME=	waf-1.9.2:waf
 
 WAF_CMD=	${WRKSRC_waf}/waf-light
 
@@ -27,6 +31,7 @@
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--docdir=${EXAMPLESDIR} \
+		--htmldir=${DOCSDIR}/html \
 		--mandir=${MANPREFIX}/man \
 		--prefix=${PREFIX} \
 		--disable-debug-build \
@@ -40,7 +45,8 @@
 		--disable-videotoolbox-hwaccel \
 		--disable-videotoolbox-gl \
 		--disable-wayland \
-		--enable-libmpv-shared
+		--enable-libmpv-shared \
+		--enable-html
 
 OPTIONS_DEFINE=		ASS DOCS ENCA LCMS2 \
 			LIBGUESS LUAJIT UCHARDET ZSH
@@ -49,7 +55,7 @@
 OPTIONS_GROUP=		IN VO AO
 OPTIONS_GROUP_IN=	CDIO DVDREAD DVDNAV LIBBLURAY V4L YTDL SMB
 OPTIONS_GROUP_VO=	CACA OPENGL VAAPI VDPAU X11 XINERAMA
-OPTIONS_GROUP_AO=	ALSA JACK PULSEAUDIO SDL
+OPTIONS_GROUP_AO=	ALSA JACK PULSEAUDIO SDL SNDIO
 OPTIONS_SUB=		yes
 
 ASS_DESC=	ASS/SSA subtitle and OSD rendering
@@ -113,6 +119,10 @@
 SDL_CONFIGURE_ON=		--enable-sdl2
 SDL_CONFIGURE_OFF=		--disable-sdl2
 
+SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
+SNDIO_CONFIGURE_ON=		--enable-sndio
+SNDIO_CONFIGURE_OFF=		--disable-sndio
+
 SMB_LIB_DEPENDS=		libsmbclient.so:net/samba-libsmbclient
 SMB_CONFIGURE_OFF=		--disable-libsmbclient
 
Index: head/multimedia/mpv/distinfo
===================================================================
--- head/multimedia/mpv/distinfo
+++ head/multimedia/mpv/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1468153527
-SHA256 (mpv-player-mpv-v0.18.1_GH0.tar.gz) = e413d57fec4ad43b9f9b848f38d13fb921313fc9a4a64bf1e906c8d0f7a46329
-SIZE (mpv-player-mpv-v0.18.1_GH0.tar.gz) = 2763392
-SHA256 (waf-project-waf-waf-1.9.1_GH0.tar.gz) = c1f8f6db0fa73c55bb603961e7945ecd51925921bc68fb7d567506f0aabd248a
-SIZE (waf-project-waf-waf-1.9.1_GH0.tar.gz) = 1389087
+TIMESTAMP = 1471395336
+SHA256 (mpv-player-mpv-v0.19.0_GH0.tar.gz) = 3df5811942cd1d71f48eb4720092fdafec11885bf6dd6d1d3e6413f32e5d67e2
+SIZE (mpv-player-mpv-v0.19.0_GH0.tar.gz) = 2770618
+SHA256 (waf-project-waf-waf-1.9.2_GH0.tar.gz) = 41cb585e3f4434b70644d258bdadfd14225623a8fdf1afad36fa5549b1ee0222
+SIZE (waf-project-waf-waf-1.9.2_GH0.tar.gz) = 627217
+SHA256 (12e251c29e1b.patch) = 9b17b7fbbd479985ff41afe06b2840c5e071a1a190215201a88969bede83e133
+SIZE (12e251c29e1b.patch) = 1399
Index: head/multimedia/mpv/pkg-plist
===================================================================
--- head/multimedia/mpv/pkg-plist
+++ head/multimedia/mpv/pkg-plist
@@ -3,9 +3,10 @@
 include/mpv/client.h
 include/mpv/opengl_cb.h
 include/mpv/qthelper.hpp
+include/mpv/stream_cb.h
 lib/libmpv.so
 lib/libmpv.so.1
-lib/libmpv.so.1.21.0
+lib/libmpv.so.1.22.0
 libdata/pkgconfig/mpv.pc
 man/man1/mpv.1.gz
 share/applications/mpv.desktop
@@ -14,6 +15,7 @@
 share/icons/hicolor/64x64/apps/mpv.png
 share/icons/hicolor/scalable/apps/mpv.svg
 share/icons/hicolor/symbolic/apps/mpv-symbolic.svg
+%%PORTDOCS%%%%DOCSDIR%%/html/mpv.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/input.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mplayer-input.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mpv.conf