From nobody Mon May 01 18:44:23 2023 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 4Q9BvW6CdPz48st5; Mon, 1 May 2023 18:44:23 +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 4Q9BvW5h2cz4KDK; Mon, 1 May 2023 18:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682966663; 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=SfUeFu9CjO2hEDvN/kmJa2SgDFCLntBf7pBFIJcl6dQ=; b=PlK2fEObf5P3TshSFu4/iqv6BtMi7NkgEyvSarb4iup6gWEXz4KvJBEmyjrH7jVowIuThw RpxaMShJR39qxQ7chTc0lNTEWQDTdN6yzOgEPdpywyWK9Aq0jS90BmnMEJyqlvFzo11qkk Q0PWCuW2afa+SeojxyKjbSygeg/lOgVRSplwJ86L1iAKPQGRpBpRfdnxIP8Jdh8wXMc3W4 deb6bXLeW4E8GYLtorSVZ3YY2niRiTcqXYw+ccRwPbBz3vJ8EqulNztkXrIUaTL9/6riAI KDH2mgvvhO1VC+v3ROV6A0bpchZB89RB6fTMo1ktUQgyPC2Euwp0UCwUPM1RAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682966663; 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=SfUeFu9CjO2hEDvN/kmJa2SgDFCLntBf7pBFIJcl6dQ=; b=bfoAqU0AH/5FFHB4Dr3w9052cGfJp0/5Ssq6jOm/l6aCtEd6IILVWioEnxli2xj/9Pl8Xn cfGLTm2b7xibj1g2nXm8lTZO0RLuts/AIk9tapjeGknehiYQc4iph5BJH+NFRMVFqjVk8y tHKiKXFVi/Y7+3761MQW6So2wBRCiPotuoEuWdsF2fx3ZabA5DTL//B3z+eQcuQ7wVpZO9 1Wl7YfsR0sQTtoO9JYICVMPq538BOg3ZF814Lw1ASKv3K4QMKXpPCN1Gu6tTQbX1SWJcak LV7IsZzV2HWhdsxOg1/8JkMu/o0UlpLp7Noy/ut9lHRwLw8jOsn76Nh1DixuEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682966663; a=rsa-sha256; cv=none; b=e19HrdJ3Kh02ry2VfMJPVZjsRxmSsAGCLFycvGYOlTubMOsFJtXSQBgjlF44zVYXJSbx8a FmJ+5N/rPQFU/WiTJAjRTpLgILouCq31dvxTgFhYp2LT0U40eZmtVJKIYw5N2/H6OMTJf2 lbBvPnZYBj53lYsRJMD2CPJFt0gqELrmKO2Gy8qs2ZrzQ7tVEmqx3fRsOlRgLlnZBii00g jxgPZoOiWvIJ2uPvW6WY8HZWcbcoyZ8g1wPmSeamRdGckDxOA+FNwbh7Ssgqu8yArB4nR7 +OSKUW6LdAlbYkf9bs7axdB+/hJQk315Ub+aFsqgi7U51kNMJTBCK6YuG7eMnA== 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 4Q9BvW4lfmzH8V; Mon, 1 May 2023 18:44:23 +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 341IiN49020608; Mon, 1 May 2023 18:44:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341IiNsC020607; Mon, 1 May 2023 18:44:23 GMT (envelope-from git) Date: Mon, 1 May 2023 18:44:23 GMT Message-Id: <202305011844.341IiNsC020607@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: 5b23aaf61ef5 - main - emulators/ppsspp: simplify ffmpeg >= 5 fix after 18fb7d59e952 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/main X-Git-Reftype: branch X-Git-Commit: 5b23aaf61ef5ea6dcb30cefbaf0951f6b644dc8f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b23aaf61ef5ea6dcb30cefbaf0951f6b644dc8f commit 5b23aaf61ef5ea6dcb30cefbaf0951f6b644dc8f Author: Jan Beich AuthorDate: 2023-05-01 17:22:10 +0000 Commit: Jan Beich CommitDate: 2023-05-01 18:41:14 +0000 emulators/ppsspp: simplify ffmpeg >= 5 fix after 18fb7d59e952 --- emulators/ppsspp/files/patch-ffmpeg5 | 14 ++++++++++--- emulators/ppsspp/files/patch-revert | 40 ------------------------------------ 2 files changed, 11 insertions(+), 43 deletions(-) diff --git a/emulators/ppsspp/files/patch-ffmpeg5 b/emulators/ppsspp/files/patch-ffmpeg5 index 051628becfe7..2c74a66afe6e 100644 --- a/emulators/ppsspp/files/patch-ffmpeg5 +++ b/emulators/ppsspp/files/patch-ffmpeg5 @@ -40,7 +40,7 @@ https://github.com/hrydgard/ppsspp/issues/15308 if (pmp_Codec == NULL){ ERROR_LOG(ME, "Can not find H264 codec, please update ffmpeg"); return false; ---- Core/HW/MediaEngine.cpp.orig 2023-01-03 10:14:31 UTC +--- Core/HW/MediaEngine.cpp.orig 2023-04-30 11:42:05 UTC +++ Core/HW/MediaEngine.cpp @@ -38,6 +38,10 @@ extern "C" { #include "libavutil/imgutils.h" @@ -53,7 +53,7 @@ https://github.com/hrydgard/ppsspp/issues/15308 } #endif // USE_FFMPEG -@@ -434,7 +438,11 @@ bool MediaEngine::addVideoStream(int streamNum, int st +@@ -410,13 +414,19 @@ bool MediaEngine::addVideoStream(int streamNum, int st #else stream->request_probe = 0; #endif @@ -65,7 +65,15 @@ https://github.com/hrydgard/ppsspp/issues/15308 // We could set the width here, but we don't need to. if (streamNum >= m_expectedVideoStreams) { ++m_expectedVideoStreams; -@@ -521,7 +529,7 @@ bool MediaEngine::setVideoStream(int streamNum, bool f + } + ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 33, 100) + m_codecsToClose.push_back(stream->codec); ++#endif + return true; + } + } +@@ -499,7 +509,7 @@ bool MediaEngine::setVideoStream(int streamNum, bool f AVStream *stream = m_pFormatCtx->streams[streamNum]; #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100) diff --git a/emulators/ppsspp/files/patch-revert b/emulators/ppsspp/files/patch-revert deleted file mode 100644 index ec87d81bc36f..000000000000 --- a/emulators/ppsspp/files/patch-revert +++ /dev/null @@ -1,40 +0,0 @@ -Temporarily revert https://github.com/hrydgard/ppsspp/commit/94bab4506f2e -until files/patch-ffmpeg5 is adapted - -Core/HW/MediaEngine.cpp:427:38: error: no member named 'codec' in 'AVStream' - m_codecsToClose.push_back(stream->codec); - ~~~~~~ ^ - ---- Core/HW/MediaEngine.cpp.orig 2023-04-30 11:42:05 UTC -+++ Core/HW/MediaEngine.cpp -@@ -351,11 +351,6 @@ void MediaEngine::closeContext() - #endif - } - m_pCodecCtxs.clear(); -- // These are streams allocated from avformat_new_stream. -- for (auto it : m_codecsToClose) { -- avcodec_close(it); -- } -- m_codecsToClose.clear(); - if (m_pFormatCtx) - avformat_close_input(&m_pFormatCtx); - sws_freeContext(m_sws_ctx); -@@ -415,8 +410,6 @@ bool MediaEngine::addVideoStream(int streamNum, int streamId) { - if (streamNum >= m_expectedVideoStreams) { - ++m_expectedVideoStreams; - } -- -- m_codecsToClose.push_back(stream->codec); - return true; - } - } ---- Core/HW/MediaEngine.h.orig 2023-04-30 11:42:05 UTC -+++ Core/HW/MediaEngine.h -@@ -126,7 +126,6 @@ class MediaEngine - #ifdef USE_FFMPEG - // Video ffmpeg context - not used for audio - AVFormatContext *m_pFormatCtx = nullptr; -- std::vector m_codecsToClose; - AVIOContext *m_pIOContext = nullptr; - SwsContext *m_sws_ctx = nullptr; - #endif