From nobody Sun Apr 30 16:48:47 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 4Q8XNb2n1Fz482Tn; Sun, 30 Apr 2023 16:48:47 +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 4Q8XNb1v2Zz3Qj8; Sun, 30 Apr 2023 16:48:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682873327; 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=UNcnRgCKKxuC9W1jBOsUAbjhw6NlKwuPL/V3hnHWem4=; b=xGAuYvToPiFfc6+1lRQo2X6lTZ0EKPgv5G5yagjx4weSImSIA3SZKg0yaaZ2MPxQsXhKJ+ XeniLkY1y55CTh7JkQ9FGEk6wuBybwnCc0/X3LX7W+14H+16/sQzGWZ4zyJSGnMdzGqQ3m Uers6BHo4JWH3xrCPiT9mSH1gB333K62tXYEg3wiKdWnUXm1t58c/0+bs+9stH8IVP3ihE MWT8mCBsoJwfmLSCBeLVxYpRh40EmqiqKCsgLz6rHtPOowOpBep49c/DrpAcdHi+Ti8oyE u1G7v7V2mqdh3ZeCBOT2X6aqDWV7pHB72ce+kcR0hmschN419DgToSKB5jbPUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682873327; 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=UNcnRgCKKxuC9W1jBOsUAbjhw6NlKwuPL/V3hnHWem4=; b=Xegj+MNaoCPf84bZym+PihD6NWSQdvktKuXIfG/N9MHoopZ9E0NNiufacS8zK+lWtlS8Fi 7Z96CYuQagiv1Y3zHoL/PrLdSJpG9bCYm5Jr+wMkrDsRhpIJRSgbhuZSJBvcYvh6JxjmTF zRoG7ScIkEWP3Up0vMJX//YzA7uiTHK6wL7aVmf70JCtjCZfM5PLOmBNZ/+GRzW5Gp+snw LxaisMUv3WBTh1FQXEtWz2rr7qz0fyWUyvNWp4w/fqT1zRxtODi3VPGfmLDvTA3xm9ue3o h0m9yRQJMGMIZ4Y2DM7Az0gCtG2cs4T+x8pkUjMYQ0VhFtN2fRsmgMt0TFSFLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682873327; a=rsa-sha256; cv=none; b=p0r8uapAE8JHesll9Qvj6B1LZxo39WqupQCBcA8pzsdIA11P+QYFwgPCUWJ0ItKi5N6qgb ZFU6a55xGdoufi+uUQj0UFkQEiRi21s4je4Oy2/Tfab8Ml9Bbvmvv2GTj4uAB/FzooH1cO LCdgSs9DZJKGLrx6h+9HVLgT0GNb2ITg8nKy5RN3wamA388N9uYoJRyURPAQRz//dk/DZ2 2rE1V8Haui1aScHVXqKW43oi/xVWNHvRdqzgi25xKjZ9bMcNPyhD86obeOlUHD0DmE8FiY 30n3g28yTN0sFDaRcvXs/WFRSEONBtzP+tVZ0LuoRFAGqedL1XDV2zUBu6o2sg== 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 4Q8XNb0ySWzWHH; Sun, 30 Apr 2023 16:48:47 +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 33UGmlF3045477; Sun, 30 Apr 2023 16:48:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33UGmlbV045476; Sun, 30 Apr 2023 16:48:47 GMT (envelope-from git) Date: Sun, 30 Apr 2023 16:48:47 GMT Message-Id: <202304301648.33UGmlbV045476@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: 18fb7d59e952 - main - emulators/ppsspp: update to 1.15 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: 18fb7d59e9524aa26fa5896162e0bfc8aaa57e6f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=18fb7d59e9524aa26fa5896162e0bfc8aaa57e6f commit 18fb7d59e9524aa26fa5896162e0bfc8aaa57e6f Author: Jan Beich AuthorDate: 2023-04-30 11:42:05 +0000 Commit: Jan Beich CommitDate: 2023-04-30 16:47:21 +0000 emulators/ppsspp: update to 1.15 Changes: https://github.com/hrydgard/ppsspp/releases/tag/v1.15 Reported by: GitHub (watch releases) --- emulators/libretro-ppsspp/Makefile | 2 +- emulators/ppsspp-qt5/Makefile | 2 +- emulators/ppsspp/Makefile | 13 ++++++------ emulators/ppsspp/distinfo | 24 ++++++++++++---------- emulators/ppsspp/files/patch-revert | 40 +++++++++++++++++++++++++++++++++++++ 5 files changed, 62 insertions(+), 19 deletions(-) diff --git a/emulators/libretro-ppsspp/Makefile b/emulators/libretro-ppsspp/Makefile index 0b8a371c9109..59effea19ca9 100644 --- a/emulators/libretro-ppsspp/Makefile +++ b/emulators/libretro-ppsspp/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMEPREFIX= libretro- MASTERDIR= ${.CURDIR}/../ppsspp diff --git a/emulators/ppsspp-qt5/Makefile b/emulators/ppsspp-qt5/Makefile index c96f2bd29e3d..2b5cf472f7e3 100644 --- a/emulators/ppsspp-qt5/Makefile +++ b/emulators/ppsspp-qt5/Makefile @@ -1,4 +1,4 @@ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 MASTERDIR= ${.CURDIR}/../ppsspp diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index adadab1a6165..ba9c02c7798f 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -1,7 +1,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.14.4 -PORTREVISION?= 2 +DISTVERSION?= 1.15 +PORTREVISION?= 0 CATEGORIES= emulators # XXX Get from Debian once #697821 lands MASTER_SITES= https://bazaar.launchpad.net/~sergio-br2/${PORTNAME}/debian-sdl/download/5/${PORTNAME}.1-20140802045408-dd26dik367ztj5xg-8/:manpage @@ -26,12 +26,13 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard -GH_TUPLE?= hrydgard:glslang:8.13.3743-339-gdc11adde:glslang/ext/glslang \ +GH_TUPLE?= hrydgard:glslang:8.13.3743-948-gb34f619e:glslang/ext/glslang \ hrydgard:miniupnp:miniupnpd_2_1-502-g3a87be3:miniupnp/ext/miniupnp \ - facebook:zstd:v1.4.7-1276-g096dccbc:zstd/ext/zstd \ + facebook:zstd:v1.5.5:zstd/ext/zstd \ + google:cpu_features:v0.7.0-60-g75ec988:cpu_features/ext/cpu_features \ unknownbrackets:ppsspp-debugger:9776332:debugger/assets/debugger \ - KhronosGroup:SPIRV-Cross:2021-01-15:SPIRV/ext/SPIRV-Cross \ - Kingcom:armips:v0.11.0-184-g6719ede:armips/ext/armips \ + KhronosGroup:SPIRV-Cross:sdk-1.3.239.0:SPIRV/ext/SPIRV-Cross \ + Kingcom:armips:v0.11.0-188-g7bd1ec9:armips/ext/armips \ Kingcom:filesystem:v1.3.2-12-g3f1c185:filesystem/ext/armips/ext/filesystem CONFLICTS_INSTALL= ${PORTNAME}-* diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo index 9e215aec9d1f..3bce2b7c9e7a 100644 --- a/emulators/ppsspp/distinfo +++ b/emulators/ppsspp/distinfo @@ -1,19 +1,21 @@ -TIMESTAMP = 1672740871 +TIMESTAMP = 1682854925 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b SIZE (ppsspp.1) = 1598 -SHA256 (hrydgard-ppsspp-v1.14.4_GH0.tar.gz) = b270e93e50a7808b27432ef680c6056fccefe47acd3ba2b722156f69584037c5 -SIZE (hrydgard-ppsspp-v1.14.4_GH0.tar.gz) = 37139389 -SHA256 (hrydgard-glslang-8.13.3743-339-gdc11adde_GH0.tar.gz) = ced8f91c3b07f0c1227649732c9ba047d89b09038a446a3c0636f909fb40ab24 -SIZE (hrydgard-glslang-8.13.3743-339-gdc11adde_GH0.tar.gz) = 3297180 +SHA256 (hrydgard-ppsspp-v1.15_GH0.tar.gz) = fd7a7cf040a22eb3455ba003694136f99e9e49762cba99781aede7225f0fded4 +SIZE (hrydgard-ppsspp-v1.15_GH0.tar.gz) = 43635053 +SHA256 (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 8f002c902a5bc5a9d3c7e58b82ba2a6845ee08a01b756eaf4afefff806d109c7 +SIZE (hrydgard-glslang-8.13.3743-948-gb34f619e_GH0.tar.gz) = 3689872 SHA256 (hrydgard-miniupnp-miniupnpd_2_1-502-g3a87be3_GH0.tar.gz) = 3aefaee9eb86e5f44267aa9e8d37b46d2be8f1c72879cebefa365690a9348190 SIZE (hrydgard-miniupnp-miniupnpd_2_1-502-g3a87be3_GH0.tar.gz) = 448853 -SHA256 (facebook-zstd-v1.4.7-1276-g096dccbc_GH0.tar.gz) = 3296d8e6727b0348ffbfe03eb91ed97768ee2672974b674d68aa4bcb83a593e3 -SIZE (facebook-zstd-v1.4.7-1276-g096dccbc_GH0.tar.gz) = 2143525 +SHA256 (facebook-zstd-v1.5.5_GH0.tar.gz) = 98e9c3d949d1b924e28e01eccb7deed865eefebf25c2f21c702e5cd5b63b85e1 +SIZE (facebook-zstd-v1.5.5_GH0.tar.gz) = 2386533 +SHA256 (google-cpu_features-v0.7.0-60-g75ec988_GH0.tar.gz) = 6bf96c7c07fec41863b8744913896e326dc84c762984e2e1835ce2fd64fbb473 +SIZE (google-cpu_features-v0.7.0-60-g75ec988_GH0.tar.gz) = 102340 SHA256 (unknownbrackets-ppsspp-debugger-9776332_GH0.tar.gz) = adc88664cb127b7797b03ffe07274096ac8ac037f143bf636b6208084c47e4d7 SIZE (unknownbrackets-ppsspp-debugger-9776332_GH0.tar.gz) = 810213 -SHA256 (KhronosGroup-SPIRV-Cross-2021-01-15_GH0.tar.gz) = d700863b548cbc7f27a678cee305f561669a126eb2cc11d36a7023dfc462b9c4 -SIZE (KhronosGroup-SPIRV-Cross-2021-01-15_GH0.tar.gz) = 1444164 -SHA256 (Kingcom-armips-v0.11.0-184-g6719ede_GH0.tar.gz) = 0c584c3a7712e6cdbe170703fffa55d1ec9c38472cb25219ef4611363f50f805 -SIZE (Kingcom-armips-v0.11.0-184-g6719ede_GH0.tar.gz) = 222945 +SHA256 (KhronosGroup-SPIRV-Cross-sdk-1.3.239.0_GH0.tar.gz) = a1695022880e7ef3c2d407647f79876045dc2a3ed012753adc71ead5cc5178ba +SIZE (KhronosGroup-SPIRV-Cross-sdk-1.3.239.0_GH0.tar.gz) = 1707048 +SHA256 (Kingcom-armips-v0.11.0-188-g7bd1ec9_GH0.tar.gz) = 577ec512e9f400c94f018b17aa324aa0093c0e151d37d67f5754f6da1a996c2f +SIZE (Kingcom-armips-v0.11.0-188-g7bd1ec9_GH0.tar.gz) = 222958 SHA256 (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 9fa5a690e341bea1935a7f6b256e1bbd864abee988f834f10307f646dc38e604 SIZE (Kingcom-filesystem-v1.3.2-12-g3f1c185_GH0.tar.gz) = 163401 diff --git a/emulators/ppsspp/files/patch-revert b/emulators/ppsspp/files/patch-revert new file mode 100644 index 000000000000..ec87d81bc36f --- /dev/null +++ b/emulators/ppsspp/files/patch-revert @@ -0,0 +1,40 @@ +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