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

Collapse All | Expand All

(-)multimedia/ffmpeg/Makefile (-27 / +12 lines)
Lines 451-500 Link Here
451
451
452
# svt-av1
452
# svt-av1
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_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_=	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)
457
.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
458
# https://github.com/OpenVisualCloud/SVT-AV1/issues/691
458
# https://github.com/OpenVisualCloud/SVT-AV1/issues/691
459
SVTAV1_LDFLAGS=		-fuse-ld=lld
459
SVTAV1_LDFLAGS=		-fuse-ld=lld
460
.endif
460
.endif
461
.if make(makesum)
462
.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
467
461
468
# svt-hevc
462
# svt-hevc
469
SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
463
SVTHEVC_LIB_DEPENDS=	libSvtHevcEnc.so:multimedia/svt-hevc
470
SVTHEVC_CONFIGURE_ON=	--enable-libsvthevc
464
SVTHEVC_CONFIGURE_ENABLE=	libsvthevc
471
SVTHEVC_PATCH_SITES=	https://github.com/Intel/SVT-HEVC/raw/v1.4.3/ffmpeg_plugin/:svthevc
465
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 \
466
SVTHEVC_PATCHFILES_=	0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \
473
			0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc
467
			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)
468
.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
475
SVTHEVC_LDFLAGS=	-fuse-ld=lld
469
SVTHEVC_LDFLAGS=	-fuse-ld=lld
476
.endif
470
.endif
477
.if make(makesum)
478
.MAKEFLAGS:		WITH+=SVTHEVC
479
.else
480
SVTHEVC_PREVENTS=	SVTAV1 SVTVP9
481
SVTHEVC_PREVENTS_MSG=	${SVTAV1_PREVENTS_MSG}
482
.endif
483
471
484
# svt-vp9
472
# svt-vp9
485
SVTVP9_LIB_DEPENDS=	libSvtVp9Enc.so:multimedia/svt-vp9
473
SVTVP9_LIB_DEPENDS=	libSvtVp9Enc.so:multimedia/svt-vp9
486
SVTVP9_CONFIGURE_ON=	--enable-libsvtvp9
474
SVTVP9_CONFIGURE_ENABLE=	libsvtvp9
487
SVTVP9_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.0-2-gefe9c5a/ffmpeg_plugin/:svtvp9
475
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
476
SVTVP9_PATCHFILES_=	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)
477
.if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
490
SVTVP9_LDFLAGS=		-fuse-ld=lld
478
SVTVP9_LDFLAGS=		-fuse-ld=lld
491
.endif
479
.endif
492
.if make(makesum)
480
493
.MAKEFLAGS:		WITH+=SVTVP9
481
PATCH_SITES+=		${SVTHEVC_PATCH_SITES_} ${SVTAV1_PATCH_SITES_} ${SVTVP9_PATCH_SITES_}
494
.else
482
PATCHFILES+=		${SVTHEVC_PATCHFILES_}  ${SVTAV1_PATCHFILES_}  ${SVTVP9_PATCHFILES_}
495
SVTVP9_PREVENTS=	SVTAV1 SVTHEVC
496
SVTVP9_PREVENTS_MSG=	${SVTAV1_PREVENTS_MSG}
497
.endif
498
483
499
# tensorflow
484
# tensorflow
500
TENSORFLOW_LIB_DEPENDS=	libtensorflow.so:science/tensorflow
485
TENSORFLOW_LIB_DEPENDS=	libtensorflow.so:science/tensorflow
(-)multimedia/ffmpeg/distinfo (-5 / +5 lines)
Lines 1-11 Link Here
1
TIMESTAMP = 1590076530
1
TIMESTAMP = 1592065594
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
5
SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 22788
6
SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
4
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
5
SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 22103
8
SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
6
SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
9
SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5332
7
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
8
SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = cbcf51f37b17355b228b62862cfde141b0701f260d8bc3502a922f0f91303f9e
11
SIZE (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 34029
9
SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = 23636
10
SHA256 (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 7edb8d617d96e7582b307a341419b283943ea07da42d78033c79d6e3b3052295
11
SIZE (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 33904

Return to bug 246789