From owner-dev-commits-ports-main@freebsd.org Tue May 25 00:22:50 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5E6DC640607; Tue, 25 May 2021 00:22:50 +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 4FpvtL258Mz3mBD; Tue, 25 May 2021 00:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2E7FD141B8; Tue, 25 May 2021 00:22:50 +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 14P0MoYT013856; Tue, 25 May 2021 00:22:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14P0MorQ013855; Tue, 25 May 2021 00:22:50 GMT (envelope-from git) Date: Tue, 25 May 2021 00:22:50 GMT Message-Id: <202105250022.14P0MorQ013855@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: 0655ae9c5820 - main - emulators/rpcs3: update to 0.0.16.12307 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: 0655ae9c582047ac4998e13a05bb8f0dde5822e5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 May 2021 00:22:50 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0655ae9c582047ac4998e13a05bb8f0dde5822e5 commit 0655ae9c582047ac4998e13a05bb8f0dde5822e5 Author: Jan Beich AuthorDate: 2021-05-15 20:51:12 +0000 Commit: Jan Beich CommitDate: 2021-05-25 00:21:23 +0000 emulators/rpcs3: update to 0.0.16.12307 Changes: https://github.com/RPCS3/rpcs3/compare/5db38c012...9ba3e6d3f --- emulators/rpcs3/Makefile | 6 ++--- emulators/rpcs3/distinfo | 10 ++++---- .../rpcs3/files/patch-rpcs3_util_vm__native.cpp | 30 ++++++++++++++++++++++ emulators/rpcs3/pkg-plist | 2 +- 4 files changed, 39 insertions(+), 9 deletions(-) diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index e8af63e2e195..e2f57a021c96 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,7 +1,7 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.16-12242 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -gfe17c8302 +DISTVERSION= 0.0.16-12307 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -g9ba3e6d3f CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org @@ -24,7 +24,7 @@ ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 USE_GITHUB= yes GH_ACCOUNT= RPCS3 GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-28-g8961cf8:hidapi/3rdparty/hidapi \ - RPCS3:llvm-mirror:4d88105d4a89:llvm/llvm \ + RPCS3:llvm-mirror:5836324d6443:llvm/llvm \ Cyan4973:xxHash:v0.8.0:xxHash/3rdparty/xxHash \ FNA-XNA:FAudio:21.04:FAudio/3rdparty/FAudio \ asmjit:asmjit:723f585:asmjit/3rdparty/asmjit/asmjit \ diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index fa8528cd2258..9dad7c72e88e 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,10 +1,10 @@ -TIMESTAMP = 1620822510 -SHA256 (RPCS3-rpcs3-v0.0.16-12242-gfe17c8302_GH0.tar.gz) = 4698a21856ce9ea95189ff2c61884ede9bac97e79853abcafa17380826d58907 -SIZE (RPCS3-rpcs3-v0.0.16-12242-gfe17c8302_GH0.tar.gz) = 8033829 +TIMESTAMP = 1621887366 +SHA256 (RPCS3-rpcs3-v0.0.16-12307-g9ba3e6d3f_GH0.tar.gz) = 045ad981bcf33af37d63c9a04da30693360921afb5d854f3bac860ab182698bb +SIZE (RPCS3-rpcs3-v0.0.16-12307-g9ba3e6d3f_GH0.tar.gz) = 8057308 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-28-g8961cf8_GH0.tar.gz) = 0f0f3b3af2fff7004f479a1adbbb81658b62a2e07b5978acc65833273e8124d7 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-28-g8961cf8_GH0.tar.gz) = 105391 -SHA256 (RPCS3-llvm-mirror-4d88105d4a89_GH0.tar.gz) = 1fa72514ae8189b0dd89953c1469874977812183c8538b67aadd76c70d683706 -SIZE (RPCS3-llvm-mirror-4d88105d4a89_GH0.tar.gz) = 27246617 +SHA256 (RPCS3-llvm-mirror-5836324d6443_GH0.tar.gz) = b996a126f5d1beb558d63fb79005cf193c591cf8787dd86bcdb1f289f817e964 +SIZE (RPCS3-llvm-mirror-5836324d6443_GH0.tar.gz) = 27243918 SHA256 (Cyan4973-xxHash-v0.8.0_GH0.tar.gz) = 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f SIZE (Cyan4973-xxHash-v0.8.0_GH0.tar.gz) = 145909 SHA256 (FNA-XNA-FAudio-21.04_GH0.tar.gz) = 220fe329d2dcf1c4fa929de0a7532ee7f98facf3184ce9d21a21fad1f510bc03 diff --git a/emulators/rpcs3/files/patch-rpcs3_util_vm__native.cpp b/emulators/rpcs3/files/patch-rpcs3_util_vm__native.cpp new file mode 100644 index 000000000000..013df4bb0fa3 --- /dev/null +++ b/emulators/rpcs3/files/patch-rpcs3_util_vm__native.cpp @@ -0,0 +1,30 @@ +https://github.com/RPCS3/rpcs3/issues/10334 + +--- rpcs3/util/vm_native.cpp.orig 2021-05-24 15:21:52 UTC ++++ rpcs3/util/vm_native.cpp +@@ -432,24 +432,7 @@ namespace utils + + // Truncate file since it may be dirty (fool-proof) + ensure(::ftruncate(m_file, 0) >= 0); +- ensure(::ftruncate(m_file, 0x10000) >= 0); +- stats.st_size = 0x10000; +- +-#ifdef SEEK_DATA +- errno = EINVAL; +- if (stats.st_blocks && ::lseek(m_file, 0, SEEK_DATA) ^ stats.st_size && errno != ENXIO) +- { +- fmt::throw_exception("Failed to initialize sparse file in '%s'\n" +- "It seems this filesystem doesn't support sparse files (%d).\n", +- storage.empty() ? fs::get_cache_dir().c_str() : storage.c_str(), +errno); +- } +-#endif +- +- if (stats.st_size ^ m_size) +- { +- // Fix file size +- ensure(::ftruncate(m_file, m_size) >= 0); +- } ++ ensure(::ftruncate(m_file, m_size) >= 0); + #endif + } + diff --git a/emulators/rpcs3/pkg-plist b/emulators/rpcs3/pkg-plist index fd886080ceee..eb8580e00c09 100644 --- a/emulators/rpcs3/pkg-plist +++ b/emulators/rpcs3/pkg-plist @@ -2,7 +2,7 @@ bin/rpcs3 share/applications/rpcs3.desktop share/icons/hicolor/48x48/apps/rpcs3.png share/icons/hicolor/scalable/apps/rpcs3.svg -share/metainfo/rpcs3.appdata.xml +share/metainfo/rpcs3.metainfo.xml %%DATADIR%%/GuiConfigs/Classic (Bright).qss %%DATADIR%%/GuiConfigs/Darker Style by TheMitoSan.qss %%DATADIR%%/GuiConfigs/Envy.qss