From 132707fa8beb6fee3f0eaa534a3becf656e5ff9e Mon Sep 17 00:00:00 2001 From: Eugen Zagorodniy 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 " +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 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 " 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) \