From nobody Thu Apr 27 16:19:30 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6gtB5pxMz47MnJ; Thu, 27 Apr 2023 16:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q6gtB5JNdz3P86; Thu, 27 Apr 2023 16:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682612370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zi+ntzEngYTPmciEtWjGJOhR5AeehmEZUFeWDvqWgMQ=; b=Rw3HivP8THXNZzxcV+FC1chX9wVaRYKcLdj2BAP/tS0Q1ckAw01D/ebWk29EOvSvneC2X/ hXYF59UDbK8m/rzyl/E6i//4y5ttr00Dh6bbcQDeniw7WeeiZOi6iDFZQZGT01EDo3AoQC h2UrOE+dtZ+hBrnU2AVHeKmekL1zpgMNmwPh+us9aUqlrqb+yxK/1+6N1dyydh2nBpzBe4 fSEKD/8460PadXMNvGYc8N5qy2aNdOFFD5oG2fo3y3fzbQe93dm4y0jp0ni3jaJ5+H/2t7 YjK5cbYxd5CF1dkaXEpBH2WSPcoL60xWKdPalCWAiL0CP3SGrePWDeFwp+bFuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682612370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zi+ntzEngYTPmciEtWjGJOhR5AeehmEZUFeWDvqWgMQ=; b=YEwGjSreQ4o0BE4qSt1bqj0DyAioQ6aSK4AeZQ/w5mUgzfhhGhEKcDalKgwYH7oaif/9Jx UbDMKaqCmUYoDnK8D9ZQpgwR1NeXdzudJ1fxeycivElLUrevJwrWJGQJa9H/KL9F6EinLF EbWNLtEQTfn74PZF+5mEGUn9PhJyv3h2wFVI3gl2E0S8Z79eKlwPDwg7GXMgMJY53YBMr3 fax11NOi/dprJB1hHZcTW1Sb4rOLMwKlhdtJC5gfgNG71MMRHveA4hhunSISBZ+XZssSE1 JPDl48IXN4DTHdqhpvodng7uzNy5Q5pWkxfd0fOB+fSCsgxaDyRKRhE9w30j4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682612370; a=rsa-sha256; cv=none; b=XC1m0FgFvkEaH9qY+oHm+uAyM/FRtP7ogAX5Go6LsL57glmBTaM/zsxMWV5kr75x+M7LvD cjlSeXFgUSjxl4gl/RRIOsyKyOu+A3L7upa3MmjFdY40maNzK+TA0UQsbuKaxruVf8U3FN KhoSiv7j8c6s55EaIip8OY1OFUGhiTg2w0jCZfFv514ykhwdKzVOa0hHyBqB7wKwqpoBLq PIt2IlmrNg1GD6FhHU7Cw6NoNs+BvofuowhL/AHmqwcAL2uiMmLv/uLYsFPO9tNcN0cJ89 i3k/FN3HNAyqqkdhEYj2THudrA7o8+NHCKaojuvPexab8iYs4hVj7ertCSerfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6gtB4P6TzP9f; Thu, 27 Apr 2023 16:19:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RGJUD8065857; Thu, 27 Apr 2023 16:19:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RGJUXx065856; Thu, 27 Apr 2023 16:19:30 GMT (envelope-from git) Date: Thu, 27 Apr 2023 16:19:30 GMT Message-Id: <202304271619.33RGJUXx065856@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: fd58bfbadc37 - main - multimedia/ffmpeg: unbreak SVTVP9=on after 685e477b807c List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd58bfbadc37f8e42d81b194ecb3926c2b913c7d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd58bfbadc37f8e42d81b194ecb3926c2b913c7d commit fd58bfbadc37f8e42d81b194ecb3926c2b913c7d Author: Jan Beich AuthorDate: 2023-04-27 15:19:47 +0000 Commit: Jan Beich CommitDate: 2023-04-27 16:19:03 +0000 multimedia/ffmpeg: unbreak SVTVP9=on after 685e477b807c ===> Applying distribution patches for ffmpeg-6.0,1 1 out of 1 hunks failed--saving rejects to libavcodec/allcodecs.c.rej 1 out of 3 hunks failed--saving rejects to libavformat/dashenc.c.rej 3 out of 9 hunks failed--saving rejects to libavformat/matroskaenc.c.rej ===> FAILED Applying distribution patch master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch with -p1 PR: 261302 --- multimedia/ffmpeg/Makefile | 2 +- multimedia/ffmpeg/distinfo | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 11fd4baa6bce..b64a154b8ec6 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -498,7 +498,7 @@ SVTHEVC_PATCHFILES= master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.pa # 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.3.0-4-gabd5c59/ffmpeg_plugin/:svtvp9 +SVTVP9_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.3.0-17-g15bd454/ffmpeg_plugin/:svtvp9 SVTVP9_PATCHFILES= master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9 .if make(makesum) .MAKEFLAGS: WITH+=SVTVP9 diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index d5ad4c2e047c..a38d4f106ea7 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -5,5 +5,5 @@ SHA256 (master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = e8fdc 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 +SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = d8b91ea5f07d0208cbe0290567083808708014a1953fda322d13cb619349c9ee +SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 25894