multimedia/svt-hevc: update to 1.4.0

Changes:	https://github.com/OpenVisualCloud/SVT-HEVC/releases/tag/v1.4.0
Reported by:	GitHub (watch releases)
This commit is contained in:
Jan Beich 2019-08-09 20:37:23 +00:00
parent 1057ceca27
commit 6d3174fe65
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=508479
10 changed files with 21 additions and 113 deletions

View File

@ -3,6 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 4.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= multimedia audio ipv6 net
MASTER_SITES= https://ffmpeg.org/releases/
@ -451,7 +452,7 @@ SVTAV1_PREVENTS_MSG= Only one SVT vendor patch can be applied at the same time
# svt-hevc
SVTHEVC_LIB_DEPENDS= libSvtHevcEnc.so:multimedia/svt-hevc
SVTHEVC_CONFIGURE_ON= --enable-libsvthevc
SVTHEVC_PATCH_SITES= https://github.com/Intel/SVT-HEVC/raw/v1.3.0/ffmpeg_plugin/:svthevc
SVTHEVC_PATCH_SITES= https://github.com/Intel/SVT-HEVC/raw/v1.4.0/ffmpeg_plugin/:svthevc
SVTHEVC_PATCHFILES= 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
.if make(makesum)

View File

@ -3,9 +3,9 @@ SHA256 (ffmpeg-4.2.tar.xz) = 023f10831a97ad93d798f53a3640e55cd564abfeba807ecbe85
SIZE (ffmpeg-4.2.tar.xz) = 9088756
SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 898dbbdb21cfafbb19381463382467fbe5c5a78ca3844f8c5583fa919b7d5a82
SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 19723
SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = cc8ba4ff56cdb38a59650203999c4c8c83fc40bdb905b87b678ff68a4538444d
SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 22815
SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 516c5a1b3ab6dc444e2270a1bae90455838fc3b7e3a18de37d7d63e25e79493d
SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5602
SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = d9bd8345ff994c26d5174759d460c723e92012139e29dd015fe83537e29a9554
SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 20927
SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 295220f498680d893bec525321e657dc3cdb98080a7117d1f575cd0508996a0e
SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5273
SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = d2abcdcbcbff21e7ad8de574230622be993da19e9bddf0a690b1118cfd11c6c1
SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 21580

View File

