cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multimedia/ffmpeg: unbreak SVTHEVC by part-reverting efe6165a6e14

Browse Source 
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
This commit is contained in:
Jan Beich 2021-05-18 01:03:58 +00:00
parent 7bfc2c0726
commit f65b53238f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multimedia/ffmpeg/Makefile
View File

@ -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)

8
multimedia/ffmpeg/distinfo
View File

@ -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