1 files changed, 42 insertions, 25 deletions
diff --git a/multimedia/mpv/mpv.SlackBuild b/multimedia/mpv/mpv.SlackBuild
index f679709e54..028f18343b 100644
--- a/multimedia/mpv/mpv.SlackBuild
+++ b/multimedia/mpv/mpv.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # 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
+# Copyright 2020-2023 Christoph Willing  Brisbane Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,11 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=mpv
-VERSION=${VERSION:-0.32.0}
-WAF_VERSION=${WAF_VERSION:-2.0.20}
+VERSION=${VERSION:-0.37.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -38,13 +40,15 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# The SLKFLAGS aren't currently used. They do no harm and can
-#   be left as a placeholder in case they are ever needed.
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -66,9 +70,14 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cp $CWD/waf-$WAF_VERSION $PRGNAM-$VERSION/waf
-chmod +x $PRGNAM-$VERSION/waf
 cd $PRGNAM-$VERSION
+
+# Needed for 15.0's older meson but disables RPI
+if [ "$(meson --version)" = "0.59.4" ]; then
+  echo "Using meson-0.59.4 for 15.0"
+  patch -p0 < $CWD/use_older_meson.diff
+fi
+
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -79,28 +88,34 @@ find -L . \
 DOCS="Copyright LICENSE.GPL LICENSE.LGPL README.md RELEASE_NOTES VERSION"
 MANUAL="DOCS/*.md DOCS/*.rst DOCS/*.txt"
 
+pipewire="-Dpipewire=disabled" ; [ "${USE_PIPEWIRE:-no}" != "no" ] && pipewire="-Dpipewire=auto"
+
 # This leaves an opening for additional build options.
+# See `meson configure` to see what's available.
 BUILD_OPTS=${BUILD_OPTS:-""}
 
-PKG_CONFIG_PATH="/usr/lib${LIBDIRSUFFIX}/ffmpeg4/pkgconfig"
-export PKG_CONFIG_PATH
+PYVER=$(python3 -c 'import sys; print("%d.%d" % sys.version_info[:2])')
+export PYTHONPATH=/opt/python$PYVER/site-packages/
 
-# Setting CFLAGS and CXXFLAGS breaks configure.
-./waf configure \
+CFLAGS="$SLKCFLAGS -ldl" \
+CXXFLAGS="$SLKCFLAGS" \
+meson \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --confdir=/etc/$PRGNAM \
+  --sysconfdir=/etc \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --enable-libmpv-shared \
-  --enable-html-build \
-  --enable-dvdnav \
-  --enable-cdda \
-  --enable-dvbin \
-  $BUILD_OPTS
-
-./waf build
-./waf --destdir=$PKG install
+  -Dbuildtype=release \
+  -Dmanpage-build=enabled \
+  -Dlibmpv=true \
+  -Dhtml-build=enabled \
+  -Dcdda=enabled \
+  -Ddvdnav=enabled \
+  -Ddvbin=enabled \
+  $pipewire \
+  $BUILD_OPTS \
+  . build
+
+DESTDIR=$PKG ${NINJA:=ninja} -C build -v install
 
 for f in $PKG/etc/mpv/*.conf ; do
   mv $f{,.new}
@@ -123,6 +138,8 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/manual
 for f in $MANUAL; do
   cp -a $f $PKG/usr/doc/$PRGNAM-$VERSION/manual/
 done
+cp -a $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -130,4 +147,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE