Match latest upstream changes

2 files changed, 10 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 21577dfdb758..c8c57597d9c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
 pkgbase = vmaf-git
 	pkgdesc = Perceptual video quality assessment algorithm based on multi-method fusion (git version)
-	pkgver = 2.3.0.r89.g278f6aba
+	pkgver = 3.0.0rc.r1.g97e50eae
 	pkgrel = 1
 	url = https://github.com/Netflix/vmaf/
 	arch = x86_64
 	license = BSD
+	checkdepends = vim
 	makedepends = git
 	makedepends = meson
 	makedepends = nasm
-	makedepends = vim
-	makedepends = doxygen
 	depends = gcc-libs
 	provides = vmaf
 	provides = libvmaf-git
 	conflicts = vmaf
 	conflicts = libvmaf-git
 	replaces = libvmaf-git
-	options = !lto
 	source = git+https://github.com/Netflix/vmaf.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 68d67a60231e..b8515986d37a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,36 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=vmaf-git
-pkgver=2.3.0.r89.g278f6aba
+pkgver=3.0.0rc.r1.g97e50eae
 pkgrel=1
 pkgdesc='Perceptual video quality assessment algorithm based on multi-method fusion (git version)'
 arch=('x86_64')
 url='https://github.com/Netflix/vmaf/'
 license=('BSD')
 depends=('gcc-libs')
-makedepends=('git' 'meson' 'nasm' 'vim' 'doxygen')
+makedepends=('git' 'meson' 'nasm')
+checkdepends=('vim')
 provides=('vmaf' 'libvmaf-git')
 conflicts=('vmaf' 'libvmaf-git')
 replaces=('libvmaf-git')
-options=('!lto')
 source=('git+https://github.com/Netflix/vmaf.git')
 sha256sums=('SKIP')
 
 pkgver() {
-    git -C vmaf describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
+    git -C vmaf describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/\.rc/rc/'
 }
 
 build() {
-    arch-meson vmaf/libvmaf/build vmaf/libvmaf
-    ninja -v -C vmaf/libvmaf/build
+    arch-meson -Denable_avx512='false' vmaf/libvmaf build
+    meson compile -C build
 }
 
 check() {
-    ninja -v -C vmaf/libvmaf/build test
+    meson test -C build
 }
 
 package() {
-    DESTDIR="$pkgdir" ninja -v -C vmaf/libvmaf/build install
-    install -D -m755 vmaf/libvmaf/build/tools/vmafossexec -t "${pkgdir}/usr/bin"
+    meson install -C build --destdir "$pkgdir"
     install -D -m644 vmaf/LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
     cp -dr --no-preserve='ownership' vmaf/model "${pkgdir}/usr/share"
 }