multimedia/mpv: update to 0.33.0

- Add SIXEL option after https://github.com/mpv-player/mpv/commit/19913921eb9e
- Enable OPENAL option after https://github.com/mpv-player/mpv/commit/bca917f6d2c5
- Drop ASS option after https://github.com/mpv-player/mpv/commit/0b9ed9c2744a
- Drop SNDIO option after https://github.com/mpv-player/mpv/commit/71d218eae4b4
- Drop USE_GL=gl after https://github.com/mpv-player/mpv/commit/7831e5223879
- Drop sys/consio.h patch after https://github.com/mpv-player/mpv/commit/427709575d0a
- Bump bundled waf after https://github.com/mpv-player/mpv/commit/3248b073ce59
- Adjust WAYLAND dependency after https://github.com/mpv-player/mpv/commit/007ace76e2d0

Changes:	https://github.com/mpv-player/mpv/releases/tag/v0.33.0
Reported by:	GitHub (watch releases)

3 files changed, 20 insertions, 27 deletions

diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index 065999c91767..13408b7a740b 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -3,8 +3,7 @@
 
 PORTNAME=	mpv
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.32.0
-PORTREVISION=	5
+DISTVERSION=	0.33.0
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://waf.io/:waf
@@ -17,7 +16,8 @@ LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	ffmpeg>=4.0.2,1:multimedia/ffmpeg
-LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
+LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
+		libass.so:multimedia/libass
 
 USES=		compiler:c11 desktop-file-utils iconv jpeg localbase:ldflags \
 		pkgconfig python:build tar:bz2 waf
@@ -28,7 +28,7 @@ GH_ACCOUNT=	mpv-player
 
 # Keep in sync with bootstrap.py to avoid regressions
 WAF_CMD=	${WRKDIR}/${WAF_RELEASE}/waf-light
-WAF_RELEASE=	waf-2.0.9
+WAF_RELEASE=	waf-2.0.20
 
 CONFIGURE_ENV=	BIN_PYTHON="${PYTHON_CMD}"
 CONFIGURE_ARGS=	--docdir="${EXAMPLESDIR}" \
@@ -42,18 +42,18 @@ CONFIGURE_ARGS=	--docdir="${EXAMPLESDIR}" \
 		--disable-vapoursynth \
 		--enable-libmpv-shared
 
-OPTIONS_DEFINE=		ARCHIVE ASS DOCS LCMS2 LUAJIT MANPAGES TEST UCHARDET EXAMPLES ZIMG
-OPTIONS_DEFAULT=	ARCHIVE ASS DVDNAV MANPAGES OPENGL UCHARDET \
+OPTIONS_DEFINE=		ARCHIVE DOCS LCMS2 LUAJIT MANPAGES TEST UCHARDET EXAMPLES ZIMG
+OPTIONS_DEFAULT=	ARCHIVE DVDNAV MANPAGES OPENAL OPENGL UCHARDET \
 			V4L VAAPI VDPAU VULKAN WAYLAND X11 YTDL
 OPTIONS_GROUP=		IN VO AO
 OPTIONS_GROUP_IN=	CDIO DVDNAV LIBBLURAY V4L YTDL SMB
-OPTIONS_GROUP_VO=	CACA OPENGL VAAPI VDPAU VULKAN WAYLAND X11
-OPTIONS_GROUP_AO=	ALSA JACK OPENAL PULSEAUDIO SDL SNDIO
+OPTIONS_GROUP_VO=	CACA OPENGL SIXEL VAAPI VDPAU VULKAN WAYLAND X11
+OPTIONS_GROUP_AO=	ALSA JACK OPENAL PULSEAUDIO SDL
 OPTIONS_SUB=		yes
 
-ASS_DESC=		ASS/SSA subtitle and OSD rendering
 DVDNAV_DESC=		DVD menu navigation
 LUAJIT_DESC=		Use LuaJIT instead of Lua scripting language support
+SIXEL_DESC=		Sixel graphics support
 UCHARDET_DESC=		Guess subtitle encoding via uchardet
 VULKAN_DESC=		Vulkan output support
 WAYLAND_DESC=		Wayland (graphics) support
@@ -69,9 +69,6 @@ ALSA_CONFIGURE_OFF=		--disable-alsa
 ARCHIVE_USES=			libarchive
 ARCHIVE_CONFIGURE_ON=		--enable-libarchive
 
-ASS_LIB_DEPENDS=		libass.so:multimedia/libass
-ASS_CONFIGURE_OFF=		--disable-libass
-
 CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
 CACA_CONFIGURE_OFF=		--disable-caca
 
