Update tests (fix build). Cosmetic changes.

2 files changed, 8 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0d00c8ffdd4b..6023fc6533ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mpv-full-git
 	pkgdesc = A free, open source, and cross-platform media player (git version with all possible libs)
-	pkgver = 0.32.0.r321.gc8e5a615e9
+	pkgver = 0.32.0.r472.gedaefd6b47
 	pkgrel = 1
 	url = https://mpv.io/
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 80688a001b9c..f1396832de2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=mpv-full-git
-pkgver=0.32.0.r321.gc8e5a615e9
+pkgver=0.32.0.r472.gedaefd6b47
 pkgrel=1
 pkgdesc='A free, open source, and cross-platform media player (git version with all possible libs)'
 arch=('x86_64')
@@ -34,16 +34,12 @@ prepare() {
 }
 
 pkgver() {
-    cd mpv
-    
     local _version
     local _revision
     local _shorthash
-    
-    _version="$(git tag | sort -Vr | head -n1 | sed 's/^v//')"
-    _revision="$(git rev-list v"${_version}"..HEAD --count)"
-    _shorthash="$(git rev-parse --short HEAD)"
-    
+    _version="$(git -C mpv tag | sort -Vr | head -n1 | sed 's/^v//')"
+    _revision="$(git -C mpv rev-list v"${_version}"..HEAD --count)"
+    _shorthash="$(git -C mpv rev-parse --short HEAD)"
     printf '%s.r%s.g%s' "$_version" "$_revision" "$_shorthash"
 }
 
@@ -173,24 +169,20 @@ build() {
 
 check() {
     cd mpv
-    
     local _test
     export LD_LIBRARY_PATH="${srcdir}/mpv/build-tests"
-    
-    # skip problematic 'img_format' test, and the 'all-simple' special value that runs all tests
     while read -r -d '' _test
     do
-        printf '%s\n' "  -> Running test '${_test}'..."
+        printf '%s\n' "Running test '${_test}'..."
         build-tests/mpv --unittest="$_test"
-    done < <(build-tests/mpv --unittest='help' | awk 'FNR == 1 { next } !/img_format|all-simple|repack_zimg/ { printf "%s\0", $1 }')
+    done < <(build-tests/mpv --unittest='help' |
+        awk 'FNR == 1 { next } !/all-simple|img_format|repack(|_zimg)$/ { printf "%s\0", $1 }')
 }
 
 package() {
     cd mpv
-    
     export WAFLOCK='.lock-waf_linux_build'
     ./waf install --destdir="$pkgdir"
-    
     install -D -m644 DOCS/{encoding.rst,tech-overview.txt} "${pkgdir}/usr/share/doc/mpv"
     install -D -m644 TOOLS/lua/* -t "${pkgdir}/usr/share/mpv/script"
 }