mpv 0.30.0

Make it look as similar as possible as the one from the official Arch
Linux repos.

The PKGBUILD tweaks the variable PKG_CONFIG_PATH because the bcrmegl
package for pkg-config is installed in a non-standard location by Arch
ARM’s raspberrypi-firmware package.

Feature egl-drm had to be disabled because the file
video/out/opengl/context_drm_egl.c won’t build with RPi’s proprietary
EGL implementation. Hopefully this won’t bother anyone since we have
context_rpi.c instead.

2 files changed, 29 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6b09a2868e0..907455343cfc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Nov  7 02:24:18 UTC 2018
+# Wed Nov  6 02:11:55 UTC 2019
 pkgbase = mpv-rpi
 	pkgdesc = mpv with Raspberry Pi support
-	pkgver = 0.29.1
+	pkgver = 0.30.0
 	pkgrel = 1
 	epoch = 1
 	url = https://mpv.io/
@@ -14,6 +14,7 @@ pkgbase = mpv-rpi
 	makedepends = python-docutils
 	makedepends = ladspa
 	makedepends = wayland-protocols
+	makedepends = ffnvcodec-headers
 	makedepends = vulkan-headers
 	depends = desktop-file-utils
 	depends = ffmpeg-mmal
@@ -38,13 +39,16 @@ pkgbase = mpv-rpi
 	depends = vulkan-icd-loader
 	depends = wayland
 	depends = xdg-utils
+	depends = shaderc
+	depends = mujs
+	depends = libplacebo
 	optdepends = youtube-dl: for video-sharing websites playback
 	provides = mpv
 	conflicts = mpv
 	options = !emptydirs
-	source = mpv-0.29.1.tar.gz::https://github.com/mpv-player/mpv/archive/v0.29.1.tar.gz
+	source = mpv-0.30.0.tar.gz::https://github.com/mpv-player/mpv/archive/v0.30.0.tar.gz
 	source = https://waf.io/waf-2.0.9
-	sha256sums = f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623
+	sha256sums = 33a1bcb7e74ff17f070e754c15c52228cf44f2cefbfd8f34886ae81df214ca35
 	sha256sums = 2a8e0816f023995e557f79ea8940d322bec18f286917c8f9a6fa2dc3875dfa48
 
 pkgname = mpv-rpi
diff --git a/PKGBUILD b/PKGBUILD
index 89692843f98c..7b7fe2fa0f71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Christian Hesse <mail@eworm.de>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Eivind Uggedal <eivind@uggedal.com>
@@ -7,12 +6,13 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - armv7/aarch64 needs to be built with fPIC
-# Upstream: https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/community/mpv/PKGBUILD
+
+# Upstream: https://git.archlinux.org/svntogit/community.git/plain/trunk/PKGBUILD?h=packages/mpv
 
 pkgname=mpv-rpi
 _pkgname=mpv
 epoch=1
-pkgver=0.29.1
+pkgver=0.30.0
 pkgrel=1
 _waf_version=2.0.9
 pkgdesc='mpv with Raspberry Pi support'
@@ -25,22 +25,22 @@ depends=('desktop-file-utils' 'ffmpeg-mmal' 'hicolor-icon-theme' 'jack' 'lcms2'
          'libarchive' 'libcaca' 'libcdio-paranoia' 'libdvdnav' 'libgl' 'libva'
          'libxinerama' 'libxkbcommon' 'libxrandr' 'libxss' 'libxv' 'lua52'
          'rubberband' 'smbclient' 'uchardet' 'vulkan-icd-loader' 'wayland'
-         'xdg-utils')
+         'xdg-utils' 'shaderc' 'mujs' 'libplacebo')
 makedepends=('mesa' 'python-docutils' 'ladspa' 'wayland-protocols'
-             'vulkan-headers')
+             'ffnvcodec-headers' 'vulkan-headers')
 optdepends=('youtube-dl: for video-sharing websites playback')
 options=('!emptydirs')
 source=("$_pkgname-$pkgver.tar.gz::https://github.com/mpv-player/$_pkgname/archive/v$pkgver.tar.gz"
-  "https://waf.io/waf-${_waf_version}")
-sha256sums=('f9f9d461d1990f9728660b4ccb0e8cb5dce29ccaa6af567bec481b79291ca623'
-  '2a8e0816f023995e557f79ea8940d322bec18f286917c8f9a6fa2dc3875dfa48')
+        "https://waf.io/waf-${_waf_version}")
+sha256sums=('33a1bcb7e74ff17f070e754c15c52228cf44f2cefbfd8f34886ae81df214ca35'
+            '2a8e0816f023995e557f79ea8940d322bec18f286917c8f9a6fa2dc3875dfa48')
 provides=('mpv')
 conflicts=('mpv')
 
 prepare() {
   cd ${_pkgname}-${pkgver}
 
-  install -m755 "${srcdir}"/waf-${_waf_version} waf
+  install -m0755 "${srcdir}"/waf-${_waf_version} waf
 }
 
 build() {
@@ -48,19 +48,22 @@ build() {
 
   [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && CFLAGS+=" -fPIC" && CXXFLAGS+=" -fPIC"
 
+  # Ugly hack to help mpv/waf find bcrmegl.
+  export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/vc/lib/pkgconfig"
+
   ./waf configure --prefix=/usr \
     --confdir=/etc/mpv \
     --enable-cdda \
-    --enable-dvb \
+    --enable-dvbin \
     --enable-dvdnav \
-    --enable-libsmbclient \
-    --enable-tv \
     --enable-libarchive \
     --enable-libmpv-shared \
-    --enable-zsh-comp \
+    --enable-libsmbclient \
     --enable-egl-x11 \
+    --disable-egl-drm \
     --disable-vaapi \
-    --enable-rpi
+    --enable-rpi \
+    --enable-rpi-mmal
 
   ./waf build
 }
@@ -70,6 +73,9 @@ package() {
 
   ./waf install --destdir="$pkgdir"
 
-  install -m644 DOCS/{encoding.rst,tech-overview.txt} \
+  install -m0644 DOCS/{encoding.rst,tech-overview.txt} \
     "$pkgdir"/usr/share/doc/mpv
+
+  install -m0644 TOOLS/lua/* \
+    -D -t "$pkgdir"/usr/share/mpv/scripts
 }