Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 11 Jul 2020 15:59:32 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r541985 - branches/2020Q3/multimedia/ffmpeg
Message-ID:  <202007111559.06BFxWXC054792@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jul 11 15:59:32 2020
New Revision: 541985
URL: https://svnweb.freebsd.org/changeset/ports/541985

Log:
  MFH: r541984
  
  multimedia/ffmpeg: properly update svt-av1 patch after r540738
  
  v0.8.4 raw link referred to a pre-release branch with the same name.
  
  $ make checksum TRYBROKEN= MASTER_SITE_BACKUP= DISTDIR=$(mktemp -dt distfiles)
  ===>  License GPLv3+ LGPL3+ accepted by the user
  ===>   ffmpeg-4.3_3,1 depends on file: /usr/local/sbin/pkg - found
  => ffmpeg-4.3.tar.xz doesn't seem to exist in /tmp/distfiles.kl07C25q/.
  => Attempting to fetch https://ffmpeg.org/releases/ffmpeg-4.3.tar.xz
  ffmpeg-4.3.tar.xz                                     9158 kB 3382 kBps    03s
  => 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch doesn't seem to exist in /tmp/distfiles.kl07C25q/.
  => Attempting to fetch https://github.com/Intel/SVT-HEVC/raw/v1.4.3/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
  0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wra          21 kB  695 kBps    00s
  => 0002-doc-Add-libsvt_hevc-encoder-docs.patch doesn't seem to exist in /tmp/distfiles.kl07C25q/.
  => Attempting to fetch https://github.com/Intel/SVT-HEVC/raw/v1.4.3/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
  0002-doc-Add-libsvt_hevc-encoder-docs.patch           5332  B 5690 kBps    00s
  => 0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch doesn't seem to exist in /tmp/distfiles.kl07C25q/.
  => Attempting to fetch https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch
  fetch: https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch: Not Found
  => Couldn't fetch it - please try to retrieve this
  => port manually into /tmp/distfiles.kl07C25q/ and try again.
  *** Error code 1
  
  Changes:	https://github.com/OpenVisualCloud/SVT-AV1/compare/f5f390ab3..v0.8.4
  PR:		247873
  Approved by:	ports-secteam blanket (unbreak fetch)

Modified:
  branches/2020Q3/multimedia/ffmpeg/Makefile
  branches/2020Q3/multimedia/ffmpeg/distinfo
Directory Properties:
  branches/2020Q3/   (props changed)

Modified: branches/2020Q3/multimedia/ffmpeg/Makefile
==============================================================================
--- branches/2020Q3/multimedia/ffmpeg/Makefile	Sat Jul 11 15:57:16 2020	(r541984)
+++ branches/2020Q3/multimedia/ffmpeg/Makefile	Sat Jul 11 15:59:32 2020	(r541985)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	4.3
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
@@ -458,7 +458,7 @@ SRT_CONFIGURE_ENABLE=	libsrt
 SVTAV1_LIB_DEPENDS=	libSvtAv1Enc.so:multimedia/svt-av1
 SVTAV1_CONFIGURE_ENABLE=	libsvtav1
 SVTAV1_PATCH_SITES_=	https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.4/ffmpeg_plugin/:svtav1
-SVTAV1_PATCHFILES_=	0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch:-p1:svtav1
+SVTAV1_PATCHFILES_=	0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1
 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
 # https://github.com/OpenVisualCloud/SVT-AV1/issues/691
 SVTAV1_LDFLAGS=		-fuse-ld=lld
@@ -477,8 +477,9 @@ SVTHEVC_LDFLAGS=	-fuse-ld=lld
 # svt-vp9
 SVTVP9_LIB_DEPENDS=	libSvtVp9Enc.so:multimedia/svt-vp9
 SVTVP9_CONFIGURE_ENABLE=	libsvtvp9
-SVTVP9_PATCH_SITES_=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.0-5-g1b4277c/ffmpeg_plugin/:svtvp9
-SVTVP9_PATCHFILES_=	master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch:-p1:svtvp9
+SVTVP9_PATCH_SITES_=	https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.0-7-g3ea81bb/ffmpeg_plugin/:svtvp9
+SVTVP9_PATCHFILES_=	master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9
+SVTVP9_BROKEN=		https://github.com/OpenVisualCloud/SVT-VP9/issues/124
 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
 SVTVP9_LDFLAGS=		-fuse-ld=lld
 .endif

Modified: branches/2020Q3/multimedia/ffmpeg/distinfo
==============================================================================
--- branches/2020Q3/multimedia/ffmpeg/distinfo	Sat Jul 11 15:57:16 2020	(r541984)
+++ branches/2020Q3/multimedia/ffmpeg/distinfo	Sat Jul 11 15:59:32 2020	(r541985)
@@ -5,7 +5,7 @@ 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-av1-with-svt-hevc.patch) = 65240283f30906482f8002c1f0d2763e5a2501008179480cc94afa4bdaab5ed5
-SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1-with-svt-hevc.patch) = 24459
-SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 9d9021dfdf523da60218b2aec58633f969c69107965780794768521314ded807
-SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9-with-hevc-av1.patch) = 34077
+SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 5e960b4dab495437082d0838a40a8cae9b67d1cef1ffd57da960afaa2bfd3719
+SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 25023
+SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = c730545fef90e37b033f7bd42de6351b4a1b475247b23c15bda5bc8be54904cb
+SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 33249



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007111559.06BFxWXC054792>