@ -2,8 +2,7 @@
PORTNAME= svt-hevc
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.0-32
DISTVERSIONSUFFIX= -ga0dcd77
DISTVERSION= 1.4.0
CATEGORIES= multimedia
PKGNAMEPREFIX= gstreamer1-plugins-

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1557301098
SHA256 (OpenVisualCloud-SVT-HEVC-v1.3.0-32-ga0dcd77_GH0.tar.gz) = cfff9280afd366bea73d093bdfa0a82b700345f09ce486ef7edc0399ab1fab13
SIZE (OpenVisualCloud-SVT-HEVC-v1.3.0-32-ga0dcd77_GH0.tar.gz) = 1165629
TIMESTAMP = 1565309873
SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 7bb2ed0d6a46dbb6478127762b12f3d21a7901fd68876ce61f91360c5c52798e
SIZE (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 1225319

View File

@ -1,19 +0,0 @@
encoderColorFormat was added after 1.3.0, so omit it for now.
../gstsvthevcenc.c:732:15: error: no member named 'encoderColorFormat' in 'struct EB_H265_ENC_CONFIGURATION'
svt_config->encoderColorFormat = EB_YUV420;
~~~~~~~~~~ ^
../gstsvthevcenc.c:732:36: error: use of undeclared identifier 'EB_YUV420'
svt_config->encoderColorFormat = EB_YUV420;
^
--- gstsvthevcenc.c.orig 2019-03-27 13:22:12 UTC
+++ gstsvthevcenc.c
@@ -729,7 +729,6 @@ set_default_svt_configuration (EB_H265_ENC_CONFIGURATI
svt_config->recoveryPointSeiFlag = FALSE;
svt_config->enableTemporalId = 1;
svt_config->encoderBitDepth = 8;
- svt_config->encoderColorFormat = EB_YUV420;
svt_config->compressedTenBitFormat = FALSE;
svt_config->profile = 1;
svt_config->tier = 0;

View File

@ -2,14 +2,9 @@
PORTNAME= svt-hevc
DISTVERSIONPREFIX= v
DISTVERSION= 1.3.0
PORTREVISION= 3
DISTVERSION= 1.4.0
CATEGORIES= multimedia
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= ad0942db4ce4.patch:-p1
PATCHFILES+= 87e168e78620.patch:-p1
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Scalable HEVC encoder
@ -29,30 +24,19 @@ USE_GITHUB= yes
USE_LDCONFIG= yes
GH_ACCOUNT= OpenVisualCloud
GH_PROJECT= SVT-HEVC
CMAKE_ON= BUILD_SHARED_LIBS
CMAKE_OFF= NATIVE
post-patch:
# Default CFLAGS are already set by USES=cmake
@${REINPLACE_CMD} -i .flags -E -e 's/ -march=native//' \
-e 's/-O2 -flto //' \
-e '/C_FLAGS_(RELEASE|DEBUG)/d' \
-e '/NASM_FLAGS_DEBUG/d' \
# Keep using nasm and drop vendor -O/-g
@${REINPLACE_CMD} -e '/find_program.*yasm/d' \
-Ee '/set.*(release|debug)_flags_to_test/,/\)/d' \
${WRKSRC}/CMakeLists.txt
# Avoid devel/yasm dependency
@${REINPLACE_CMD} -i .typo 's/[[:<:]]MAKE_ASM_NASM_COMPILER/C&/' \
${WRKSRC}/CMakeLists.txt
# Avoid lang/gcc* dependency
@${REINPLACE_CMD} -i .gcc -e 's/gcc-//' \
-e '/CMAKE_C/{ s/STREQUAL/MATCHES/; s/"GNU/&|Clang/; }' \
${WRKSRC}/CMakeLists.txt \
${WRKSRC}/Source/Lib/*/CMakeLists.txt
# Avoid conflict with standard types
@${GREP} -Flr '_T_DEFINED' ${WRKSRC} | ${XARGS} \
${REINPLACE_CMD} -i .types 's/_T_DEFINED/_DEFINED/'
# Avoid platform whitelists for generic non-Windows code
@${REINPLACE_CMD} -i .opsys 's/Linux/${OPSYS}/' \
${WRKSRC}/CMakeLists.txt \
${WRKSRC}/Source/Lib/*/CMakeLists.txt
@${GREP} --exclude='*/third_party/*' -Flr '__linux' ${WRKSRC} | ${XARGS} \
${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__${OPSYS}__/'
${REINPLACE_CMD} -i .opsys -E 's/__linux(__)?/__unix__/'
.include <bsd.port.mk>

View File

@ -1,7 +1,3 @@
TIMESTAMP = 1550104614
SHA256 (OpenVisualCloud-SVT-HEVC-v1.3.0_GH0.tar.gz) = ef21f3a13e33b4f61af4a0c79337ce9e4f73f6fe13d1c2afe2c3b0712f4158d9
SIZE (OpenVisualCloud-SVT-HEVC-v1.3.0_GH0.tar.gz) = 1137878
SHA256 (ad0942db4ce4.patch) = 2165f1b1d658dbbac91f8a2e86976f6692f93fcc6649feacbc6013d811874f48
SIZE (ad0942db4ce4.patch) = 864
SHA256 (87e168e78620.patch) = c540e265016dfda819fe7086070d39804e4205b45a2fa94800406798c5839d1c
SIZE (87e168e78620.patch) = 685
TIMESTAMP = 1565309873
SHA256 (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 7bb2ed0d6a46dbb6478127762b12f3d21a7901fd68876ce61f91360c5c52798e
SIZE (OpenVisualCloud-SVT-HEVC-v1.4.0_GH0.tar.gz) = 1225319

View File

@ -1,5 +1,4 @@
bin/SvtHevcEncApp
bin/SvtHevcEncSimpleApp
include/svt-hevc/EbApi.h
include/svt-hevc/EbErrorCodes.h
include/svt-hevc/EbTime.h

View File

@ -3,6 +3,7 @@
PORTNAME= x265
PORTVERSION= 3.1.2
PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= https://bitbucket.org/multicoreware/x265/downloads/ \
https://downloads.videolan.org/pub/videolan/x265/ \

View File

@ -1,53 +0,0 @@
encoderColorFormat, tileColumnCount, etc. were added after 1.3.0, so omit it for now.
source/x265.cpp:570:13: error: no member named 'encoderColorFormat' in 'EB_H265_ENC_CONFIGURATION'
svtParam->encoderColorFormat = (EB_COLOR_FORMAT)param->internalCsp;
~~~~~~~~ ^
source/x265.cpp:570:35: error: use of undeclared identifier 'EB_COLOR_FORMAT'
svtParam->encoderColorFormat = (EB_COLOR_FORMAT)param->internalCsp;
^
source/common/param.cpp:2505:19: error: no member named 'tileColumnCount' in 'EB_H265_ENC_CONFIGURATION'
svtHevcParam->tileColumnCount = 1;
~~~~~~~~~~~~ ^
source/common/param.cpp:2506:19: error: no member named 'tileRowCount' in 'EB_H265_ENC_CONFIGURATION'
svtHevcParam->tileRowCount = 1;
~~~~~~~~~~~~ ^
source/common/param.cpp:2507:19: error: no member named 'tileSliceMode' in 'EB_H265_ENC_CONFIGURATION'
svtHevcParam->tileSliceMode = 0;
~~~~~~~~~~~~ ^
source/common/param.cpp:2508:19: error: no member named 'unrestrictedMotionVector' in 'EB_H265_ENC_CONFIGURATION'
svtHevcParam->unrestrictedMotionVector = 1;
~~~~~~~~~~~~ ^
--- source/common/param.cpp.orig 2019-07-08 11:10:19 UTC
+++ source/common/param.cpp
@@ -2454,7 +2454,6 @@ void svt_param_default(x265_param* param)
svtHevcParam->frameRateNumerator = 0;
svtHevcParam->frameRateDenominator = 0;
svtHevcParam->encoderBitDepth = 8;
- svtHevcParam->encoderColorFormat = EB_YUV420;
svtHevcParam->compressedTenBitFormat = 0;
svtHevcParam->rateControlMode = 0;
svtHevcParam->sceneChangeDetection = 1;
@@ -2502,11 +2501,6 @@ void svt_param_default(x265_param* param)
svtHevcParam->logicalProcessors = 0;
svtHevcParam->switchThreadsToRtPriority = 1;
svtHevcParam->fpsInVps = 0;
-
- svtHevcParam->tileColumnCount = 1;
- svtHevcParam->tileRowCount = 1;
- svtHevcParam->tileSliceMode = 0;
- svtHevcParam->unrestrictedMotionVector = 1;
}
int svt_set_preset_tune(x265_param* param, const char* preset, const char* tune)
--- source/x265.cpp.orig 2019-07-08 11:10:19 UTC
+++ source/x265.cpp
@@ -567,7 +567,6 @@ bool CLIOptions::parse(int argc, char **argv)
svtParam->frameRateNumerator = param->fpsNum;
svtParam->frameRateDenominator = param->fpsDenom;
svtParam->framesToBeEncoded = param->totalFrames;
- svtParam->encoderColorFormat = (EB_COLOR_FORMAT)param->internalCsp;
}
#endif