@@ -109,7 +106,7 @@ OPENAL_LDFLAGS=			${_OPENAL_LDFLAGS_${ARCH}}
 _OPENAL_LDFLAGS_i386=		-Wl,-znotext
 
 OPENGL_USES=			gl
-OPENGL_USE=			GL=egl,gbm,gl
+OPENGL_USE=			GL=egl,gbm
 OPENGL_CONFIGURE_OFF=		--disable-gl
 OPENGL_IMPLIES=			X11
 
@@ -120,9 +117,8 @@ SDL_USES=			sdl
 SDL_USE=			SDL=sdl2
 SDL_CONFIGURE_ON=		--enable-sdl2
 
-SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
-SNDIO_CONFIGURE_ON=		--enable-sndio
-SNDIO_CONFIGURE_OFF=		--disable-sndio
+SIXEL_LIB_DEPENDS=		libsixel.so:graphics/libsixel
+SIXEL_CONFIGURE_ON=		--enable-sixel
 
 SMB_USES=			samba:lib
 SMB_CONFIGURE_ON=		--enable-libsmbclient
@@ -148,7 +144,7 @@ VULKAN_CONFIGURE_OFF=		--disable-vulkan --disable-libplacebo
 VULKAN_IMPLIES=			X11
 
 WAYLAND_BUILD_DEPENDS=		wayland-protocols>=1.14:graphics/wayland-protocols \
-				${LOCALBASE}/include/linux/input.h:devel/evdev-proto
+				${LOCALBASE}/include/linux/input-event-codes.h:devel/evdev-proto
 WAYLAND_LIB_DEPENDS=		libwayland-client.so:graphics/wayland \
 				libwayland-cursor.so:graphics/wayland \
 				libxkbcommon.so:x11/libxkbcommon
@@ -174,9 +170,6 @@ CONFIGURE_ARGS+=	--disable-vaapi-wayland
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|sys/vt.h|sys/consio.h|g' \
-		${WRKSRC}/video/out/drm_common.c \
-		${WRKSRC}/wscript
 	@${REINPLACE_CMD} -e 's|/pkgconfig/mpv.pc|data/pkgconfig/mpv.pc|g' \
 		${WRKSRC}/wscript_build.py
 
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index a2fdf93855c7..55f5f4a4f6ba 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1580070714
-SHA256 (waf-2.0.9.tar.bz2) = cb40489da7a78384dbc8281e6bc3e88005885a5d07de5bf75c29514e05830277
-SIZE (waf-2.0.9.tar.bz2) = 645737
-SHA256 (mpv-player-mpv-v0.32.0_GH0.tar.gz) = 9163f64832226d22e24bbc4874ebd6ac02372cd717bef15c28a0aa858c5fe592
-SIZE (mpv-player-mpv-v0.32.0_GH0.tar.gz) = 3148730
+TIMESTAMP = 1606067188
+SHA256 (waf-2.0.20.tar.bz2) = cce635c2d1a0f93b4f5b811e0452a35b8066e8ccd78632447f5be24c4c3f1a63
+SIZE (waf-2.0.20.tar.bz2) = 682619
+SHA256 (mpv-player-mpv-v0.33.0_GH0.tar.gz) = f1b9baf5dc2eeaf376597c28a6281facf6ed98ff3d567e3955c95bf2459520b4
+SIZE (mpv-player-mpv-v0.33.0_GH0.tar.gz) = 3259387
diff --git a/multimedia/mpv/pkg-plist b/multimedia/mpv/pkg-plist
index b563afdf8fd0..7d8ff1f18df1 100644
--- a/multimedia/mpv/pkg-plist
+++ b/multimedia/mpv/pkg-plist
@@ -2,17 +2,17 @@ bin/mpv
 %%ETCDIR%%/encoding-profiles.conf
 include/mpv/client.h
 include/mpv/opengl_cb.h
-include/mpv/qthelper.hpp
 include/mpv/render.h
 include/mpv/render_gl.h
 include/mpv/stream_cb.h
 lib/libmpv.so
 lib/libmpv.so.1
-lib/libmpv.so.1.107.0
+lib/libmpv.so.1.109.0
 libdata/pkgconfig/mpv.pc
 %%MANPAGES%%man/man1/mpv.1.gz
 share/applications/mpv.desktop
 share/bash-completion/completions/mpv
+share/icons/hicolor/128x128/apps/mpv.png
 share/icons/hicolor/16x16/apps/mpv.png
 share/icons/hicolor/32x32/apps/mpv.png
 share/icons/hicolor/64x64/apps/mpv.png