Re: [PR PATCH] [Updated] New package: vmaf-2.3.1

[ezag <ezag@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 399 bytes --]

There is an updated pull request by ezag against master on the void-packages repository

https://github.com/ezag/void-packages vmaf
https://github.com/void-linux/void-packages/pull/41489

New package: vmaf-2.3.1
### To do: ###

- [x] patch ffmpeg (uses built-in vmaf model)
- [x] split vmaf-devel package

A patch file from https://github.com/void-linux/void-packages/pull/41489.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vmaf-41489.patch --]
[-- Type: text/x-diff, Size: 4185 bytes --]

From 3a9c73d2729b5562ebdb1a1fc53cb372f453f0ca Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Fri, 6 Jan 2023 06:29:47 +0200
Subject: [PATCH 1/2] New package: vmaf-2.3.1

---
 common/shlibs         |  1 +
 srcpkgs/vmaf-devel    |  1 +
 srcpkgs/vmaf/template | 31 +++++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)
 create mode 120000 srcpkgs/vmaf-devel
 create mode 100644 srcpkgs/vmaf/template

diff --git a/common/shlibs b/common/shlibs
index caf04c6adf5c..da8ac5ac4a0a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4223,3 +4223,4 @@ libfst.so.25 openfst-1.8.2_1
 libvosk.so vosk-api-0.3.43_1
 libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
+libvmaf.so.1 vmaf-2.3.1_1
diff --git a/srcpkgs/vmaf-devel b/srcpkgs/vmaf-devel
new file mode 120000
index 000000000000..61c973c1c892
--- /dev/null
+++ b/srcpkgs/vmaf-devel
@@ -0,0 +1 @@
+vmaf
\ No newline at end of file
diff --git a/srcpkgs/vmaf/template b/srcpkgs/vmaf/template
new file mode 100644
index 000000000000..981f1f6f91d5
--- /dev/null
+++ b/srcpkgs/vmaf/template
@@ -0,0 +1,31 @@
+# Template file for 'vmaf'
+pkgname=vmaf
+version=2.3.1
+revision=1
+build_wrksrc=libvmaf
+build_style=meson
+hostmakedepends="nasm xxd"
+short_desc="Perceptual video quality assessment algorithm developed by Netflix"
+maintainer="Eugen Zagorodniy <zag@disroot.org>"
+license=BSD-2-Clause-Patent
+homepage="https://github.com/Netflix/vmaf"
+distfiles="https://github.com/Netflix/vmaf/archive/refs/tags/v${version}.tar.gz"
+checksum=8d60b1ddab043ada25ff11ced821da6e0c37fd7730dd81c24f1fc12be7293ef2
+
+post_install() {
+	vlicense ../LICENSE
+	# Obsolete compute_vmaf() used by ffmpeg-4.4.3 requires non-built-in models
+	vcopy ../model usr/share/vmaf
+	# These go to vmaf-devel
+	rm ${DESTDIR}/usr/lib/libvmaf.{a,so}
+	rm -r ${DESTDIR}/usr/{include,lib/pkgconfig}
+}
+
+vmaf-devel_package() {
+	depends="vmaf>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		DESTDIR=${PKGDESTDIR} ninja -C build install
+		rm ${PKGDESTDIR}/usr/{bin/vmaf,lib/libvmaf.so.1{,.1.3}}
+	}
+}

From e19242db89162d9a4d73513b2fe1a7f937e2d1de Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Fri, 6 Jan 2023 20:50:38 +0200
Subject: [PATCH 2/2] ffmpeg: enable vmaf support

---
 srcpkgs/ffmpeg/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 23a3d5c9967b..c3fd2e66b97a 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -2,7 +2,7 @@
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.4.3
-revision=2
+revision=3
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -17,7 +17,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
  libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
  speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
- libbs2b-devel libvidstab-devel $(vopt_if pulseaudio pulseaudio-devel)
+ libbs2b-devel libvidstab-devel vmaf-devel $(vopt_if pulseaudio pulseaudio-devel)
  $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel)
  $(vopt_if x265 x265-devel) $(vopt_if v4l2 v4l-utils-devel)
  $(vopt_if fdk_aac fdk-aac-devel) $(vopt_if vpx libvpx-devel)
@@ -66,6 +66,8 @@ post_patch() {
 		ppc64le*) ;;
 		ppc*) _apply_patch -p1 ${FILESDIR}/altivec.patch ;;
 	esac
+
+	vsed -i libavfilter/vf_libvmaf.c -e 's!/usr/local/share/model/\(vmaf_v0.6.1\).pkl!/usr/share/vmaf/\1.json!'
 }
 
 do_configure() {
@@ -110,7 +112,7 @@ do_configure() {
 		$(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \
 		--disable-libopencore_amrnb --disable-libopencore_amrwb \
 		--disable-libopenjpeg \
-		--enable-postproc --enable-opencl ${_args} \
+		--enable-postproc --enable-opencl --enable-libvmaf ${_args} \
 		$(vopt_enable x265 libx265) \
 		$(vopt_enable v4l2 libv4l2) \
 		$(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \