git: a57fa8802ae7 - main - multimedia/vmaf: update to 3.0.0.r

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Tue, 21 Nov 2023 17:24:54 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a57fa8802ae73f4c933258ab3758d5aeba122ea4

commit a57fa8802ae73f4c933258ab3758d5aeba122ea4
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-11-20 19:15:15 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-11-21 17:22:09 +0000

    multimedia/vmaf: update to 3.0.0.r
    
    Changes:        https://github.com/Netflix/vmaf/releases/tag/v3.0.0-rc
    Reported by:    GitHub (watch releases)
---
 multimedia/aom/Makefile                 |  1 +
 multimedia/ffmpeg/Makefile              |  1 +
 multimedia/ffmpeg4/Makefile             |  2 +-
 multimedia/vapoursynth-vmaf/Makefile    |  2 +-
 multimedia/vmaf/Makefile                |  2 +-
 multimedia/vmaf/distinfo                |  6 +++---
 multimedia/vmaf/files/patch-meson.build | 16 ----------------
 multimedia/vmaf/pkg-plist               |  2 +-
 multimedia/x265/Makefile                |  2 +-
 9 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 9bffdf6e9e49..c4659f001b76 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.7.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 8292d7c9ffda..b38aee5bfd87 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	6.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
diff --git a/multimedia/ffmpeg4/Makefile b/multimedia/ffmpeg4/Makefile
index 152477f2adbf..12c7c204d2e8 100644
--- a/multimedia/ffmpeg4/Makefile
+++ b/multimedia/ffmpeg4/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	ffmpeg
 PORTVERSION=	4.4.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
 PKGNAMESUFFIX=	4
diff --git a/multimedia/vapoursynth-vmaf/Makefile b/multimedia/vapoursynth-vmaf/Makefile
index 99ad8bd3d701..9e38691ab187 100644
--- a/multimedia/vapoursynth-vmaf/Makefile
+++ b/multimedia/vapoursynth-vmaf/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vmaf
 DISTVERSION=	r7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	vapoursynth-
 
diff --git a/multimedia/vmaf/Makefile b/multimedia/vmaf/Makefile
index 1a83b174baf9..33cb60a3ded0 100644
--- a/multimedia/vmaf/Makefile
+++ b/multimedia/vmaf/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vmaf
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.3.1
+DISTVERSION=	3.0.0-rc
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/multimedia/vmaf/distinfo b/multimedia/vmaf/distinfo
index ebc85859117a..7bb27809b353 100644
--- a/multimedia/vmaf/distinfo
+++ b/multimedia/vmaf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649696797
-SHA256 (Netflix-vmaf-v2.3.1_GH0.tar.gz) = 8d60b1ddab043ada25ff11ced821da6e0c37fd7730dd81c24f1fc12be7293ef2
-SIZE (Netflix-vmaf-v2.3.1_GH0.tar.gz) = 18388094
+TIMESTAMP = 1700507715
+SHA256 (Netflix-vmaf-v3.0.0-rc_GH0.tar.gz) = e696a2699b44e548d4b5eba83ce5c1d5041d78039047c4a0ed7e725c6879d0a4
+SIZE (Netflix-vmaf-v3.0.0-rc_GH0.tar.gz) = 18109964
diff --git a/multimedia/vmaf/files/patch-meson.build b/multimedia/vmaf/files/patch-meson.build
deleted file mode 100644
index 7ceac1aea3a1..000000000000
--- a/multimedia/vmaf/files/patch-meson.build
+++ /dev/null
@@ -1,16 +0,0 @@
-../src/cpu_info.c:37:20: error: use of undeclared identifier '_SC_NPROCESSORS_ONLN'
-    return sysconf(_SC_NPROCESSORS_ONLN);
-                   ^
-
---- meson.build.orig	2020-06-30 19:00:42 UTC
-+++ meson.build
-@@ -26,9 +26,6 @@ if host_machine.system() == 'linux'
- elif host_machine.system() == 'darwin'
-     test_args += '-D_DARWIN_C_SOURCE'
-     add_project_arguments('-D_DARWIN_C_SOURCE', language: 'c')
--else
--    test_args += '-D_POSIX_C_SOURCE=200112L'
--    add_project_arguments('-D_POSIX_C_SOURCE=200112L', language: 'c')
- endif
- 
- # Header checks
diff --git a/multimedia/vmaf/pkg-plist b/multimedia/vmaf/pkg-plist
index 51728bd70407..1165f5c2b496 100644
--- a/multimedia/vmaf/pkg-plist
+++ b/multimedia/vmaf/pkg-plist
@@ -1,5 +1,4 @@
 bin/vmaf
-include/libvmaf/compute_vmaf.h
 include/libvmaf/feature.h
 include/libvmaf/libvmaf.h
 include/libvmaf/model.h
@@ -16,6 +15,7 @@ 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
diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index c913e215be90..59275b34e4bc 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	x265
 PORTVERSION=	3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	https://bitbucket.org/multicoreware/x265_git/get/${BB_TAG}.tar.gz?meow=/