multimedia/mpc-qt:

- Add patch to fix mpcwidget crash on mpv 0.26.0

multimedia/mpv:

- Update mpv to 0.26.0
- Update waf to 1.9.8 using the same waf version as bootstrap.py
- Update ffmpeg version required to 3.3
- Drop unnecessary CONFIGURE_ARGS options
- Fix option helpers
- Update WWW in pkg-descr

Changelog: https://github.com/mpv-player/mpv/releases/tag/v0.26.0

Reviewed by:	jbeich
Approved by:	jbeich (mpc-qt, maintainer)
Differential Revision:	https://reviews.freebsd.org/D11655

4 files changed, 14 insertions, 20 deletions

diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile
index f731bd1f21b0..ada0b0422293 100644
--- a/multimedia/mpv/Makefile
+++ b/multimedia/mpv/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mpv
-PORTVERSION=	0.25.0
+PORTVERSION=	0.26.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio
 
@@ -14,13 +13,13 @@ COMMENT=	Free and open-source general-purpose video player
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	ffmpeg>=3.2.2,1:multimedia/ffmpeg
+BUILD_DEPENDS=	ffmpeg>=3.3,1:multimedia/ffmpeg
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mpv-player
 # Keep in sync with bootstrap.py to avoid regressions
-GH_TUPLE=	waf-project:waf:waf-1.8.12:waf
+GH_TUPLE=	waf-project:waf:waf-1.9.8:waf
 
 WAF_CMD=	${WRKSRC_waf}/waf-light
 
@@ -33,15 +32,12 @@ CONFIGURE_ARGS=	--docdir="${EXAMPLESDIR}" \
 		--htmldir="${DOCSDIR}/html" \
 		--mandir="${MANPREFIX}/man" \
 		--disable-debug-build \
-		--disable-d3d-hwaccel \
 		--disable-optimize \
 		--disable-pdf \
 		--disable-rubberband \
 		--disable-vaapi-wayland \
 		--disable-vapoursynth \
 		--disable-vapoursynth-lazy \
-		--disable-videotoolbox-hwaccel \
-		--disable-videotoolbox-gl \
 		--disable-wayland \
 		--enable-libmpv-shared
 
@@ -77,18 +73,16 @@ CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
 CACA_CONFIGURE_OFF=		--disable-caca
 
 CDIO_LIB_DEPENDS=		libcdio_paranoia.so:sysutils/libcdio-paranoia
-CDIO_CONFIGURE_OFF=		--disable-cdda
+CDIO_CONFIGURE_ON=		--enable-cdda
 
 DOCS_BUILD_DEPENDS=		rst2html:textproc/py-docutils
 DOCS_CONFIGURE_ON=		--enable-html
 
 DVDNAV_LIB_DEPENDS=		libdvdnav.so:multimedia/libdvdnav
 DVDNAV_CONFIGURE_ON=		--enable-dvdnav
-DVDNAV_CONFIGURE_OFF=		--disable-dvdnav
 
 DVDREAD_LIB_DEPENDS=		libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_ON=		--enable-dvdread
-DVDREAD_CONFIGURE_OFF=		--disable-dvdread
 
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CONFIGURE_OFF=		--disable-jack
@@ -97,6 +91,7 @@ LCMS2_LIB_DEPENDS=		liblcms2.so:graphics/lcms2
 LCMS2_CONFIGURE_OFF=		--disable-lcms2
 
 LIBBLURAY_LIB_DEPENDS=		libbluray.so:multimedia/libbluray
+LIBBLURAY_CONFIGURE_ON=		--enable-libbluray
 LIBBLURAY_CONFIGURE_OFF=	--disable-libbluray
 
 LUAJIT_LIB_DEPENDS=		libluajit-5.1.so:lang/luajit
@@ -116,14 +111,13 @@ PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
 
 SDL_USE=			SDL=sdl2
 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_USES=			samba:lib
-SMB_CONFIGURE_OFF=		--disable-libsmbclient
+SMB_CONFIGURE_ON=		--enable-libsmbclient
 
 TEST_BUILD_DEPENDS=		cmocka>=1.1.0:sysutils/cmocka
 TEST_CONFIGURE_ON=		--enable-test
@@ -134,7 +128,7 @@ UCHARDET_CONFIGURE_OFF=		--disable-uchardet
 
 V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
-V4L_CONFIGURE_OFF=		--disable-tv-v4l2
+V4L_CONFIGURE_ON=		--enable-tv
 
 VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva
 VAAPI_CONFIGURE_OFF=		--disable-vaapi
diff --git a/multimedia/mpv/distinfo b/multimedia/mpv/distinfo
index 34ce12c8b6d8..7f0dfbdda049 100644
--- a/multimedia/mpv/distinfo
+++ b/multimedia/mpv/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1493205351
-SHA256 (mpv-player-mpv-v0.25.0_GH0.tar.gz) = 07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce
-SIZE (mpv-player-mpv-v0.25.0_GH0.tar.gz) = 2874584
-SHA256 (waf-project-waf-waf-1.8.12_GH0.tar.gz) = 5ba55fef2811a54c86c99270f3a43e6327f927b182c6e0af70647dfe7ee2973f
-SIZE (waf-project-waf-waf-1.8.12_GH0.tar.gz) = 1349077
+TIMESTAMP = 1500466075
+SHA256 (mpv-player-mpv-v0.26.0_GH0.tar.gz) = daf3ef358d5f260f2269f7caabce27f446c291457ec330077152127133b71b46
+SIZE (mpv-player-mpv-v0.26.0_GH0.tar.gz) = 2916212
+SHA256 (waf-project-waf-waf-1.9.8_GH0.tar.gz) = b487efec83ea33cf8df0495cc5730e245f8dc8784e68aebf3dcf07c6712c5913
+SIZE (waf-project-waf-waf-1.9.8_GH0.tar.gz) = 628874
diff --git a/multimedia/mpv/pkg-descr b/multimedia/mpv/pkg-descr
index c4d74dd48248..a94509b02772 100644
--- a/multimedia/mpv/pkg-descr
+++ b/multimedia/mpv/pkg-descr
@@ -4,4 +4,4 @@ subtitle types. Special input URL types are available to read input from
 a variety of sources other than disk files. Depending on platform, a variety of
 different video and audio output methods are supported.
 
-WWW: http://mpv.io/
+WWW: https://mpv.io
diff --git a/multimedia/mpv/pkg-plist b/multimedia/mpv/pkg-plist
index 5ca919072554..d7650de01c1d 100644
--- a/multimedia/mpv/pkg-plist
+++ b/multimedia/mpv/pkg-plist
@@ -6,7 +6,7 @@ include/mpv/qthelper.hpp
 include/mpv/stream_cb.h
 lib/libmpv.so
 lib/libmpv.so.1
-lib/libmpv.so.1.24.0
+lib/libmpv.so.1.25.0
 libdata/pkgconfig/mpv.pc
 %%MANPAGES%%man/man1/mpv.1.gz
 share/applications/mpv.desktop