diff options
author | Daniel Bermond | 2020-05-14 19:21:19 +0000 |
---|---|---|
committer | Daniel Bermond | 2020-05-14 19:21:33 +0000 |
commit | edf0f7613353c445c2e66808f9f34b2bfeb24d29 (patch) | |
tree | eda212179942488a60299bc77536bb2d24566b36 | |
parent | c13db3c3a6e675a0850eed5d1a086b638e82ac9b (diff) | |
download | aur-edf0f7613353c445c2e66808f9f34b2bfeb24d29.tar.gz |
Update tests (fix build). Cosmetic changes.
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 22 |
2 files changed, 8 insertions, 16 deletions
@@ -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 @@ -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" } |