Attachment 214935 Details for Bug 246789 – Add the ability to apply any combination of SVT patches: SVTAV1, SVTHEVC and SVTVP9

[patch] Add the ability to apply any combination of SVT patches: SVTAV1, SVTHEVC and SVTVP9

ffmpeg.diff (text/plain), 4.91 KB, created by Vladimir Druzenko on 2020-05-27 20:37:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2020-05-27 20:37:03 UTC

Size: 4.91 KB

patch

obsolete

>diff -ur multimedia/ffmpeg.orig/Makefile multimedia/ffmpeg/Makefile
>--- multimedia/ffmpeg.orig/Makefile
>+++ multimedia/ffmpeg/Makefile
>@@ -453,47 +453,43 @@
> 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_PATCHFILES_FIRST=	0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1
>+SVTAV1_PATCHFILES_NOTFIRST=	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)
>+SVTAV1_PATCHFILES=	${SVTAV1_PATCHFILES_FIRST} ${SVTAV1_PATCHFILES_NOTFIRST}
> .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_PATCHFILES_ANY=	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)
>+SVTHEVC_PATCHFILES=	${SVTHEVC_PATCHFILES_ANY}
> .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_PATCHFILES_FIRST=	n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
>+SVTVP9_PATCHFILES_NOTFIRST=	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)
>+SVTVP9_PATCHFILES=	${SVTVP9_PATCHFILES_FIRST} ${SVTVP9_PATCHFILES_NOTFIRST}
> .MAKEFLAGS:		WITH+=SVTVP9
>-.else
>-SVTVP9_PREVENTS=	SVTAV1 SVTHEVC
>-SVTVP9_PREVENTS_MSG=	${SVTAV1_PREVENTS_MSG}
> .endif
> 
> # tensorflow
>@@ -636,6 +632,34 @@
> # under doc subdirectory
> DOC_DOCFILES=	APIchanges *.txt
> PORTDOCS=	*
>+
>+.include <bsd.port.options.mk>
>+
>+# SVT patches should be applied in the correct order
>+.if ${PORT_OPTIONS:MSVTHEVC}
>+SVT_PATCHFILES+=	${SVTHEVC_PATCHFILES_ANY}
>+.	if ${PORT_OPTIONS:MSVTAV1}
>+SVT_PATCHFILES+=	${SVTAV1_PATCHFILES_NOTFIRST}
>+.	endif
>+.	if ${PORT_OPTIONS:MSVTVP9}
>+SVT_PATCHFILES+=	${SVTVP9_PATCHFILES_NOTFIRST}
>+.	endif
>+.else
>+.	if ${PORT_OPTIONS:MSVTAV1}
>+SVT_PATCHFILES+=	${SVTAV1_PATCHFILES_FIRST}
>+.		if ${PORT_OPTIONS:MSVTVP9}
>+SVT_PATCHFILES+=	${SVTVP9_PATCHFILES_NOTFIRST}
>+.		endif
>+.	else
>+.		if ${PORT_OPTIONS:MSVTVP9}
>+SVT_PATCHFILES+=	${SVTVP9_PATCHFILES_FIRST}
>+.		endif
>+.	endif
>+.endif
>+
>+.if !make(makesum)
>+PATCHFILES+=	${SVT_PATCHFILES}
>+.endif
> 
> post-patch:
> # {C,LD}FLAGS safeness
>diff -ur multimedia/ffmpeg.orig/distinfo multimedia/ffmpeg/distinfo
>--- multimedia/ffmpeg.orig/distinfo
>+++ multimedia/ffmpeg/distinfo
>@@ -1,11 +1,15 @@
>-TIMESTAMP = 1590076530
>+TIMESTAMP = 1590610017
> 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-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = d371366ceda9233c1b9a60c680878f567861b675605a8dae5c275d633c51ba9f
>+SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = 22811
> 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 (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

Flags:

vvd: maintainer-approval? (jbeich)

Actions: View | Diff

Attachments on bug 246789: 214935 | 215424 | 215520