Date: Sat, 13 Jun 2020 17:14:48 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538687 - head/multimedia/ffmpeg Message-ID: <202006131714.05DHEm0M012801@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat Jun 13 17:14:48 2020 New Revision: 538687 URL: https://svnweb.freebsd.org/changeset/ports/538687 Log: multimedia/ffmpeg: add the ability to have SVTAV1, SVTHEVC and SVTVP9 option on simultaneously - make it possible to have all three SVT options on simultaneously - always patch in support for all variants - use the patched in configure flag for feature toggling PR: 246789 Submitted by: VVD <vvd@unislabs.com> Modified: head/multimedia/ffmpeg/Makefile head/multimedia/ffmpeg/distinfo Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Sat Jun 13 17:08:29 2020 (r538686) +++ head/multimedia/ffmpeg/Makefile Sat Jun 13 17:14:48 2020 (r538687) @@ -7,6 +7,9 @@ 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 @@ -451,51 +454,32 @@ SRT_CONFIGURE_ENABLE= libsrt # svt-av1 SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1 -SVTAV1_CONFIGURE_ON= --enable-libsvtav1 -SVTAV1_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.3/ffmpeg_plugin/:svtav1 -SVTAV1_PATCHFILES= 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1 +SVTAV1_CONFIGURE_ENABLE= libsvtav1 +SVTAV1_PATCH_SITES_= https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.3/ffmpeg_plugin/:svtav1 +SVTAV1_PATCHFILES_= 0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.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 -.else -SVTAV1_PREVENTS= SVTHEVC SVTVP9 -SVTAV1_PREVENTS_MSG= Only one SVT vendor patch can be applied at the same time -.endif # 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.4.3/ffmpeg_plugin/:svthevc -SVTHEVC_PATCHFILES= 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \ +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 \ 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 -.else -SVTHEVC_PREVENTS= SVTAV1 SVTVP9 -SVTHEVC_PREVENTS_MSG= ${SVTAV1_PREVENTS_MSG} -.endif # svt-vp9 SVTVP9_LIB_DEPENDS= libSvtVp9Enc.so:multimedia/svt-vp9 -SVTVP9_CONFIGURE_ON= --enable-libsvtvp9 -SVTVP9_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.0-2-gefe9c5a/ffmpeg_plugin/:svtvp9 -SVTVP9_PATCHFILES= n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9 +SVTVP9_CONFIGURE_ENABLE= libsvtvp9 +SVTVP9_PATCH_SITES_= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.0-2-gefe9c5a/ffmpeg_plugin/:svtvp9 +SVTVP9_PATCHFILES_= n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.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 -.else -SVTVP9_PREVENTS= SVTAV1 SVTHEVC -SVTVP9_PREVENTS_MSG= ${SVTAV1_PREVENTS_MSG} -.endif - # tensorflow TENSORFLOW_LIB_DEPENDS= libtensorflow.so:science/tensorflow TENSORFLOW_CONFIGURE_ENABLE= libtensorflow Modified: head/multimedia/ffmpeg/distinfo ============================================================================== --- head/multimedia/ffmpeg/distinfo Sat Jun 13 17:08:29 2020 (r538686) +++ head/multimedia/ffmpeg/distinfo Sat Jun 13 17:14:48 2020 (r538687) @@ -1,11 +1,11 @@ -TIMESTAMP = 1590076530 +TIMESTAMP = 1592065594 SHA256 (ffmpeg-4.2.3.tar.xz) = 9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31 SIZE (ffmpeg-4.2.3.tar.xz) = 9101192 -SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = d0ddc8ec34c7ecc3ab567caee9d4c42541b042c2fb6a2d0c5759333c6b19f9dd -SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 22788 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 (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 7a317989d441384cfe3c664c587529ed95fbb7f0297e0321c228f122bd1ab7b3 -SIZE (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 34029 +SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = cbcf51f37b17355b228b62862cfde141b0701f260d8bc3502a922f0f91303f9e +SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = 23636 +SHA256 (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 7edb8d617d96e7582b307a341419b283943ea07da42d78033c79d6e3b3052295 +SIZE (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 33904
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006131714.05DHEm0M012801>