mpv: switched to current master checkout to fix build/runtime issues

mpv/.footprint

@@ -1,28 +1,21 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/mpv/
+-rw-r--r--	root/root	etc/mpv/encoding-profiles.conf
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/mpv
-drwxr-xr-x	root/root	usr/etc/
-drwxr-xr-x	root/root	usr/etc/mpv/
--rw-r--r--	root/root	usr/etc/mpv/encoding-profiles.conf
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/mpv/
--rw-r--r--	root/root	usr/include/mpv/client.h
--rw-r--r--	root/root	usr/include/mpv/opengl_cb.h
--rw-r--r--	root/root	usr/include/mpv/render.h
--rw-r--r--	root/root	usr/include/mpv/render_gl.h
--rw-r--r--	root/root	usr/include/mpv/stream_cb.h
-drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libmpv.so -> libmpv.so.1.109.0
-lrwxrwxrwx	root/root	usr/lib/libmpv.so.1 -> libmpv.so.1.109.0
--rwxr-xr-x	root/root	usr/lib/libmpv.so.1.109.0
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/mpv.pc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/mpv.desktop
 drwxr-xr-x	root/root	usr/share/bash-completion/
 drwxr-xr-x	root/root	usr/share/bash-completion/completions/
 -rw-r--r--	root/root	usr/share/bash-completion/completions/mpv
+drwxr-xr-x	root/root	usr/share/doc/
+drwxr-xr-x	root/root	usr/share/doc/mpv/
+-rw-r--r--	root/root	usr/share/doc/mpv/input.conf
+-rw-r--r--	root/root	usr/share/doc/mpv/mplayer-input.conf
+-rw-r--r--	root/root	usr/share/doc/mpv/mpv.conf
+-rw-r--r--	root/root	usr/share/doc/mpv/restore-old-bindings.conf
 drwxr-xr-x	root/root	usr/share/icons/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
@@ -43,9 +36,8 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/symbolic/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/symbolic/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/symbolic/apps/mpv-symbolic.svg
-drwxr-xr-x	root/root	usr/share/man/
-drwxr-xr-x	root/root	usr/share/man/man1/
--rw-r--r--	root/root	usr/share/man/man1/mpv.1.gz
+drwxr-xr-x	root/root	usr/share/metainfo/
+-rw-r--r--	root/root	usr/share/metainfo/mpv.metainfo.xml
 drwxr-xr-x	root/root	usr/share/zsh/
 drwxr-xr-x	root/root	usr/share/zsh/site-functions/
 -rw-r--r--	root/root	usr/share/zsh/site-functions/_mpv

mpv/.signature

@@ -1,7 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37D7C1RHKhfYX1RZIDcCKhvXe8fwrE49ORyy9kAVoTYqWoBH82tR8ukfincjC0rRn6S21NeDC9WagsL6Fq+/rgs=
-SHA256 (Pkgfile) = e0eff13ae4c9623514c1296539418e257a42f01ea4161eb33fc586cda024df7a
-SHA256 (.footprint) = f14555b474f5c94353678e03ba77450f3c745c12b1786ae3740039d17fa35bcd
-SHA256 (mpv-v0.34.1.tar.gz) = 32ded8c13b6398310fa27767378193dc1db6d78b006b70dbcbd3123a1445e746
-SHA256 (waf-2.0.9) = 2a8e0816f023995e557f79ea8940d322bec18f286917c8f9a6fa2dc3875dfa48
-SHA256 (mpv.1) = eedccbc958ac9f8d95b2973a6a7452680ee99503c8c87d8221fe0581d95ae592
+RWSagIOpLGJF3x0jARRjITc8RFds9hx8/9amfL7bdNxYy0+eyKoW3qOFH7a+tBKcGd3N3UxbsldVOXNR1DOTUboed24rmy5rSAY=
+SHA256 (Pkgfile) = 3a1776f11780ee522153e215eed648f2f27ff9ff4add41767a4d239249728402
+SHA256 (.footprint) = 7b618425e174a11bfbe920d45e584211150b692f5a17f09839ab2ff8e7ce4d03
+SHA256 (mpv-v0.34.1-4.tar.gz) = 041ed375835ab38f4a73d99f5bc7419cba402cab13cc18b834994969ea4a932f

mpv/Pkgfile

@@ -6,28 +6,18 @@
 
 name=mpv
 version=0.34.1
-release=2
-source=(https://github.com/$name-player/$name/archive/v$version/$name-v$version.tar.gz
-	https://waf.io/waf-2.0.9
-	mpv.1)
+release=4
+_commit=d3a28f12c9ced29982fc831722075bd0c73fb821
+source=(https://github.com/mpv-player/mpv/archive/$_commit/$name-v$version-$release.tar.gz)
 
 build() {
-	cd $name-$version
+  meson setup $name-$_commit build \
+    --prefix=/usr \
+    --buildtype=plain \
+    --wrap-mode nodownload \
+    -D b_lto=true \
+    -D b_pie=true
 
-	install -m0755 $SRC/waf-2.0.9 waf
-
-	[[ -e '/usr/lib/pkgconfig/libcdio_cdda.pc' ]] && PKGMK_MPV+=' --enable-cdda'
-	[[ -e '/usr/lib/pkgconfig/dvdnav.pc' ]] && PKGMK_MPV+=' --enable-dvdnav'
-
-	/usr/bin/python3 waf configure ${PKGMK_MPV} \
-		--prefix=/usr \
-		--enable-libarchive \
-		--enable-libmpv-shared \
-		-j ${JOBS-1}
-
-	/usr/bin/python3 waf build
-	/usr/bin/python3 waf install --destdir=$PKG
-	rm -r $PKG/usr/share/doc
-
-	[ -e '/usr/bin/rst2man.py' ] || install -D -m 0644 -t $PKG/usr/share/man/man1 $SRC/mpv.1
+  meson compile -C build
+  DESTDIR=$PKG meson install -C build
 }