Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 May 2021 01:23:05 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: f65b53238f7f - main - multimedia/ffmpeg: unbreak SVTHEVC by part-reverting efe6165a6e14
Message-ID:  <202105180123.14I1N5NO087367@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=f65b53238f7fa9104ed6f201e2f9400237a85419

commit f65b53238f7fa9104ed6f201e2f9400237a85419
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2021-05-18 01:03:58 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2021-05-18 01:23:01 +0000

    multimedia/ffmpeg: unbreak SVTHEVC by part-reverting efe6165a6e14
    
    efe6165a6e14 (downstream) forgot to chase patch split into n4.4 version
    
    ===>  Patching for ffmpeg-4.4_1,1
    ===>  Applying distribution patches for ffmpeg-4.4_1,1
    4 out of 4 hunks failed--saving rejects to configure.rej
    1 out of 1 hunks failed--saving rejects to libavcodec/Makefile.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
    *** Error code 1
    
    but v1.5.1 (upstream) forgot to update/split docs patch
    
    ===>  Patching for ffmpeg-4.4_1,1
    ===>  Applying distribution patches for ffmpeg-4.4_1,1
    patch: **** malformed patch at line 177:  @section libtheora
    ===>  FAILED Applying distribution patch 0002-doc-Add-libsvt_hevc-encoder-docs.patch with -p1
    *** Error code 1
---
 multimedia/ffmpeg/Makefile | 2 +-
 multimedia/ffmpeg/distinfo | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index dc4d21bc2145..0373cf4893db 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -473,7 +473,7 @@ SVTAV1_LDFLAGS=		-fuse-ld=lld
 # 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.1/ffmpeg_plugin/:svthevc
+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 \
 			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)
diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo
index ca54735d27ef..ba4751551a0f 100644
--- a/multimedia/ffmpeg/distinfo
+++ b/multimedia/ffmpeg/distinfo
@@ -1,9 +1,9 @@
 TIMESTAMP = 1617917322
 SHA256 (ffmpeg-4.4.tar.xz) = 06b10a183ce5371f915c6bb15b7b1fffbe046e8275099c96affc29e17645d909
 SIZE (ffmpeg-4.4.tar.xz) = 9557868
-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) = 837cac5a64234f34d136d18c8f7dc14203cdea11406fdb310cef2f62504d9e0c
-SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5428
+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-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?202105180123.14I1N5NO087367>