[PR PATCH] New package: vmaf-2.3.1

[PR PATCH] New package: vmaf-2.3.1

[ezag]

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

There is a new 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**|**NO**


<!-- 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: 1049 bytes --]

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

---
 srcpkgs/vmaf/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/vmaf/template

diff --git a/srcpkgs/vmaf/template b/srcpkgs/vmaf/template
new file mode 100644
index 000000000000..f719116e05e4
--- /dev/null
+++ b/srcpkgs/vmaf/template
@@ -0,0 +1,18 @@
+# Template file for 'vmaf'
+pkgname=vmaf
+version=2.3.1
+revision=1
+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
+build_style=meson
+build_wrksrc=libvmaf
+hostmakedepends="meson ninja nasm"
+
+post_install() {
+	vlicense ${wrksrc}/LICENSE
+}

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

[ezag]

[-- 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: 1053 bytes --]

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

---
 srcpkgs/vmaf/template | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 srcpkgs/vmaf/template

diff --git a/srcpkgs/vmaf/template b/srcpkgs/vmaf/template
new file mode 100644
index 000000000000..25f4361e0653
--- /dev/null
+++ b/srcpkgs/vmaf/template
@@ -0,0 +1,18 @@
+# Template file for 'vmaf'
+pkgname=vmaf
+version=2.3.1
+revision=1
+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
+build_style=meson
+build_wrksrc=libvmaf
+hostmakedepends="meson ninja nasm xxd"
+
+post_install() {
+	vlicense ${wrksrc}/LICENSE
+}

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

[ezag]

[-- 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: 3215 bytes --]

From 61c60d267c56d84e387b93e996d233eddce8453f 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/template | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 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/template b/srcpkgs/vmaf/template
new file mode 100644
index 000000000000..25f4361e0653
--- /dev/null
+++ b/srcpkgs/vmaf/template
@@ -0,0 +1,18 @@
+# Template file for 'vmaf'
+pkgname=vmaf
+version=2.3.1
+revision=1
+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
+build_style=meson
+build_wrksrc=libvmaf
+hostmakedepends="meson ninja nasm xxd"
+
+post_install() {
+	vlicense ${wrksrc}/LICENSE
+}

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

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 23a3d5c9967b..63087469c589 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)
@@ -110,7 +110,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) \

Re: [PR REVIEW] New package: vmaf-2.3.1

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41489#discussion_r1063712711

Comment:
```suggestion
```

Re: [PR REVIEW] New package: vmaf-2.3.1

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41489#discussion_r1063712893

Comment:
```suggestion
hostmakedepends="nasm xxd"
```

Re: [PR REVIEW] New package: vmaf-2.3.1

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41489#discussion_r1063713230

Comment:
```suggestion
	vlicense LICENSE
```

Re: [PR REVIEW] New package: vmaf-2.3.1

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41489#discussion_r1063713035

Comment:
```suggestion
homepage="https://github.com/Netflix/vmaf"
```

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

[ezag]

[-- 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 eb160c3c4531c4be1b8118e036ef52afca8ab544 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..1aeb3875f2e9
--- /dev/null
+++ b/srcpkgs/vmaf/template
@@ -0,0 +1,23 @@
+# Template file for 'vmaf'
+pkgname=vmaf
+version=1.5.3
+revision=1
+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
+build_style=meson
+build_wrksrc=libvmaf
+hostmakedepends="nasm xxd"
+
+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 672b4b9c6aee9690a42cd23597e977bc097d0e0a 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) \

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

[ezag]

[-- 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) \

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

[ezag]

[-- Attachment #1: Type: text/plain, Size: 409 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-1.5.3
### To do: ###

- [ ] patch ffmpeg so that is uses built-in vmaf models
- [ ] 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: 4186 bytes --]

From e76ceddfc230896aaf14f101a5e48095262ab463 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..7bf1f43ee0f0
--- /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 7a56cc90a11d157046bd348d79c46aa3d76f200e 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) \

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

[ezag]

[-- 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) \

Re: New package: vmaf-2.3.1

[ezag]

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

New comment by ezag on void-packages repository

https://github.com/void-linux/void-packages/pull/41489#issuecomment-1374246416

Comment:
@paper42 updated - please review

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

[ezag]

[-- 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 external 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: 4183 bytes --]

