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

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

[-- Attachment #1: Type: text/plain, Size: 1221 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
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**


<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-libc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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: 3737 bytes --]

From 00bb939958597cd812f39750652729ce5ffd6951 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-1.5.3

---
 common/shlibs         |  1 +
 srcpkgs/vmaf/template | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 srcpkgs/vmaf/template

diff --git a/common/shlibs b/common/shlibs
index caf04c6adf5c..41e60058fac6 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.0 vmaf-1.5.3_1
diff --git a/srcpkgs/vmaf/template b/srcpkgs/vmaf/template
new file mode 100644
index 000000000000..542db4d9471d
--- /dev/null
+++ b/srcpkgs/vmaf/template
@@ -0,0 +1,23 @@
+# Template file for 'vmaf'
+pkgname=vmaf
+version=1.5.3
+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=440652ae417d88be083ffd9fa5967662172601e31c458a9743f6008d7150c900
+
+post_patch() {
+  # Will be obsolete after update to >=2.0.0:
+	# https://github.com/Netflix/vmaf/tree/v2.3.1/libvmaf#vmaf-models
+	vsed -i meson.build -e "s!install_dir: 'share'!install_dir: '/usr/share/vmaf'!"
+}
+
+post_install() {
+	vlicense ${wrksrc}/LICENSE
+}

From ec5e8cca249e7b1c5487647c36a392f2b85bd4a6 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 | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 23a3d5c9967b..02fad9b6aaea 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 $(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,9 @@ post_patch() {
 		ppc64le*) ;;
 		ppc*) _apply_patch -p1 ${FILESDIR}/altivec.patch ;;
 	esac
+
+	vsed -i doc/filters.texi -e 's_/usr/local/share/model/_/usr/share/vmaf/model/_'
+	vsed -i libavfilter/vf_libvmaf.c -e 's_/usr/local/share/model/_/usr/share/vmaf/model/_'
 }
 
 do_configure() {
@@ -110,7 +113,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) \