multimedia/mpv: Updated for version 0.32.0. New maintainer

Signed-off-by: Christoph Willing <chris.willing@linux.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 37 insertions, 41 deletions

diff --git a/multimedia/mpv/README b/multimedia/mpv/README
index 3ae161a662cb5..b8bc77a0f1fa8 100644
--- a/multimedia/mpv/README
+++ b/multimedia/mpv/README
@@ -1,40 +1,28 @@
-mpv
-===
-
 mpv is a movie player based on MPlayer and mplayer2. It shares some
 features with the former projects while introducing many more. It
 supports a wide variety of video file formats, audio and video codecs,
 and subtitle types.
 
-optional: docutils, jack, libbluray, libdvdnav,
-          libfdk-aac, libuchardet, OpenAL, lua, mujs, oss, rubberband,
-          SDL2, wayland, youtube-dl
-
-If docutils is not installed, the man pages will not be built/installed.
-This is the reason I have included docutils in both the `required` and
-`optional` lists. If you don't consider the man pages required, then the
-docutils package is optional, too. Building the man pages is
-recommended.
-
-If lua is not installed, much functionality will be lost. This is the
-reason I have included lua in both the `required` and `optional` lists.
-If you don't consider the functionality lua gives required, then the
-lua package is optional, too. Building with lua support is recommended.
+This SlackBuild provides support for most useful optional features.
+Some other optional features may be enabled by having the relevant
+packages installed; they will be autodetected at build time.
+These include:
+	jack, libuchardet, OpenAL, oss, rubberband, SDL2, wayland,
+	cudatoolkit & nv-codec-headers
 
-Dependencies are autodetected. Some optional dependencies are disabled
-by default and may be enabled (see BUILD_OPTS). Optional dependencies
-that are enabled by default may be disabled (see BUILD_OPTS).
+Please note that CUDA based hardware acceleration requires mpv to be
+built with both the cudatoolkit and nv-codec-headers packages installed.
 
-BUILD_OPTS:
-To override the default for build options, set the shell variable
-BUILD_OPTS prior to or at build time. For example, to enable cdda and
-openal, which are disabled by default, and to build with four jobs in
-parallel, you could use the following:
+Most dependencies are autodetected. Some optional dependencies are disabled
+by default and may be enabled via the BUILD_OPTS environment variable. Optional
+dependencies that are enabled by default may be disabled in the same way.
 
-~# BUILD_OPTS="--enable-cdda --enable-openal --jobs 4" sh mpv.SlackBuild
+For example, to enable support for Samba and SDL2 (both disabled by default)
+as well as to disable javascript support (normally autodetected),
+you could run:
 
-The following list is meant as a note to myself of build options or
-optional dependencies currently unavailable via full Slackware
-installation and from SBo:
+BUILD_OPTS="--enable-libsmbclient --enable-sdl2 --disable-javascript" sh mpv.SlackBuild
 
-vapoursynth, rsound
+Runtime support for youtube videos requires installation of youtube-dl
+(available from SBo) to be installed. Watch with something like:
+	mpv https://www.youtube.com/watch?v=mAFMJ1LnQu8
diff --git a/multimedia/mpv/mpv.SlackBuild b/multimedia/mpv/mpv.SlackBuild
index f4957c9a3603a..f679709e54cdb 100644
--- a/multimedia/mpv/mpv.SlackBuild
+++ b/multimedia/mpv/mpv.SlackBuild
@@ -3,6 +3,8 @@
 # Slackware build script for mpv
 
 # Copyright 2015 John Vogel Corning, NY USA
+# Copyright 2017,2018 (versions 0.25.0-0.29.1) Andreas Guldstrand
+# Copyright 2020 Christoph Willing  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +25,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mpv
-VERSION=${VERSION:-0.29.1}
+VERSION=${VERSION:-0.32.0}
+WAF_VERSION=${WAF_VERSION:-2.0.20}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,7 +66,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cp $CWD/waf-2.0.9 $PRGNAM-$VERSION/waf
+cp $CWD/waf-$WAF_VERSION $PRGNAM-$VERSION/waf
 chmod +x $PRGNAM-$VERSION/waf
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -76,7 +79,7 @@ find -L . \
 DOCS="Copyright LICENSE.GPL LICENSE.LGPL README.md RELEASE_NOTES VERSION"
 MANUAL="DOCS/*.md DOCS/*.rst DOCS/*.txt"
 
-# This leaves an opening for build options.
+# This leaves an opening for additional build options.
 BUILD_OPTS=${BUILD_OPTS:-""}
 
 PKG_CONFIG_PATH="/usr/lib${LIBDIRSUFFIX}/ffmpeg4/pkgconfig"
@@ -89,6 +92,11 @@ export PKG_CONFIG_PATH
   --confdir=/etc/$PRGNAM \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-libmpv-shared \
+  --enable-html-build \
+  --enable-dvdnav \
+  --enable-cdda \
+  --enable-dvbin \
   $BUILD_OPTS
 
 ./waf build
diff --git a/multimedia/mpv/mpv.info b/multimedia/mpv/mpv.info
index d811d661fcb96..8c02b79f17d79 100644
--- a/multimedia/mpv/mpv.info
+++ b/multimedia/mpv/mpv.info
@@ -1,12 +1,12 @@
 PRGNAM="mpv"
-VERSION="0.29.1"
+VERSION="0.32.0"
 HOMEPAGE="https://mpv.io/"
-DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.29.1/mpv-0.29.1.tar.gz \
-          https://waf.io/waf-2.0.9"
-MD5SUM="2cd070c6aed980786177b7cb5b73664b \
-        3bc28bcd4868999798a6d2675211e23f"
+DOWNLOAD="https://github.com/mpv-player/mpv/archive/v0.32.0/mpv-0.32.0.tar.gz \
+          https://waf.io/waf-2.0.20"
+MD5SUM="1f7d23afe7a8639dedc9f7beef4e90d7 \
+        eb0cd320fc8838971cfa735ad78f6de8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="docutils ffmpeg4 lua"
-MAINTAINER="Andreas Guldstrand"
-EMAIL="andreas.guldstrand@gmail.com"
+REQUIRES="docutils ffmpeg4 libbluray libplacebo lua mujs "
+MAINTAINER="Christoph Willing"
+EMAIL="chris.willing@linux.com"