diff --git a/multimedia/vmaf/Makefile b/multimedia/vmaf/Makefile index 818c75bf5dff..f7fb96996ef3 100644 --- a/multimedia/vmaf/Makefile +++ b/multimedia/vmaf/Makefile @@ -1,32 +1,32 @@ PORTNAME= vmaf DISTVERSIONPREFIX= v -DISTVERSION= 3.1.0 +DISTVERSION= 3.2.0 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org COMMENT= Perceptual video quality assessment based on multi-method fusion WWW= https://github.com/Netflix/vmaf LICENSE= BSD2CLAUSE+PATENT LICENSE_GROUPS= FSF OSI COPYFREE LICENSE_NAME= BSD-2-Clause Plus Patent License LICENSE_FILE= ${WRKSRC:H}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= xxd:sysutils/xxd \ ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_amd64= nasm:devel/nasm BUILD_DEPENDS_i386= nasm:devel/nasm USES= compiler:c++11-lib meson USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= Netflix WRKSRC_SUBDIR= lib${PORTNAME} post-install: # For legacy API consumers e.g., aom, x265 (cd ${WRKSRC:H} && ${COPYTREE_SHARE} "model" \ ${STAGEDIR}${DATADIR:H} "-name *.json") .include diff --git a/multimedia/vmaf/distinfo b/multimedia/vmaf/distinfo index cac31e7d4905..3ff7c7a03b98 100644 --- a/multimedia/vmaf/distinfo +++ b/multimedia/vmaf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1775155316 -SHA256 (Netflix-vmaf-v3.1.0_GH0.tar.gz) = 80090e29d7fd0db472ddc663513f5be89bc936815e62b767e630c1d627279fe2 -SIZE (Netflix-vmaf-v3.1.0_GH0.tar.gz) = 18184375 +TIMESTAMP = 1781916669 +SHA256 (Netflix-vmaf-v3.2.0_GH0.tar.gz) = a28f93f3b4fa65601be324587072e32a6a704a304ba7b1aec9b70b3f709bc1dc +SIZE (Netflix-vmaf-v3.2.0_GH0.tar.gz) = 18583070 diff --git a/multimedia/vmaf/files/patch-i386 b/multimedia/vmaf/files/patch-i386 deleted file mode 100644 index b78a3e22aaaa..000000000000 --- a/multimedia/vmaf/files/patch-i386 +++ /dev/null @@ -1,76 +0,0 @@ -https://github.com/Netflix/vmaf/issues/1481 - ---- src/feature/integer_adm.c.orig 2026-04-02 18:41:56 UTC -+++ src/feature/integer_adm.c -@@ -2646,7 +2646,9 @@ static int init(VmafFeatureExtractor *fex, enum VmafPi - s->i4_adm_csf = i4_adm_csf_avx2; - s->i4_adm_cm = i4_adm_cm_avx2; - s->adm_decouple = adm_decouple_avx2; -+#if ARCH_X86_64 - s->adm_decouple_s123 = adm_decouple_s123_avx2; -+#endif - } - #if HAVE_AVX512 - if (flags & VMAF_X86_CPU_FLAG_AVX512) { -@@ -2660,7 +2662,9 @@ static int init(VmafFeatureExtractor *fex, enum VmafPi - s->i4_adm_csf = i4_adm_csf_avx512; - s->i4_adm_cm = i4_adm_cm_avx512; - s->adm_decouple = adm_decouple_avx512; -+#if ARCH_X86_64 - s->adm_decouple_s123 = adm_decouple_s123_avx512; -+#endif - } - #endif - #elif ARCH_AARCH64 ---- src/feature/x86/adm_avx2.c.orig 2026-04-02 18:41:56 UTC -+++ src/feature/x86/adm_avx2.c -@@ -16,6 +16,7 @@ - * - */ - -+#include "config.h" - #include "feature/integer_adm.h" - #include - -@@ -1352,6 +1353,7 @@ static inline __m256i sra_epi64(__m256i a, __m256i mas - return _mm256_or_si256(rl_shift, signmask); - } - -+#if ARCH_X86_64 - // No lzcnt in avx2 - void adm_decouple_s123_avx2(AdmBuffer *buf, int w, int h, int stride, - double adm_enhn_gain_limit, int32_t* adm_div_lookup) -@@ -1879,6 +1881,7 @@ void adm_decouple_s123_avx2(AdmBuffer *buf, int w, int - } - } - } -+#endif - - /* - * lambda = 0 (finest scale), 1, 2, 3 (coarsest scale); ---- src/feature/x86/adm_avx512.c.orig 2026-04-02 18:41:56 UTC -+++ src/feature/x86/adm_avx512.c -@@ -16,6 +16,7 @@ - * - */ - -+#include "config.h" - #include "feature/integer_adm.h" - #include "adm_avx512.h" - #include -@@ -1115,6 +1116,7 @@ angle_flag = ((((float)ot_dp / 4096.0) >= 0.0f) && \ - cos_1deg_sq * ((float)o_mag_sq / 4096.0) * ((float)t_mag_sq / 4096.0))); \ - } \ - -+#if ARCH_X86_64 - void adm_decouple_s123_avx512(AdmBuffer *buf, int w, int h, int stride, - double adm_enhn_gain_limit, int32_t* adm_div_lookup) - { -@@ -1534,6 +1536,7 @@ void adm_decouple_s123_avx512(AdmBuffer *buf, int w, i - } - } - } -+#endif - - - diff --git a/multimedia/vmaf/pkg-plist b/multimedia/vmaf/pkg-plist index de8f6ae997f0..0cc404211ae6 100644 --- a/multimedia/vmaf/pkg-plist +++ b/multimedia/vmaf/pkg-plist @@ -1,28 +1,36 @@ bin/vmaf include/libvmaf/feature.h include/libvmaf/libvmaf.h include/libvmaf/model.h include/libvmaf/picture.h include/libvmaf/version.h lib/libvmaf.a lib/libvmaf.so lib/libvmaf.so.3 -lib/libvmaf.so.3.0.0 +lib/libvmaf.so.3.2.0 libdata/pkgconfig/libvmaf.pc share/model/other_models/nflx_v1.json share/model/other_models/nflxtrain_norm_type_none.json share/model/other_models/vmaf_v0.6.0.json share/model/other_models/vmaf_v0.6.1mfz.json share/model/vmaf_4k_rb_v0.6.2/vmaf_4k_rb_v0.6.2.json share/model/vmaf_4k_v0.6.1.json share/model/vmaf_4k_v0.6.1neg.json share/model/vmaf_b_v0.6.3.json share/model/vmaf_float_4k_v0.6.1.json share/model/vmaf_float_b_v0.6.3.json share/model/vmaf_float_b_v0.6.3/vmaf_float_b_v0.6.3.json share/model/vmaf_float_v0.6.1.json share/model/vmaf_float_v0.6.1neg.json share/model/vmaf_rb_v0.6.2/vmaf_rb_v0.6.2.json share/model/vmaf_rb_v0.6.3/vmaf_rb_v0.6.3.json share/model/vmaf_v0.6.1.json share/model/vmaf_v0.6.1neg.json +share/model/vmaf_v1.0.16/vmaf_v1.0.16_1d5h_2160.json +share/model/vmaf_v1.0.16/vmaf_v1.0.16_3d0h.json +share/model/vmaf_v1.0.16/vmaf_v1.0.16_3d0h_2160.json +share/model/vmaf_v1.0.16/vmaf_v1.0.16_5d0h.json +share/model/vmaf_v1.0.16_hfr/vmaf_v1.0.16_hfr_1d5h_2160.json +share/model/vmaf_v1.0.16_hfr/vmaf_v1.0.16_hfr_3d0h.json +share/model/vmaf_v1.0.16_hfr/vmaf_v1.0.16_hfr_3d0h_2160.json +share/model/vmaf_v1.0.16_hfr/vmaf_v1.0.16_hfr_5d0h.json