mpv 0.28.2

2 files changed, 34 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6815b3a57cd0..6692504b9d11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Mar 10 17:58:54 UTC 2018
+# Sat May 19 21:53:55 UTC 2018
 pkgbase = mpv-rpi
 	pkgdesc = mpv with Raspberry Pi support
-	pkgver = 0.27.2
-	pkgrel = 2
+	pkgver = 0.28.2
+	pkgrel = 1
 	epoch = 1
 	url = https://mpv.io/
 	arch = armv6h
@@ -13,41 +13,38 @@ pkgbase = mpv-rpi
 	makedepends = mesa
 	makedepends = python-docutils
 	makedepends = ladspa
+	makedepends = wayland-protocols
+	makedepends = vulkan-headers
+	depends = desktop-file-utils
 	depends = ffmpeg-mmal
+	depends = hicolor-icon-theme
+	depends = jack
 	depends = lcms2
+	depends = libarchive
+	depends = libcaca
 	depends = libcdio-paranoia
+	depends = libdvdnav
 	depends = libgl
-	depends = libxss
+	depends = libva
 	depends = libxinerama
-	depends = libxv
 	depends = libxkbcommon
-	depends = libva
-	depends = wayland
-	depends = libcaca
-	depends = desktop-file-utils
-	depends = hicolor-icon-theme
-	depends = xdg-utils
-	depends = lua52
-	depends = libdvdnav
 	depends = libxrandr
-	depends = jack
+	depends = libxss
+	depends = libxv
+	depends = lua52
 	depends = rubberband
-	depends = uchardet
-	depends = libarchive
 	depends = smbclient
+	depends = uchardet
+	depends = vulkan-icd-loader
+	depends = wayland
+	depends = xdg-utils
 	optdepends = youtube-dl: for video-sharing websites playback
 	provides = mpv
 	conflicts = mpv
 	options = !emptydirs
-	source = mpv-0.27.2.tar.gz::https://github.com/mpv-player/mpv/archive/v0.27.2.tar.gz
-	source = 0001-opengl-backend-support-multiple-backends.patch
-	source = 0002-vaapi-Use-libva2-message-callbacks.patch
-	source = 0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch
+	source = mpv-rpi-0.28.2.tar.gz::https://github.com/mpv-player/mpv-rpi/archive/v0.28.2.tar.gz
 	source = https://waf.io/waf-1.9.8
-	sha256sums = 2ad104d83fd3b2b9457716615acad57e479fd1537b8fc5e37bfe9065359b50be
-	sha256sums = 609e0530f1b0cdb910dcffb5f62bf55936540e24105ce1b2daf1bd6291a7d58a
-	sha256sums = 3c3517f4f4c71e39e1e04ea440688fc8d7b3dc55e6bc0a9398d11a9b75bde07d
-	sha256sums = 5de6c616428c87cf9b39d8ba24446d65d175050c083e1054194d93cf03d5816a
+	sha256sums = aada14e025317b5b3e8e58ffaf7902e8b6e4ec347a93d25a7c10d3579426d795
 	sha256sums = 167dc42bab6d5bd823b798af195420319cb5c9b571e00db7d83df2a0fe1f4dbf
 
 pkgname = mpv-rpi
diff --git a/PKGBUILD b/PKGBUILD
index 4a7977738b6e..e20cf1116711 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,8 +11,8 @@
 pkgname=mpv-rpi
 _pkgname=mpv
 epoch=1
-pkgver=0.27.2
-pkgrel=2
+pkgver=0.28.2
+pkgrel=1
 _waf_version=1.9.8
 pkgdesc='mpv with Raspberry Pi support'
 arch=('armv6h' 'armv7h' 'aarch64')
@@ -20,39 +20,24 @@ arch=('armv6h' 'armv7h' 'aarch64')
 # being one of these. So our package is GPLv3 only as well.
 license=('GPL3')
 url='https://mpv.io/'
-depends=(
-  'ffmpeg-mmal' 'lcms2' 'libcdio-paranoia' 'libgl' 'libxss'
-  'libxinerama' 'libxv' 'libxkbcommon' 'libva' 'wayland' 'libcaca'
-  'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua52' 'libdvdnav'
-  'libxrandr' 'jack' 'rubberband' 'uchardet' 'libarchive' 'smbclient'
-)
-makedepends=('mesa' 'python-docutils' 'ladspa')
+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')
+makedepends=('mesa' 'python-docutils' 'ladspa' 'wayland-protocols'
+             '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"
-  '0001-opengl-backend-support-multiple-backends.patch'
-  '0002-vaapi-Use-libva2-message-callbacks.patch'
-  '0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch'
+source=("$pkgname-$pkgver.tar.gz::https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz"
   "https://waf.io/waf-${_waf_version}")
-sha256sums=('2ad104d83fd3b2b9457716615acad57e479fd1537b8fc5e37bfe9065359b50be'
-  '609e0530f1b0cdb910dcffb5f62bf55936540e24105ce1b2daf1bd6291a7d58a'
-  '3c3517f4f4c71e39e1e04ea440688fc8d7b3dc55e6bc0a9398d11a9b75bde07d'
-  '5de6c616428c87cf9b39d8ba24446d65d175050c083e1054194d93cf03d5816a'
+sha256sums=('aada14e025317b5b3e8e58ffaf7902e8b6e4ec347a93d25a7c10d3579426d795'
   '167dc42bab6d5bd823b798af195420319cb5c9b571e00db7d83df2a0fe1f4dbf')
 provides=('mpv')
 conflicts=('mpv')
 
 prepare() {
-  cd ${_pkgname}-${pkgver}
-
-  # --opengl-backend: support multiple backends (#4384) (FS#53962)
-  patch -Np1 < "${srcdir}"/0001-opengl-backend-support-multiple-backends.patch
-
-  # vaapi: Use libva2 message callbacks
-  patch -Np1 < "${srcdir}"/0002-vaapi-Use-libva2-message-callbacks.patch
-
-  # demux_lavf: return AVERROR_EOF on file end
-  patch -Np1 < "${srcdir}"/0003-demux_lavf-return-AVERROR_EOF-on-file-end.patch
+  cd ${pkgname}-${pkgver}
 
   install -m755 "${srcdir}"/waf-${_waf_version} waf
 }
@@ -62,9 +47,6 @@ build() {
 
   [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && CFLAGS+=" -fPIC" && CXXFLAGS+=" -fPIC"
 
-  # https://github.com/mpv-player/mpv-build/issues/84
-  export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/opt/vc/lib/pkgconfig"
-
   ./waf configure --prefix=/usr \
     --confdir=/etc/mpv \
     --enable-cdda \
@@ -72,6 +54,7 @@ build() {
     --enable-dvdnav \
     --enable-encoding \
     --enable-libsmbclient \
+    --enable-tv \
     --enable-libarchive \
     --enable-libmpv-shared \
     --enable-zsh-comp \