From nobody Mon Apr 18 17:49:17 2022 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 502E45D06F9; Mon, 18 Apr 2022 17:49:18 +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 4KhvZQ1ccqz3j8s; Mon, 18 Apr 2022 17:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650304158; 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=FZZOMr4s7bW9OXgu5OlgIV7BnjiN4TlmZZHV3xT4Sq4=; b=YfIkUjE4fukwiYvWRTZcG7xiAbwZxUp/yGDl5mIj9TQdc6P8l+nA/3aszxXrwS3Exh7WYn Cp3FsvtmJb1CHecIDvurUC+m7eqcV50W37sQawDZCgrFwaRE02mdimitAv/njfaHNypQhZ a6K58g7n+ztXzSQI0jt4C6wEQ0scQ9K9e0io+A41fCH+42fLLVapp51M+QqPjVGF/c9H7S Z+EgUWVOOBuEYOtmsiLA2zmSpJxO/va6i/D6V20ihL2GhNsHC8XUtUmx9zDiNues60tRTN Zt0wbCWKq2Rdexi25fPEp8KxaTEjuzIjCpXeNEiJDBNO3RHDRTwFMvdLyXaJRQ== 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 181F21759B; Mon, 18 Apr 2022 17:49:18 +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 23IHnIL9081272; Mon, 18 Apr 2022 17:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23IHnHQT081271; Mon, 18 Apr 2022 17:49:17 GMT (envelope-from git) Date: Mon, 18 Apr 2022 17:49:17 GMT Message-Id: <202204181749.23IHnHQT081271@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: 13c1171a710b - main - multimedia/ffmpeg: update to 4.4.2 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: 13c1171a710babe6a6b29d157d78afd0e5728f64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650304158; 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=FZZOMr4s7bW9OXgu5OlgIV7BnjiN4TlmZZHV3xT4Sq4=; b=vBsxg2fMgvda/tfJUmGtOuYSpNmuVOidrvUtkdFbsTF8l5Vr0RdF5GJDlsec9cjY+2pg9M I3jJ/zwHBZvAQdYzTivwErXGvu8f/99fjCgkF66G5yu8ezkQtIgttTrwHIEM2FuW3hYrP5 Roiku3YX1vp4tE5rQytK0+Gg1wO9zt7TgxJwE7rTgi8ZUUR/GTDeJqzRtpwg2Ao+Bj2QEP Hmov77Rh/b2rDuuC+1Z/pAB4N5xRF9DDLWAh7iXOkMlTb1wZvbZNBv2BAjV1LITHrpoGjg jKu97WlSXRhiLKo24DytYv99u2Phj5BWd/O1o9GP3pKLO4Q1watFPfgErbFtvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650304158; a=rsa-sha256; cv=none; b=t+F9nIP7CTAxC07Q8TCmJ06YKXIZN8m7+wARR6cKEfxxhrjtFmvA4EpoeojUcgSO5JCHdm nRLq23oLmvQWMizZLkbIlnX7izMQ7Hll6YxKA4zTJO8gSKJAbuDINuVpInZ8DKwNogAUkO Zl08ovZEISngOiJxW0vue4aSXkPx4z2qnjsR/Qwhv/Jx92OKHomrzcvx3od9HxeTambrya nBqQQyRflFFOVwZHN9I2xHCXYbgyjBxLpq1SCLUGkl8ggBLMshEYgWzIhv2YGSmzSLm6B4 qSGN3LdNhrcMJKzAg/JlAb6eOEv44Xe1s2gVbOp9fXY79QxQT4fSEUaNDop/AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=13c1171a710babe6a6b29d157d78afd0e5728f64 commit 13c1171a710babe6a6b29d157d78afd0e5728f64 Author: Jan Beich AuthorDate: 2022-04-14 20:13:48 +0000 Commit: Jan Beich CommitDate: 2022-04-18 17:48:09 +0000 multimedia/ffmpeg: update to 4.4.2 Changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n4.4.2:/Changelog Reported by: OpenBSD --- multimedia/ffmpeg/Makefile | 3 +-- multimedia/ffmpeg/distinfo | 6 +++--- multimedia/ffmpeg/files/patch-dav1d | 39 ------------------------------------- 3 files changed, 4 insertions(+), 44 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 5751e872088c..765ec58b8f61 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,8 +1,7 @@ # Created by: Martin Matuska PORTNAME= ffmpeg -PORTVERSION= 4.4.1 -PORTREVISION= 13 +PORTVERSION= 4.4.2 PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 5653a5667639..9867c19e4891 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1635171801 -SHA256 (ffmpeg-4.4.1.tar.xz) = eadbad9e9ab30b25f5520fbfde99fae4a92a1ae3c0257a8d68569a4651e30e02 -SIZE (ffmpeg-4.4.1.tar.xz) = 9557516 +TIMESTAMP = 1649967228 +SHA256 (ffmpeg-4.4.2.tar.xz) = af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93 +SIZE (ffmpeg-4.4.2.tar.xz) = 9562968 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 diff --git a/multimedia/ffmpeg/files/patch-dav1d b/multimedia/ffmpeg/files/patch-dav1d deleted file mode 100644 index 4af5b8b518e5..000000000000 --- a/multimedia/ffmpeg/files/patch-dav1d +++ /dev/null @@ -1,39 +0,0 @@ -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/61ed1182eeb2 -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/cc33e73618a9 -https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/a4e1dd694014 - ---- libavcodec/libdav1d.c.orig 2021-10-24 20:47:11 UTC -+++ libavcodec/libdav1d.c -@@ -127,7 +127,11 @@ static av_cold int libdav1d_init(AVCodecContext *c) - { - Libdav1dContext *dav1d = c->priv_data; - Dav1dSettings s; -+#if FF_DAV1D_VERSION_AT_LEAST(6,0) -+ int threads = c->thread_count; -+#else - int threads = (c->thread_count ? c->thread_count : av_cpu_count()) * 3 / 2; -+#endif - int res; - - av_log(c, AV_LOG_INFO, "libdav1d %s\n", dav1d_version()); -@@ -153,7 +157,7 @@ static av_cold int libdav1d_init(AVCodecContext *c) - s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads); - else - s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS); -- s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads; -+ s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : 0; - av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n", - s.n_threads, s.max_frame_delay); - #else -@@ -244,8 +248,10 @@ static int libdav1d_receive_frame(AVCodecContext *c, A - if (res < 0) { - if (res == AVERROR(EINVAL)) - res = AVERROR_INVALIDDATA; -- if (res != AVERROR(EAGAIN)) -+ if (res != AVERROR(EAGAIN)) { -+ dav1d_data_unref(data); - return res; -+ } - } - - res = dav1d_get_picture(dav1d->c, p);