From nobody Fri Feb 17 16:49:38 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 4PJHpp36mGz3r8Rg; Fri, 17 Feb 2023 16:49:38 +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 4PJHpp2VmKz3jTw; Fri, 17 Feb 2023 16:49:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676652578; 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=asxgTda8UGfrWRS5IFX0c8uHigb5VN06dz+SQlg9IxQ=; b=Kr06SW3sWRJSW+xeTm9AIL21unLjBMTDR49RG7dcE6EFMeWYBbXCCGGwBAblQBSjzOPC/1 KhfyyHqU6VqQ4ZJ5YEC1Phl/VX0A4PXJYex2ysP+ogcNcXny+2pRO3JAE+whVDroUuXYRW DJolvW0WsXPO1RY5lAbaFTQ5opATJEHSuhGoRYmMxZ8icWL29mjUF4WRcRoH8IhgdAjr08 kOcODOIyFWR0PYhh5JiIOlOgsYiw1hM0iid49sutAZg6pEwqmAsf+9YVRnZoJsQqyapDoz oHhizJY+AoQqoVkyb4jDl6WWT9BF1mFM9t94mdG4m9U9EWupU3SuTN7gv1vFPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676652578; 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=asxgTda8UGfrWRS5IFX0c8uHigb5VN06dz+SQlg9IxQ=; b=GJ+3uOaD0pw5+TeL9hdY2GiGmq6oHfoMdkl+ARwx4oTJoAyW2RnhwiZMUcqi3mFDi2Degv vOyZrUacpW4Ze88F0WV6Dz+uY1TSeiQL8urfUIAgkIrtcAbl6n+7nFW4hW6Ogw1TnlDE7P rk0/o0oLGz9SxMY4/scEJo2wtYY/zk4UhC61EHvW4o/CO/cBicGU16UWa/r1edrcrvDvsd 5iuSsxgCwqNDX9uB0jPP5+4j5R4sBfNNA70aTstwBlmlc7B2Qg5amlPQfWFm7Ii5qbI4C9 TUe3t8O6FdnrPZoJpDBLSMSNDRJWBh6RKqfJ3ryRL2OLzebkT6GS5lLD7mNV3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676652578; a=rsa-sha256; cv=none; b=Ee13d0HyMpwgHjsJku1lUKRDaVSTNNLh0Jr+aqgI4tWQqzkvGiK/K7aAdSmpP61rBt0Lgr efH7nIsTZFi991kgmV8csePww9bIhLrRVcAm1OotlWLQmYN8HF6jHbAiC4QxFHMeeWIpX1 5RdSfGxC0GSUivN0ah5mX6vePSIxyOGRpPq1pLMabo2m6HUdwIcA1HHnMnr242a/C/Ps+b fdfj95hCYY7DDaiLNJiW8JF59qVFsMguq/vR3CBwUjwF1oautfCMJtNPrFCpR6/SuJwhak OhHcdPlj+JNren79zZx6z4+CGFwkLdcBlHKvCTVWvvfpgJNbcUd7Nn72mxWPtA== 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 4PJHpp1YDgzqkM; Fri, 17 Feb 2023 16:49:38 +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 31HGncmX026297; Fri, 17 Feb 2023 16:49:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31HGnckt026296; Fri, 17 Feb 2023 16:49:38 GMT (envelope-from git) Date: Fri, 17 Feb 2023 16:49:38 GMT Message-Id: <202302171649.31HGnckt026296@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: a535111bd336 - main - emulators/pcsx2: Update to 1.7.4097 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: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a535111bd3362c3463253683afbf485ffd8762cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=a535111bd3362c3463253683afbf485ffd8762cc commit a535111bd3362c3463253683afbf485ffd8762cc Author: Ganael LAPLANCHE AuthorDate: 2023-02-17 16:49:14 +0000 Commit: Ganael LAPLANCHE CommitDate: 2023-02-17 16:49:14 +0000 emulators/pcsx2: Update to 1.7.4097 --- emulators/pcsx2/Makefile | 3 +-- emulators/pcsx2/distinfo | 6 +++--- emulators/pcsx2/files/patch-common-Linux-LnxHostSys.cpp | 11 ----------- emulators/pcsx2/files/patch-pcsx2-Frontend-CommonHost.cpp | 13 ------------- 4 files changed, 4 insertions(+), 29 deletions(-) diff --git a/emulators/pcsx2/Makefile b/emulators/pcsx2/Makefile index 513f529bdcf7..5bb68b894e8b 100644 --- a/emulators/pcsx2/Makefile +++ b/emulators/pcsx2/Makefile @@ -1,6 +1,5 @@ PORTNAME= pcsx2 -PORTVERSION= 1.7.4075 -PORTREVISION= 1 +PORTVERSION= 1.7.4097 CATEGORIES= emulators MAINTAINER= martymac@FreeBSD.org diff --git a/emulators/pcsx2/distinfo b/emulators/pcsx2/distinfo index 46af9a781096..c812bd0ebdf2 100644 --- a/emulators/pcsx2/distinfo +++ b/emulators/pcsx2/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1676320977 -SHA256 (pcsx2-pcsx2-1.7.4075-v1.7.4075_GH0.tar.gz) = f4101a0fa703ebc0ff52c4d4bb017c536f97af6ef6907a429512e47f1cc593b6 -SIZE (pcsx2-pcsx2-1.7.4075-v1.7.4075_GH0.tar.gz) = 9193940 +TIMESTAMP = 1676582077 +SHA256 (pcsx2-pcsx2-1.7.4097-v1.7.4097_GH0.tar.gz) = 0dd25d4b4dd864f2d695f0704b3122668c1f0ecf55457cc5fbe6c27ce72458c6 +SIZE (pcsx2-pcsx2-1.7.4097-v1.7.4097_GH0.tar.gz) = 9195636 SHA256 (rtissera-libchdr-5de1a59019815ccdbba0fe07c71b31406d023248_GH0.tar.gz) = e0df9f88cd93e673d384cbf7cf28ea396aba96c769b41ec149a259768b27b00c SIZE (rtissera-libchdr-5de1a59019815ccdbba0fe07c71b31406d023248_GH0.tar.gz) = 414409 SHA256 (biojppm-rapidyaml-213b201d264139cd1b887790197e08850af628e3_GH0.tar.gz) = c206d4565ccfa721991a8df90821d1a1f747e68385a0f3f5b9ab995e191c06be diff --git a/emulators/pcsx2/files/patch-common-Linux-LnxHostSys.cpp b/emulators/pcsx2/files/patch-common-Linux-LnxHostSys.cpp deleted file mode 100644 index 848b8a424690..000000000000 --- a/emulators/pcsx2/files/patch-common-Linux-LnxHostSys.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- common/Linux/LnxHostSys.cpp.orig 2023-02-10 03:43:10 UTC -+++ common/Linux/LnxHostSys.cpp -@@ -100,6 +100,8 @@ static void SysPageFaultSignalFilter(int signal, sigin - - #if defined(__APPLE__) && defined(__x86_64__) - void* const exception_pc = reinterpret_cast(static_cast(ctx)->uc_mcontext->__ss.__rip); -+#elif defined(__FreeBSD__) && defined(__x86_64__) -+ void* const exception_pc = reinterpret_cast(static_cast(ctx)->uc_mcontext.mc_rip); - #elif defined(__x86_64__) - void* const exception_pc = reinterpret_cast(static_cast(ctx)->uc_mcontext.gregs[REG_RIP]); - #else diff --git a/emulators/pcsx2/files/patch-pcsx2-Frontend-CommonHost.cpp b/emulators/pcsx2/files/patch-pcsx2-Frontend-CommonHost.cpp deleted file mode 100644 index f6516815a51e..000000000000 --- a/emulators/pcsx2/files/patch-pcsx2-Frontend-CommonHost.cpp +++ /dev/null @@ -1,13 +0,0 @@ -Handle config path on FreeBSD - ---- pcsx2/Frontend/CommonHost.cpp.orig 2023-02-10 03:43:10 UTC -+++ pcsx2/Frontend/CommonHost.cpp -@@ -160,7 +160,7 @@ void CommonHost::SetDataDirectory() - EmuFolders::DataRoot = Path::Combine(StringUtil::WideStringToUTF8String(documents_directory), "PCSX2"); - CoTaskMemFree(documents_directory); - } --#elif defined(__linux__) -+#elif defined(__linux__) || defined(__FreeBSD__) - // Use $XDG_CONFIG_HOME/PCSX2 if it exists. - const char* xdg_config_home = getenv("XDG_CONFIG_HOME"); - if (xdg_config_home && Path::IsAbsolute(xdg_config_home))