View | Details | Raw Unified | Return to bug 246789 | Differences between
and this patch

Collapse All | Expand All

(-)multimedia/ffmpeg/Makefile (-12 / +36 lines)
Lines 453-499 Link Here
453
SVTAV1_LIB_DEPENDS=	libSvtAv1Enc.so:multimedia/svt-av1
453
SVTAV1_LIB_DEPENDS=	libSvtAv1Enc.so:multimedia/svt-av1
454
SVTAV1_CONFIGURE_ON=	--enable-libsvtav1
454
SVTAV1_CONFIGURE_ON=	--enable-libsvtav1
455
SVTAV1_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.3/ffmpeg_plugin/:svtav1
455
SVTAV1_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.3/ffmpeg_plugin/:svtav1
456
SVTAV1_PATCHFILES=	0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1
456
SVTAV1_PATCHFILES_FIRST=	0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1
457
SVTAV1_PATCHFILES_NOTFIRST=	0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch:-p1:svtav1
457
.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
458
.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
458
# https://github.com/OpenVisualCloud/SVT-AV1/issues/691
459
# https://github.com/OpenVisualCloud/SVT-AV1/issues/691
459
SVTAV1_LDFLAGS=		-fuse-ld=lld
460
SVTAV1_LDFLAGS=		-fuse-ld=lld
460
.endif
461
.endif
461
.if make(makesum)
462
.if make(makesum)
463
SVTAV1_PATCHFILES=	${SVTAV1_PATCHFILES_FIRST} ${SVTAV1_PATCHFILES_NOTFIRST}
462
.MAKEFLAGS:		WITH+=SVTAV1
464
.MAKEFLAGS:		WITH+=SVTAV1
463
.else
464
SVTAV1_PREVENTS=	SVTHEVC SVTVP9
465
SVTAV1_PREVENTS_MSG=	Only one SVT vendor patch can be applied at the same time
466
.endif
465
.endif
467
466
468
# svt-hevc
467
# svt-hevc
469
SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
468
SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
470
SVTHEVC_CONFIGURE_ON=	--enable-libsvthevc
469
SVTHEVC_CONFIGURE_ON=	--enable-libsvthevc
471
SVTHEVC_PATCH_SITES=	https://github.com/Intel/SVT-HEVC/raw/v1.4.3/ffmpeg_plugin/:svthevc
470
SVTHEVC_PATCH_SITES=	https://github.com/Intel/SVT-HEVC/raw/v1.4.3/ffmpeg_plugin/:svthevc
472
SVTHEVC_PATCHFILES=	0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
471
SVTHEVC_PATCHFILES_ANY=	0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
473
			0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
472
			0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
