svn commit: r536667 - head/multimedia/ffmpeg

[Jan Beich]

Author: jbeich
Date: Wed May 27 02:08:21 2020
New Revision: 536667
URL: https://svnweb.freebsd.org/changeset/ports/536667

Log:
  multimedia/ffmpeg: unbreak SVTVP9 after r536258
  
  ===>  Applying distribution patches for ffmpeg-4.2.3,1
  2 out of 8 hunks failed--saving rejects to libavformat/matroskaenc.c.rej
  ===>  FAILED Applying distribution patch 0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch with -p1
  *** Error code 1
  
  PR:		246673
  Reported by:	VVD <vvd at unislabs.com>

Modified:
  head/multimedia/ffmpeg/Makefile   (contents, props changed)
  head/multimedia/ffmpeg/distinfo   (contents, props changed)

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Wed May 27 01:53:54 2020	(r536666)
+++ head/multimedia/ffmpeg/Makefile	Wed May 27 02:08:21 2020	(r536667)
@@ -484,8 +484,8 @@ SVTHEVC_PREVENTS_MSG=	${SVTAV1_PREVENTS_MSG}
 # svt-vp9
 SVTVP9_LIB_DEPENDS=	libSvtVp9Enc.so:multimedia/svt-vp9
 SVTVP9_CONFIGURE_ON=	--enable-libsvtvp9
-SVTVP9_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.0/ffmpeg_plugin/:svtvp9
-SVTVP9_PATCHFILES=	0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
+SVTVP9_PATCH_SITES=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.0-2-gefe9c5a/ffmpeg_plugin/:svtvp9
+SVTVP9_PATCHFILES=	n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
 SVTVP9_LDFLAGS=		-fuse-ld=lld
 .endif

Modified: head/multimedia/ffmpeg/distinfo
==============================================================================
--- head/multimedia/ffmpeg/distinfo	Wed May 27 01:53:54 2020	(r536666)
+++ head/multimedia/ffmpeg/distinfo	Wed May 27 02:08:21 2020	(r536667)
@@ -7,5 +7,5 @@ SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wra
 SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 22103
 SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
 SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5332
-SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = ccdfef2fd22111dc378fa280516483fd72e3c65f0263a90723971f10846e28fe
-SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 33815
+SHA256 (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 7a317989d441384cfe3c664c587529ed95fbb7f0297e0321c228f122bd1ab7b3
+SIZE (n4.2.3-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 34029