multimedia/vmaf: update to 1.5.1

Changes:	https://github.com/Netflix/vmaf/releases/tag/v1.5.1
Reported by:	GitHub (watch releases)

11 files changed, 59 insertions, 73 deletions

diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 5234ece77583..f259ad7d3d42 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -5,6 +5,7 @@ DISTVERSIONPREFIX=	v
 # XXX Switch to release after https://bugs.chromium.org/p/aomedia/issues/detail?id=2545
 DISTVERSION=	1.0.0-3149
 DISTVERSIONSUFFIX=	-gb43603d76
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -28,7 +29,7 @@ CMAKE_OFF=	ENABLE_DOCS ENABLE_TESTS
 OPTIONS_DEFINE=	VMAF
 
 VMAF_DESC=		Encoding tuning for VMAF
-VMAF_BUILD_DEPENDS=	${LOCALBASE}/lib/libvmaf.a:multimedia/vmaf
+VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
 VMAF_USES=		localbase:ldflags
 VMAF_CMAKE_ON=		-DCONFIG_TUNE_VMAF:STRING=1
 
diff --git a/multimedia/aom/files/patch-CMakeLists.txt b/multimedia/aom/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..9aa4db0efa80
--- /dev/null
+++ b/multimedia/aom/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+- Prefer linking against shared libvmaf (since 1.5.1)
+
+--- CMakeLists.txt.orig	2020-02-26 23:23:16 UTC
++++ CMakeLists.txt
+@@ -424,7 +424,7 @@ if(CONFIG_AV1_ENCODER)
+               ${AOM_ENCODER_TOOL_TARGETS})
+ 
+   if(CONFIG_TUNE_VMAF)
+-    find_library(VMAF libvmaf.a vmaf)
++    find_library(VMAF vmaf)
+     if(NOT VMAF)
+       message(FATAL_ERROR "VMAF library not found.")
+     endif()
diff --git a/multimedia/aom/files/patch-aom__dsp_vmaf.c b/multimedia/aom/files/patch-aom__dsp_vmaf.c
deleted file mode 100644
index c93200a85681..000000000000
--- a/multimedia/aom/files/patch-aom__dsp_vmaf.c
+++ /dev/null
@@ -1,20 +0,0 @@
-Allow building before https://github.com/Netflix/vmaf/commit/82a86e040371
-
-aom_dsp/vmaf.c:12:10: fatal error: 'libvmaf/libvmaf.h' file not found
-#include <libvmaf/libvmaf.h>
-         ^~~~~~~~~~~~~~~~~~~
-
---- aom_dsp/vmaf.c.orig	2020-02-07 16:59:05 UTC
-+++ aom_dsp/vmaf.c
-@@ -10,7 +10,11 @@
-  */
- 
- #include <assert.h>
-+#if __has_include(<libvmaf/libvmaf.h>)
- #include <libvmaf/libvmaf.h>
-+#else
-+#include <libvmaf.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 609ead04b681..b453fbb42f18 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	4.2.2
-PORTREVISION=	6
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
@@ -533,7 +533,7 @@ VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
 
 # vmaf
-VMAF_BUILD_DEPENDS=	${LOCALBASE}/lib/libvmaf.a:multimedia/vmaf
+VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
 VMAF_CONFIGURE_ENABLE=	libvmaf
 
 # armv6/armv7
diff --git a/multimedia/vapoursynth-vmaf/Makefile b/multimedia/vapoursynth-vmaf/Makefile
index 3d35dc1d67b8..b7f563b519d4 100644
--- a/multimedia/vapoursynth-vmaf/Makefile
+++ b/multimedia/vapoursynth-vmaf/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	vmaf
 DISTVERSION=	r6
+PORTREVISION=	1
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	vapoursynth-
 
@@ -11,8 +12,8 @@ COMMENT=	Video Multi-Method Assessment Fusion plugin for VapourSynth
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/vapoursynth/VSHelper.h:multimedia/vapoursynth \
-		${LOCALBASE}/lib/libvmaf.a:multimedia/vmaf
+BUILD_DEPENDS=	${LOCALBASE}/include/vapoursynth/VSHelper.h:multimedia/vapoursynth
+LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
 
 USES=		compiler:c++17-lang meson pkgconfig
 USE_GITHUB=	yes
diff --git a/multimedia/vmaf/Makefile b/multimedia/vmaf/Makefile
index 2654d03d21dd..24df06c037a9 100644
--- a/multimedia/vmaf/Makefile
+++ b/multimedia/vmaf/Makefile
@@ -2,32 +2,28 @@
 
 PORTNAME=	vmaf
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.3.15
+DISTVERSION=	1.5.1
 CATEGORIES=	multimedia
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	16e2321c3bf9.patch:-p2 # https://github.com/Netflix/vmaf/pull/511
+
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Perceptual video quality assessment based on multi-method fusion
 
-LICENSE=	APACHE20
+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
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		compiler:c11 gmake
+USES=		compiler:c++11-lib meson
 USE_GITHUB=	yes
+USE_LDCONFIG=	yes
 GH_ACCOUNT=	Netflix
