svn commit: r527426 - in head/multimedia: aom aom/files ffmpeg vapoursynth-vmaf vmaf vmaf/files x265 x265/files
Jan Beich
jbeich at FreeBSD.org
Sat Feb 29 15:54:00 UTC 2020
Author: jbeich
Date: Sat Feb 29 15:53:56 2020
New Revision: 527426
URL: https://svnweb.freebsd.org/changeset/ports/527426
Log:
multimedia/vmaf: update to 1.5.1
Changes: https://github.com/Netflix/vmaf/releases/tag/v1.5.1
Reported by: GitHub (watch releases)
Added:
head/multimedia/aom/files/patch-CMakeLists.txt (contents, props changed)
head/multimedia/x265/files/patch-source_encoder_api.cpp (contents, props changed)
Deleted:
head/multimedia/aom/files/patch-aom__dsp_vmaf.c
head/multimedia/vmaf/files/
Modified:
head/multimedia/aom/Makefile (contents, props changed)
head/multimedia/ffmpeg/Makefile (contents, props changed)
head/multimedia/vapoursynth-vmaf/Makefile (contents, props changed)
head/multimedia/vmaf/Makefile (contents, props changed)
head/multimedia/vmaf/distinfo (contents, props changed)
head/multimedia/vmaf/pkg-plist (contents, props changed)
head/multimedia/x265/Makefile (contents, props changed)
Modified: head/multimedia/aom/Makefile
==============================================================================
--- head/multimedia/aom/Makefile Sat Feb 29 15:53:47 2020 (r527425)
+++ head/multimedia/aom/Makefile Sat Feb 29 15:53:56 2020 (r527426)
@@ -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 at 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
Added: head/multimedia/aom/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/aom/files/patch-CMakeLists.txt Sat Feb 29 15:53:56 2020 (r527426)
@@ -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()
Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile Sat Feb 29 15:53:47 2020 (r527425)
+++ head/multimedia/ffmpeg/Makefile Sat Feb 29 15:53:56 2020 (r527426)
@@ -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
Modified: head/multimedia/vapoursynth-vmaf/Makefile
==============================================================================
--- head/multimedia/vapoursynth-vmaf/Makefile Sat Feb 29 15:53:47 2020 (r527425)
+++ head/multimedia/vapoursynth-vmaf/Makefile Sat Feb 29 15:53:56 2020 (r527426)
@@ -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 f
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
Modified: head/multimedia/vmaf/Makefile
==============================================================================
--- head/multimedia/vmaf/Makefile Sat Feb 29 15:53:47 2020 (r527425)
+++ head/multimedia/vmaf/Makefile Sat Feb 29 15:53:56 2020 (r527426)
@@ -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 at 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>
Modified: head/multimedia/vmaf/distinfo
==============================================================================
--- head/multimedia/vmaf/distinfo Sat Feb 29 15:53:47 2020 (r527425)
+++ head/multimedia/vmaf/distinfo Sat Feb 29 15:53:56 2020 (r527426)
@@ -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
Modified: head/multimedia/vmaf/pkg-plist
==============================================================================
--- head/multimedia/vmaf/pkg-plist Sat Feb 29 15:53:47 2020 (r527425)
+++ head/multimedia/vmaf/pkg-plist Sat Feb 29 15:53:56 2020 (r527426)
@@ -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
Modified: head/multimedia/x265/Makefile
==============================================================================
--- head/multimedia/x265/Makefile Sat Feb 29 15:53:47 2020 (r527425)
+++ head/multimedia/x265/Makefile Sat Feb 29 15:53:56 2020 (r527426)
@@ -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
Added: head/multimedia/x265/files/patch-source_encoder_api.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/x265/files/patch-source_encoder_api.cpp Sat Feb 29 15:53:56 2020 (r527426)
@@ -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 */
More information about the svn-ports-all
mailing list