From a95d2361154c83cccbeb713d5a206db22190c949 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 84c47585f58e..7f22af227ca9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4222,3 +4222,4 @@ 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
 libqrtr.so.1 qrtr-ns-1.0_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 3fa2006bca1640026d9f89fd2f350f3d61a5de9d 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) \

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

[ezag]

[-- 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 external 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: 4055 bytes --]

From da997f80531c5634a31d92da85289bb31da8d9b9 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 | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/vmaf-devel
 create mode 100644 srcpkgs/vmaf/template

diff --git a/common/shlibs b/common/shlibs
index 349c183cdb38..a4fd6bb94906 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4220,3 +4220,4 @@ libdspy-1.so.1 d-spy-1.4.0_1
 libpanel-1.so.1 libpanel-1.0.1_1
 libqrtr.so.1 qrtr-ns-1.0_1
 libbpf.so.1 libbpf-1.0.0_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..530055f17465
--- /dev/null
+++ b/srcpkgs/vmaf/template
@@ -0,0 +1,30 @@
+# 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
+}
+
+vmaf-devel_package() {
+	depends="vmaf>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From ad5d7860cb2dce4115a0dc92296485b22757f91f 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) \

Re: New package: vmaf-2.3.1

[ezag]

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

New comment by ezag on void-packages repository

https://github.com/void-linux/void-packages/pull/41489#issuecomment-1374920281

Comment:
Rebased & fixed subpackage build (avoid re-building, properly use vmove)

Re: New package: vmaf-2.3.1

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/41489#issuecomment-1501017668

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

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

[ezag]

[-- 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 external 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: 4139 bytes --]

From f67219565fc2766eb2ef392a4051fe7451ef6a18 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 | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/vmaf-devel
 create mode 100644 srcpkgs/vmaf/template

diff --git a/common/shlibs b/common/shlibs
index 39fed5ffbcf5..58f2123378aa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4243,3 +4243,4 @@ libdate-tz.so.3 chrono-date-3.0.1_1
 libayatana-ido3-0.4.so.0 ayatana-ido-0.9.2_1
 libayatana-indicator3.so.7 libayatana-indicator-0.9.3_1
 libayatana-appindicator3.so.1 libayatana-appindicator-0.5.91_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..530055f17465
--- /dev/null
+++ b/srcpkgs/vmaf/template
@@ -0,0 +1,30 @@
+# 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
+}
+
+vmaf-devel_package() {
+	depends="vmaf>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 8fb85e359515a24aec2124aaaba493b5dffeeae4 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) \

Re: New package: vmaf-2.3.1

[ezag]

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

New comment by ezag on void-packages repository

https://github.com/void-linux/void-packages/pull/41489#issuecomment-1501194198

Comment:
@paper42 rebased on recent master; this PR is still up to date and working

Re: New package: vmaf-2.3.1

[Duncaen]

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

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/41489#issuecomment-1605521878

Comment:
Needs to be rebased again, I'm going to merge this when you're done.

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

[ezag]

[-- 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 external 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: 4082 bytes --]

From 132707fa8beb6fee3f0eaa534a3becf656e5ff9e 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 | 30 ++++++++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 120000 srcpkgs/vmaf-devel
 create mode 100644 srcpkgs/vmaf/template

diff --git a/common/shlibs b/common/shlibs
index 39c868b03148..525c08a30424 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4279,3 +4279,4 @@ libjxl.so.0.8 libjxl-0.8.2_1
 libjxl_dec.so.0.8 libjxl-0.8.2_1
 libjxl_threads.so.0.8 libjxl-0.8.2_1
 libtext-engine-0.1.so.0 text-engine-0.1.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..530055f17465
--- /dev/null
+++ b/srcpkgs/vmaf/template
@@ -0,0 +1,30 @@
+# 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
+}
+
+vmaf-devel_package() {
+	depends="vmaf>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}

From 1741fb06f550525875957417bb0d65366f7f4708 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 df4179d1963a..aa058aab9ca9 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.4
-revision=1
+revision=2
 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)
@@ -69,6 +69,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() {
@@ -113,7 +115,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) \

Re: New package: vmaf-2.3.1

[ezag]

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

New comment by ezag on void-packages repository

https://github.com/void-linux/void-packages/pull/41489#issuecomment-1607276362

Comment:
Is seems some patches have to be applied to fix the build, I'm going to look into it in a while.

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

[Duncaen]

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

There's a closed pull request on the void-packages repository

New package: vmaf-2.3.1
https://github.com/void-linux/void-packages/pull/41489

Description:
### To do: ###

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