From nobody Thu Apr 27 16:19:29 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 4Q6gt95byMz47NN3; Thu, 27 Apr 2023 16:19:29 +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 4Q6gt94bCdz3P2K; Thu, 27 Apr 2023 16:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682612369; 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=mVswjpWsaVHOohbRF3RCpzTxBKIJelDsmeGgZdMYt/E=; b=iUgJCm+lvDBiUhzxVMr97M6MNNLHgYNNdWgC+q93stq4vuruP/kpZfgVk8FilPczWEyqvr w6W0PT5fFrA7DhcjeRu2x7DQyvNVh7hOzVvjaxNamM0RNh8f8t5l1lUmZCj7mLPL4M6641 pnvO8Sl4Y00n/3mqfCCo87opw6GXrv57pgZamjxFySGXqtU88CsM2myr/yVHn3YdGzvZCS enWmlRKpENPR22wNZH3vmv4v0fHMPNQhVq6MVZaKoD68o5Tg2C+05JU2UqN7uMA+WGRE/J uJaGgixxJjzIMTGl2cSCwzYU7KrPxvk4IzwsbUaGGXIqUfMPezptsp2d2Elmag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682612369; 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=mVswjpWsaVHOohbRF3RCpzTxBKIJelDsmeGgZdMYt/E=; b=BRLBq+Db2H3l2RxJDCREIbmPI0gF6/eBtAW3iu0YlKxYO5T6G9cQ/SBxNsHNfOiy+5KWPg knQxZtBEaITfMwrO8ee34g7QQt+EVeaOeKyE6u5h9TpMW/i3NXhGIWo5+xXAcO8DtWql2v x0Y1j4gLX5lQT/e3VJ+EbUA9sFuW9hvDHU54b1IE6mT1ox5XYNsC81NqBmHYkWQFFD5vPT rmy+qzviYr7hpEmmOAvGGJ7pjRXSSysSgIv6rdZq/BFXyYFhFKDcA88oMTe16MbcbQHNvG K9JqW2EEjRpxnzkiMkpCv2RIRd3Locn6yZSIYK8FxHlPami9s35RsmoIowMXgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682612369; a=rsa-sha256; cv=none; b=btl0uo/3eHdeV7ybUr3kJPfEr4y68n+OSFg1xSku2cIOza8B+wbwqd65U+tCqQCFMSSPn3 NmHQCC5a0jnH0CaQPaVRtGvx7ZEzSynckUpBiy5JTVhEOTA8OupjlipDSWNzGjGtL7D6C7 u9a4xquLPpRn/7J72xfVusZQpMqwfN+XM8sjUsTKJBjx8VlVIyBT0ABGakiTZfw8I3aJL1 wguQfJVuaDFMnVRhhsJD89ICbwK8UXOlNM4jah8/ki86v7MKf5GB5sJ5aKS9F7I8dFlUH5 JbynYEWE3dYVF1Z77bmbGcOlx9oUSX5gh/eaKW0E00W6C28FLDVVxsOEmNmoig== 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 4Q6gt93fKqzPck; Thu, 27 Apr 2023 16:19:29 +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 33RGJTWw065838; Thu, 27 Apr 2023 16:19:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RGJT0I065837; Thu, 27 Apr 2023 16:19:29 GMT (envelope-from git) Date: Thu, 27 Apr 2023 16:19:29 GMT Message-Id: <202304271619.33RGJT0I065837@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: 9073b14666cd - main - multimedia/ffmpeg: unbreak SVTHEVC=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: 9073b14666cded630f4b6e4063406b4df865a9f3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=9073b14666cded630f4b6e4063406b4df865a9f3 commit 9073b14666cded630f4b6e4063406b4df865a9f3 Author: Jan Beich AuthorDate: 2023-04-27 15:19:47 +0000 Commit: Jan Beich CommitDate: 2023-04-27 16:19:02 +0000 multimedia/ffmpeg: unbreak SVTHEVC=on after 685e477b807c ===> Applying distribution patches for ffmpeg-6.0,1 3 out of 4 hunks failed--saving rejects to configure.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 PR: 261302 Reported by: VVD --- multimedia/ffmpeg/Makefile | 4 ++-- multimedia/ffmpeg/distinfo | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index e7a4c150a31a..11fd4baa6bce 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -488,8 +488,8 @@ SVTAV1_CONFIGURE_ON= --enable-libsvtav1 # 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.0-3-g86b58f77/ffmpeg_plugin/:svthevc -SVTHEVC_PATCHFILES= 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \ +SVTHEVC_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-HEVC/raw/v1.5.1-12-g62d22016/ffmpeg_plugin/:svthevc +SVTHEVC_PATCHFILES= master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \ 0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc .if make(makesum) .MAKEFLAGS: WITH+=SVTHEVC diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 4c5307165f94..d5ad4c2e047c 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,9 +1,9 @@ TIMESTAMP = 1677530629 SHA256 (ffmpeg-6.0.tar.xz) = 57be87c22d9b49c112b6d24bc67d42508660e6b718b3db89c44e47e289137082 SIZE (ffmpeg-6.0.tar.xz) = 10234012 -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-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = e8fdc940474f3819b9a8d30cab8164774584c051322acb6194bcb03d56e8175a +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