Date: Thu, 27 Apr 2023 16:19:29 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9073b14666cd - main - multimedia/ffmpeg: unbreak SVTHEVC=on after 685e477b807c Message-ID: <202304271619.33RGJT0I065837@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=9073b14666cded630f4b6e4063406b4df865a9f3 commit 9073b14666cded630f4b6e4063406b4df865a9f3 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2023-04-27 15:19:47 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2023-04-27 16:19:02 +0000 multimedia/ffmpeg: unbreak SVTHEVC=on after 685e477b807c ===> Applying distribution patches for ffmpeg-6.0,1 3 out of 4 hunks failed--saving rejects to configure.rej 1 out of 1 hunks failed--saving rejects to libavcodec/allcodecs.c.rej ===> FAILED Applying distribution patch 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch with -p1 PR: 261302 Reported by: VVD --- multimedia/ffmpeg/Makefile | 4 ++-- multimedia/ffmpeg/distinfo | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index e7a4c150a31a..11fd4baa6bce 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -488,8 +488,8 @@ SVTAV1_CONFIGURE_ON= --enable-libsvtav1 # svt-hevc SVTHEVC_LIB_DEPENDS= libSvtHevcEnc.so:multimedia/svt-hevc SVTHEVC_CONFIGURE_ON= --enable-libsvthevc -SVTHEVC_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-HEVC/raw/v1.5.0-3-g86b58f77/ffmpeg_plugin/:svthevc -SVTHEVC_PATCHFILES= 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \ +SVTHEVC_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-HEVC/raw/v1.5.1-12-g62d22016/ffmpeg_plugin/:svthevc +SVTHEVC_PATCHFILES= master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \ 0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc .if make(makesum) .MAKEFLAGS: WITH+=SVTHEVC diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 4c5307165f94..d5ad4c2e047c 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,9 +1,9 @@ TIMESTAMP = 1677530629 SHA256 (ffmpeg-6.0.tar.xz) = 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082 SIZE (ffmpeg-6.0.tar.xz) = 10234012 -SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 376ea23e9d876390fbca936c80cb437bb9daa6232ff65df0ea91673e18b739ff -SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 24259 -SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = d16589efc4be2602a9f436e9938cfee0cc7b5ccd7a4a6b41c0c9a59ae0859fda -SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5336 +SHA256 (master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a +SIZE (master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 25395 +SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = a164ebdc4d281352bf7ad1b179aae4aeb33f1191c444bed96cb8ab333c046f81 +SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5461 SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = b7d722dfce20b73e9d5c73d55ffe041bbdc92a3c4a5c5d766b6b3040671b4052 SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 33497
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304271619.33RGJT0I065837>