From nobody Tue Apr 19 00:58:44 2022 X-Original-To: dev-commits-ports-all@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 1BFA011E0F46; Tue, 19 Apr 2022 00:58:45 +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 4Kj55w30DJz4XGF; Tue, 19 Apr 2022 00:58:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650329924; 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=Xa2Z7Rb8ObSVXvflMQL3/W9hCrMCMRSS+lJi74TFbKA=; b=JlAnRZzHMA90I2lxSPpObIVxOthznzPJzDK6XYWM/y/b+bd0WwWCmBmCJwEeNtS+vcImW5 VjC7cODXHVobNV4Er+giF4DqpiPn6PaEu2jcG8tjoT1Lb22QxziGsteTBxrXTdNkLVu4VA nt/HQKkLqZhmUkhNYPpUYfZpGwC9nPHTW/XjgYao7rvHVCShmFd6PE0ynLB4QN7vnjfBRN JxW6ZhUTaIUquQ1uHjeb5HeQYdHgPuBjHm+/pKM9TaNdtOCqRTKCeNPoPZ1o0KzHfJiCQy 8q64z6C7jdy1Lp4hlH68oF4woQQitwOTKu3OmuORSjvDxO5XBolpT+bQRg45HA== 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 322BC1D358; Tue, 19 Apr 2022 00:58:44 +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 23J0wiv2060353; Tue, 19 Apr 2022 00:58:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23J0wijx060352; Tue, 19 Apr 2022 00:58:44 GMT (envelope-from git) Date: Tue, 19 Apr 2022 00:58:44 GMT Message-Id: <202204190058.23J0wijx060352@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 03d7f1be31f9 - 2022Q2 - multimedia/ffmpeg: update to 4.4.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2022Q2 X-Git-Reftype: branch X-Git-Commit: 03d7f1be31f9b20ad3cb1dbc85a35331edc4670b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650329924; 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=Xa2Z7Rb8ObSVXvflMQL3/W9hCrMCMRSS+lJi74TFbKA=; b=EH3A8XnBaOGxoS4Zs2zI2GQatz9vKCSVHOEkOsKSiZOWwsglZxrpT5mpSK88xL5UmmYGvU xER9vln+H8t9eIR+vquwj8bSQQVrzFNEeY+d+Hces5m2W90Y+dN7f1tKi2pSrsi1l/xo5b IbEYPJQkJ2tYTkFFokPU7VlhpyOUYBTQmeqpSl6PORz4znyqNl4DKh56eWN9AVZXQ+0Fdn BWIUvH6k0TW2qfhPHqxMqfNjaXw/aG1u61OJc2YdncZwgKxUyfepkND2N9YfCIQbYtFT25 HSCwfhGc5RIFIVBnaLF/tbmEy2X4bRuJdmc/VFA/1PSemwwVsN4JpI0Zlms50A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650329924; a=rsa-sha256; cv=none; b=FAMWJ1R1QT0quP9E39ZEmS+jOptOHYuzj9vJq/TP5MAA0If/zRWR8DJ8x3tIVmLQRqt/gu atJT3A2wsYNifc4JV8Qmr7/Ass8zAfkrZRKdkl78zXkpQnYJo2q3hFDQJNVMlZeDho5WB1 XcHrauNej94iNg/QSOgvIGXXtJitDoxCCXDK3L+JD4T5B9MNU7b/sLlntfdeAu27jNEyiJ A37xatu+Km5ts+dSeRfvj23uTPCUCIav3C9pePG2tenHqJ7tGFj6jAXaaCiK3kGEiDiEaq S+mU5IRx4QTwOwS2KysMVk4PlD84rJZPnb6xHAt8zysTwzG9FBPcwbvbkD+SNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=03d7f1be31f9b20ad3cb1dbc85a35331edc4670b commit 03d7f1be31f9b20ad3cb1dbc85a35331edc4670b Author: Jan Beich AuthorDate: 2022-04-14 20:13:48 +0000 Commit: Jan Beich CommitDate: 2022-04-18 17:58:29 +0000 multimedia/ffmpeg: update to 4.4.2 Changes: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/n4.4.2:/Changelog Reported by: OpenBSD (cherry picked from commit 13c1171a710babe6a6b29d157d78afd0e5728f64) --- 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 bc2b28111c94..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= 12 +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);