-MAKE_ARGS=	INSTALL_PREFIX="${PREFIX}"
+WRKSRC_SUBDIR=	lib${PORTNAME}
 CFLAGS_i386=	-msse # https://github.com/Netflix/vmaf/issues/374
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^CC[[:>:]]/d' \
-		-e '/FLAGS =/s/=/+=/' \
-		-e 's/ -O[[:>:]]//; s/ -O[0-9]//; s/ -g//' \
-		-e '/^CCFLAGS/s/$$/ $$(LDFLAGS)/' \
-		${WRKSRC}/ptools/Makefile.VMAF \
-		${WRKSRC}/*/Makefile
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/wrapper/vmafossexec \
-		${STAGEDIR}${PREFIX}/bin
-
 .include <bsd.port.mk>
diff --git a/multimedia/vmaf/distinfo b/multimedia/vmaf/distinfo
index 771db884043f..e0b12124e69e 100644
--- a/multimedia/vmaf/distinfo
+++ b/multimedia/vmaf/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1567967754
-SHA256 (Netflix-vmaf-v1.3.15_GH0.tar.gz) = 43bbb484102c4d976da4a10d896fb9a11838c8aa809e9c017d5b3edb225b528d
-SIZE (Netflix-vmaf-v1.3.15_GH0.tar.gz) = 68124392
+TIMESTAMP = 1582903763
+SHA256 (Netflix-vmaf-v1.5.1_GH0.tar.gz) = 9267b40223ac8d67fb6b99726ce7ed3925b9843f18ad5aa8ffbe2fe873e45cbe
+SIZE (Netflix-vmaf-v1.5.1_GH0.tar.gz) = 69737692
+SHA256 (16e2321c3bf9.patch) = 75c4605c4764326b7d442f8df7511228f5a9ba2ca35cfcbd4fc34c02d747f702
+SIZE (16e2321c3bf9.patch) = 1101
diff --git a/multimedia/vmaf/files/patch-stat64 b/multimedia/vmaf/files/patch-stat64
deleted file mode 100644
index 2ffff50f6422..000000000000
--- a/multimedia/vmaf/files/patch-stat64
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/Netflix/vmaf/pull/373
-
---- wrapper/Makefile.orig	2019-09-08 18:35:54 UTC
-+++ wrapper/Makefile
-@@ -56,7 +56,7 @@ CFLAGS_COMMON = -g -O3 -fPIC -w -Wextra -pedantic -D M
- 
- CFLAGS   := -std=c99 $(CFLAGS_COMMON) $(CFLAGS)
- CXXFLAGS := -std=c++11 $(CFLAGS_COMMON) $(CXXFLAGS)
--CPPFLAGS := $(CPPFLAGS)
-+CPPFLAGS := -D_FILE_OFFSET_BITS=64 $(CPPFLAGS)
- LDFLAGS  := $(LDFLAGS)
- 
- $(AVX_OBJS): EXTRA_CFLAGS := -mavx
---- wrapper/src/main.cpp.orig	2019-09-08 18:35:54 UTC
-+++ wrapper/src/main.cpp
-@@ -167,8 +167,8 @@ int run_wrapper(char *fmt, int width, int height, char
-         struct _stat64 ref_stat;
-         if (!_stat64(ref_path, &ref_stat))
- #else
--        struct stat64 ref_stat;
--        if (!stat64(ref_path, &ref_stat))
-+        struct stat ref_stat;
-+        if (!stat(ref_path, &ref_stat))
- #endif
-         {
-             size_t frame_size = width * height + s->offset;
diff --git a/multimedia/vmaf/pkg-plist b/multimedia/vmaf/pkg-plist
index 9f6621eac654..edd240203e3d 100644
--- a/multimedia/vmaf/pkg-plist
+++ b/multimedia/vmaf/pkg-plist
@@ -1,6 +1,8 @@
 bin/vmafossexec
-include/libvmaf.h
+include/libvmaf/libvmaf.h
+include/libvmaf/version.h
 lib/libvmaf.a
+lib/libvmaf.so
 libdata/pkgconfig/libvmaf.pc
 share/model/other_models/model_V8a.model
 share/model/other_models/nflx_v1.pkl
diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index 5281b7a2004e..3508f4e07053 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	x265
 PORTVERSION=	3.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	https://bitbucket.org/multicoreware/x265/downloads/ \
 		https://downloads.videolan.org/pub/videolan/x265/ \
@@ -39,7 +39,7 @@ OPTIMIZED_FLAGS_VARS=	CFLAGS+=-O3
 SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
 SVTHEVC_CMAKE_BOOL=	ENABLE_SVT_HEVC
 SVTHEVC_CMAKE_ON=	-DSVT_HEVC_INCLUDE_DIR:PATH="${LOCALBASE}/include/svt-hevc"
-VMAF_BUILD_DEPENDS=	${LOCALBASE}/lib/libvmaf.a:multimedia/vmaf
+VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
 VMAF_USES=		localbase:ldflags
 VMAF_CMAKE_BOOL=	ENABLE_LIBVMAF
 
diff --git a/multimedia/x265/files/patch-source_encoder_api.cpp b/multimedia/x265/files/patch-source_encoder_api.cpp
new file mode 100644
index 000000000000..c28fc32b6445
--- /dev/null
+++ b/multimedia/x265/files/patch-source_encoder_api.cpp
@@ -0,0 +1,17 @@
+Chase https://github.com/Netflix/vmaf/commit/82a86e040371
+
+source/encoder/api.cpp:36:10: fatal error: 'libvmaf.h' file not found
+#include "libvmaf.h"
+         ^~~~~~~~~~~
+
+--- source/encoder/api.cpp.orig	2019-10-29 11:55:05 UTC
++++ source/encoder/api.cpp
+@@ -33,7 +33,7 @@
+ #include "svt.h"
+ 
+ #if ENABLE_LIBVMAF
+-#include "libvmaf.h"
++#include "libvmaf/libvmaf.h"
+ #endif
+ 
+ /* multilib namespace reflectors */