2.3.1-2: fix packaging issues

3 files changed, 72 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 909172f33b47..e135aeecb259 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
 pkgbase = libvmaf-compat
-	pkgdesc = Perceptual video quality assessment algorithm based on multi-method fusion (v2 compatibility)
+	pkgdesc = Perceptual video quality assessment library (legacy v2.x API)
 	pkgver = 2.3.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Netflix/vmaf/
 	arch = x86_64
-	license = BSD
+	license = BSD-2-Clause-Patent
 	makedepends = meson
 	makedepends = nasm
-	makedepends = vim
-	makedepends = doxygen
+	makedepends = ninja
 	depends = gcc-libs
-	provides = vmaf=2.3.1
-	provides = libvmaf=2.3.1
-	conflicts = vmaf=2.3.1
-	conflicts = libvmaf=2.3.1
-	options = !lto
+	depends = glibc
+	conflicts = vmaf>=2
+	conflicts = vmaf<3
 	source = https://github.com/Netflix/vmaf/archive/v2.3.1/vmaf-2.3.1.tar.gz
 	sha256sums = 8d60b1ddab043ada25ff11ced821da6e0c37fd7730dd81c24f1fc12be7293ef2
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..058ba2318df1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+# based on https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
+*.tar
+*.tar.*
+*.rpm
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+
+*/
+*.orig
+*.bak
+*.backup
+*.kate-swp
+.directory
diff --git a/PKGBUILD b/PKGBUILD
index f7e63916b78a..21b2f6ffbf79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,60 @@
-# Maintainer: Jorge Pizarro-Callejas (aka jorgicio) <jpizarrocallejas@gmail.com>
+# Contributor: Jorge Pizarro-Callejas (aka jorgicio) <jpizarrocallejas@gmail.com>
 
 pkgname=libvmaf-compat
-_pkgname=vmaf
+_distname=vmaf
 pkgver=2.3.1
-pkgrel=1
-pkgdesc='Perceptual video quality assessment algorithm based on multi-method fusion (v2 compatibility)'
+pkgrel=2
+pkgdesc='Perceptual video quality assessment library (legacy v2.x API)'
 arch=('x86_64')
 url='https://github.com/Netflix/vmaf/'
-license=('BSD')
-depends=('gcc-libs')
-makedepends=('meson' 'nasm' 'vim' 'doxygen')
-provides=('vmaf=2.3.1' 'libvmaf=2.3.1')
-conflicts=('vmaf=2.3.1' 'libvmaf=2.3.1')
-options=('!lto')
-source=("https://github.com/Netflix/vmaf/archive/v${pkgver}/${_pkgname}-${pkgver}.tar.gz")
+license=('BSD-2-Clause-Patent')
+depends=(
+  'gcc-libs'
+  'glibc'
+)
+makedepends=(
+  'meson'
+  'nasm'
+  'ninja'
+)
+conflicts=(
+  'vmaf>=2'
+  'vmaf<3'
+)
+source=("https://github.com/Netflix/vmaf/archive/v${pkgver}/${_distname}-${pkgver}.tar.gz")
 sha256sums=('8d60b1ddab043ada25ff11ced821da6e0c37fd7730dd81c24f1fc12be7293ef2')
 
+prepare() {
+  echo "Configuring to disable building the vmaf executable (from 'tools' dir)..."
+  sed -e "/subdir('tools')/d" \
+      -i "${_distname}-${pkgver}/libvmaf/meson.build"
+  echo "Done."
+
+  echo "Configuring to disable model test because we won't build the models..."
+  sed -e "/test('test_model',/d" \
+      -e "/test('test_predict',/d" \
+      -i "${_distname}-${pkgver}/libvmaf/test/meson.build"
+  echo "Done."
+
+  arch-meson \
+    --auto-features disabled \
+    -Denable_docs=false \
+    -Denable_avx512=false \
+    -Dbuilt_in_models=false \
+    "${_distname}-${pkgver}/libvmaf/build" "${_distname}-${pkgver}/libvmaf"
+}
+
 build() {
-    arch-meson "${_pkgname}-${pkgver}/libvmaf/build" "${_pkgname}-${pkgver}/libvmaf"
-    ninja -v -C "${_pkgname}-${pkgver}/libvmaf/build"
+  ninja -v -C "${_distname}-${pkgver}/libvmaf/build"
 }
 
-#check() {
-#    ninja -v -C "${_pkgname}-${pkgver}/libvmaf/build" test
-#}
+check() {
+  ninja -v -C "${_distname}-${pkgver}/libvmaf/build" test
+}
 
 package() {
-    DESTDIR="$pkgdir" ninja -v -C "${_pkgname}-${pkgver}/libvmaf/build" install
-    rm -rf "$pkgdir"/usr/{include,bin}
-    rm -rf "$pkgdir"/usr/lib/{libvmaf.so,pkgconfig,libvmaf.a}
-    #install -D -m755 "${pkgname}-${pkgver}/libvmaf/build/tools/vmafossexec" -t "${pkgdir}/usr/bin"
-    #install -D -m644 "${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    #cp -dr --no-preserve='ownership' "${pkgname}-${pkgver}/model" "${pkgdir}/usr/share"
+  DESTDIR="$pkgdir" ninja -v -C "${_distname}-${pkgver}/libvmaf/build" install
+  rm -rf "$pkgdir"/usr/{include,bin}
+  rm -rf "$pkgdir"/usr/lib/{libvmaf.so,pkgconfig,libvmaf.a}
+  install -D -m644 "${_distname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }