diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-07-24 04:48:18 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-07-24 04:48:18 +0000 |
| commit | 2bce300d75a895a8fbfcc14ea832a70ccbaa3ba7 (patch) | |
| tree | 069933dc4266832ec191f47d29b9dbddce6d0faf /multimedia | |
| parent | f857a760cc46ac0a3010c993c93fe9f429321876 (diff) | |
| download | ports-2bce300d75a895a8fbfcc14ea832a70ccbaa3ba7.tar.gz ports-2bce300d75a895a8fbfcc14ea832a70ccbaa3ba7.zip | |
MFH: r542999
multimedia/ffmpeg: revert r538687 after r541984/r542846
SVT patches no longer need to be applied in a specific order to enable
more than one SVT encoder.
PR: 248166
Submitted by: VVD <vvd@unislabs.com>
Approved by: ports-secteam (joneum)
Notes
Notes:
svn path=/branches/2020Q3/; revision=543001
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 31 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 4 |
2 files changed, 21 insertions, 14 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 1abdcc2a0746..6178cdc0ac2b 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -7,9 +7,6 @@ PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ -PATCH_SITES= ${SVTHEVC_PATCH_SITES_} ${SVTAV1_PATCH_SITES_} ${SVTVP9_PATCH_SITES_} -PATCHFILES= ${SVTHEVC_PATCHFILES_} ${SVTAV1_PATCHFILES_} ${SVTVP9_PATCHFILES_} - MAINTAINER= multimedia@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server @@ -455,32 +452,42 @@ SRT_CONFIGURE_ENABLE= libsrt # svt-av1 SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1 -SVTAV1_CONFIGURE_ENABLE= libsvtav1 -SVTAV1_PATCH_SITES_= https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.4/ffmpeg_plugin/:svtav1 -SVTAV1_PATCHFILES_= 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1 +SVTAV1_CONFIGURE_ON= --enable-libsvtav1 +SVTAV1_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.4/ffmpeg_plugin/:svtav1 +SVTAV1_PATCHFILES= 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) # https://github.com/OpenVisualCloud/SVT-AV1/issues/691 SVTAV1_LDFLAGS= -fuse-ld=lld .endif +.if make(makesum) +.MAKEFLAGS: WITH+=SVTAV1 +.endif # svt-hevc SVTHEVC_LIB_DEPENDS= libSvtHevcEnc.so:multimedia/svt-hevc -SVTHEVC_CONFIGURE_ENABLE= libsvthevc -SVTHEVC_PATCH_SITES_= https://github.com/Intel/SVT-HEVC/raw/v1.4.3/ffmpeg_plugin/:svthevc -SVTHEVC_PATCHFILES_= 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \ +SVTHEVC_CONFIGURE_ON= --enable-libsvthevc +SVTHEVC_PATCH_SITES= https://github.com/Intel/SVT-HEVC/raw/v1.4.3/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 exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) SVTHEVC_LDFLAGS= -fuse-ld=lld .endif +.if make(makesum) +.MAKEFLAGS: WITH+=SVTHEVC +.endif # svt-vp9 SVTVP9_LIB_DEPENDS= libSvtVp9Enc.so:multimedia/svt-vp9 -SVTVP9_CONFIGURE_ENABLE= libsvtvp9 -SVTVP9_PATCH_SITES_= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.2/ffmpeg_plugin/:svtvp9 -SVTVP9_PATCHFILES_= master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9 +SVTVP9_CONFIGURE_ON= --enable-libsvtvp9 +SVTVP9_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.2/ffmpeg_plugin/:svtvp9 +SVTVP9_PATCHFILES= master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) SVTVP9_LDFLAGS= -fuse-ld=lld .endif +.if make(makesum) +.MAKEFLAGS: WITH+=SVTVP9 +.endif + # tensorflow TENSORFLOW_LIB_DEPENDS= libtensorflow.so:science/tensorflow TENSORFLOW_CONFIGURE_ENABLE= libtensorflow diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 61b5c2163f96..021961b249e6 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,11 +1,11 @@ TIMESTAMP = 1594463972 SHA256 (ffmpeg-4.3.1.tar.xz) = ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb SIZE (ffmpeg-4.3.1.tar.xz) = 9379424 +SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 5e960b4dab495437082d0838a40a8cae9b67d1cef1ffd57da960afaa2bfd3719 +SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 25023 SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6 SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 22103 SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0 SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5332 -SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 5e960b4dab495437082d0838a40a8cae9b67d1cef1ffd57da960afaa2bfd3719 -SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 25023 SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96 SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 33465 |