474
.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
473
.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
475
SVTHEVC_LDFLAGS=	-fuse-ld=lld
474
SVTHEVC_LDFLAGS=	-fuse-ld=lld
476
.endif
475
.endif
477
.if make(makesum)
476
.if make(makesum)
477
SVTHEVC_PATCHFILES=	${SVTHEVC_PATCHFILES_ANY}
478
.MAKEFLAGS:		WITH+=SVTHEVC
478
.MAKEFLAGS:		WITH+=SVTHEVC
479
.else
480
SVTHEVC_PREVENTS=	SVTAV1 SVTVP9
481
SVTHEVC_PREVENTS_MSG=	${SVTAV1_PREVENTS_MSG}
482
.endif
479
.endif
483
480
484
# svt-vp9
481
# svt-vp9
485
SVTVP9_LIB_DEPENDS=	libSvtVp9Enc.so:multimedia/svt-vp9
482
SVTVP9_LIB_DEPENDS=	libSvtVp9Enc.so:multimedia/svt-vp9
486
SVTVP9_CONFIGURE_ON=	--enable-libsvtvp9
483
SVTVP9_CONFIGURE_ON=	--enable-libsvtvp9
487
SVTVP9_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.0-2-gefe9c5a/ffmpeg_plugin/:svtvp9
484
SVTVP9_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.0-2-gefe9c5a/ffmpeg_plugin/:svtvp9
488
SVTVP9_PATCHFILES=	n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
485
SVTVP9_PATCHFILES_FIRST=	n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
486
SVTVP9_PATCHFILES_NOTFIRST=	n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch:-p1:svtvp9
489
.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
487
.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
490
SVTVP9_LDFLAGS=		-fuse-ld=lld
488
SVTVP9_LDFLAGS=		-fuse-ld=lld
491
.endif
489
.endif
492
.if make(makesum)
490
.if make(makesum)
491
SVTVP9_PATCHFILES=	${SVTVP9_PATCHFILES_FIRST} ${SVTVP9_PATCHFILES_NOTFIRST}
493
.MAKEFLAGS:		WITH+=SVTVP9
492
.MAKEFLAGS:		WITH+=SVTVP9
494
.else
495
SVTVP9_PREVENTS=	SVTAV1 SVTHEVC
496
SVTVP9_PREVENTS_MSG=	${SVTAV1_PREVENTS_MSG}
497
.endif
493
.endif
498
494
499
# tensorflow
495
# tensorflow
Lines 636-641 Link Here
636
# under doc subdirectory
632
# under doc subdirectory
637
DOC_DOCFILES=	APIchanges *.txt
633
DOC_DOCFILES=	APIchanges *.txt
638
PORTDOCS=	*
634
PORTDOCS=	*
635
636
.include <bsd.port.options.mk>
637
638
# SVT patches should be applied in the correct order
639
.if ${PORT_OPTIONS:MSVTHEVC}
640
SVT_PATCHFILES+=	${SVTHEVC_PATCHFILES_ANY}
641
.	if ${PORT_OPTIONS:MSVTAV1}
642
SVT_PATCHFILES+=	${SVTAV1_PATCHFILES_NOTFIRST}
643
.	endif
644
.	if ${PORT_OPTIONS:MSVTVP9}
645
SVT_PATCHFILES+=	${SVTVP9_PATCHFILES_NOTFIRST}
646
.	endif
647
.else
648
.	if ${PORT_OPTIONS:MSVTAV1}
649
SVT_PATCHFILES+=	${SVTAV1_PATCHFILES_FIRST}
650
.		if ${PORT_OPTIONS:MSVTVP9}
651
SVT_PATCHFILES+=	${SVTVP9_PATCHFILES_NOTFIRST}
652
.		endif
653
.	else
654
.		if ${PORT_OPTIONS:MSVTVP9}
655
SVT_PATCHFILES+=	${SVTVP9_PATCHFILES_FIRST}
656
.		endif
657
.	endif
658
.endif
659
660
.if !make(makesum)
661
PATCHFILES+=	${SVT_PATCHFILES}
662
.endif
639
663
640
post-patch:
664
post-patch:
641
# {C,LD}FLAGS safeness
665
# {C,LD}FLAGS safeness
(-)multimedia/ffmpeg/distinfo (-1 / +5 lines)
Lines 1-11 Link Here
1
TIMESTAMP = 1590076530
1
TIMESTAMP = 1590610017
2
SHA256 (ffmpeg-4.2.3.tar.xz) = 9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31
2
SHA256 (ffmpeg-4.2.3.tar.xz) = 9df6c90aed1337634c1fb026fb01c154c29c82a64ea71291ff2da9aacb9aad31
3
SIZE (ffmpeg-4.2.3.tar.xz) = 9101192
3
SIZE (ffmpeg-4.2.3.tar.xz) = 9101192
4
SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = d0ddc8ec34c7ecc3ab567caee9d4c42541b042c2fb6a2d0c5759333c6b19f9dd
4
SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = d0ddc8ec34c7ecc3ab567caee9d4c42541b042c2fb6a2d0c5759333c6b19f9dd
5
SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 22788
5
SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 22788
6
SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = d371366ceda9233c1b9a60c680878f567861b675605a8dae5c275d633c51ba9f
7
SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = 22811
6
SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
8
SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
7
SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 22103
9
SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 22103
8
SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
10
SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
9
SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5332
11
SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5332
10
SHA256 (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 7a317989d441384cfe3c664c587529ed95fbb7f0297e0321c228f122bd1ab7b3
12
SHA256 (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 7a317989d441384cfe3c664c587529ed95fbb7f0297e0321c228f122bd1ab7b3
11
SIZE (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 34029
13
SIZE (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 34029
14
SHA256 (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 7edb8d617d96e7582b307a341419b283943ea07da42d78033c79d6e3b3052295
15
SIZE (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 33904

Return to bug 246789