diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 7a822154f34a..2d921c4dc5a5 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,94 +1,94 @@ 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 COMMENT= PS3 emulator/debugger LICENSE= APACHE20 BSD3CLAUSE BSL GPLv2 MIT ZLIB LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC_cereal}/LICENSE LICENSE_FILE_BSL= ${WRKSRC_span}/LICENSE_1_0.txt LICENSE_FILE_MIT= ${WRKSRC_pugixml}/LICENSE.md LICENSE_FILE_ZLIB= ${WRKSRC_asmjit}/LICENSE.md LIB_DEPENDS= libcurl.so:ftp/curl \ libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg ONLY_FOR_ARCHS= amd64 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 \ google:flatbuffers:v1.11.0:flatbuffers/3rdparty/flatbuffers \ jbeder:yaml-cpp:yaml-cpp-0.6.3-30-g6a211f0:yamlcpp/3rdparty/yaml-cpp \ KhronosGroup:SPIRV-Headers:1.5.3.reservations1:spirv_headers/Vulkan/spirv-headers \ KhronosGroup:SPIRV-Tools:v2020.4:spirv_tools/Vulkan/spirv-tools \ KhronosGroup:glslang:11.4.0:glslang/Vulkan/glslang \ tcbrindle:span:9d7559a:span/3rdparty/span \ USCiLab:cereal:v1.3.0-5-g60c69df9:cereal/3rdparty/cereal \ wolfSSL:wolfssl:v4.5.0-stable-80-g39b544860:wolfssl/3rdparty/wolfssl \ zeux:pugixml:v1.11.4:pugixml/3rdparty/pugixml USES= cmake compiler:c++17-lang gl iconv:wchar_t localbase:ldflags \ openal:soft pkgconfig python:3.4+,build qt:5 xorg USE_GL= gl glew USE_QT= qmake_build buildtools_build core concurrent dbus gui widgets USE_XORG= x11 CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_CURL USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG CMAKE_OFF= USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS LDFLAGS+= -Wl,--as-needed # GLU OPTIONS_DEFINE= ALSA EVDEV FAUDIO PULSEAUDIO VULKAN OPTIONS_DEFAULT=EVDEV FAUDIO VULKAN ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins ALSA_CMAKE_BOOL= USE_ALSA EVDEV_DESC= libevdev-based joystick support EVDEV_CMAKE_BOOL= USE_LIBEVDEV EVDEV_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto EVDEV_LIB_DEPENDS= libevdev.so:devel/libevdev FAUDIO_DESC= FAudio audio support FAUDIO_USES= sdl FAUDIO_USE= SDL=sdl2 FAUDIO_CMAKE_BOOL= USE_FAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE VULKAN_DESC= Vulkan renderer VULKAN_BUILD_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_CMAKE_BOOL= USE_VULKAN post-patch: @${REINPLACE_CMD} -e '/GIT_BRANCH/s/local_build/master/' \ -e '/GIT_FULL_BRANCH/s/local_build/${GH_ACCOUNT}\/${GH_PROJECT}\/master/' \ -e '/GIT_VERSION/s/local_build/${GH_TAGNAME:C/[^-]*-//}/' \ ${WRKSRC}/${PORTNAME}/git-version.cmake .include # Ignore Mk/bsd.default-versions.mk but respect make.conf(5) .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mllvm*} LLVM_DEFAULT= 12 # bump if not latest release .endif BUILD_DEPENDS+= clang++${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} USES:= ${USES:Ncompiler*} CC= clang${LLVM_DEFAULT} CXX= clang++${LLVM_DEFAULT} CPP= clang-cpp${LLVM_DEFAULT} .include diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index fa8528cd2258..9dad7c72e88e 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,31 +1,31 @@ -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 SIZE (FNA-XNA-FAudio-21.04_GH0.tar.gz) = 1138944 SHA256 (asmjit-asmjit-723f585_GH0.tar.gz) = 1e20547cc3e10c69d16f50dd0b21ac58660dcb8fa455e39d90883305d6247686 SIZE (asmjit-asmjit-723f585_GH0.tar.gz) = 446823 SHA256 (google-flatbuffers-v1.11.0_GH0.tar.gz) = 3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b SIZE (google-flatbuffers-v1.11.0_GH0.tar.gz) = 894944 SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.3-30-g6a211f0_GH0.tar.gz) = 4b832de2a1d0934ecc58c9c920e17908e52305f9d99d7d24625d3f13e974e0cc SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.3-30-g6a211f0_GH0.tar.gz) = 1398571 SHA256 (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = aa3c579cd250b23aae735c7c55c3514df4ffc5f98963d95a952bcc89336768bd SIZE (KhronosGroup-SPIRV-Headers-1.5.3.reservations1_GH0.tar.gz) = 393836 SHA256 (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = d6377d2febe831eb78e84593a10d242a4fd52cb12174133151cb48801abdc6d2 SIZE (KhronosGroup-SPIRV-Tools-v2020.4_GH0.tar.gz) = 2282982 SHA256 (KhronosGroup-glslang-11.4.0_GH0.tar.gz) = 9bae79c2b640b60474f8944a5ab4aff3af990074636ea2a0a3c97cb86be61dfa SIZE (KhronosGroup-glslang-11.4.0_GH0.tar.gz) = 3342311 SHA256 (tcbrindle-span-9d7559a_GH0.tar.gz) = 4fbe8364b8ff9388fd6ca1a11ce39ff448af76394d561d6f879cf1180b14f160 SIZE (tcbrindle-span-9d7559a_GH0.tar.gz) = 130675 SHA256 (USCiLab-cereal-v1.3.0-5-g60c69df9_GH0.tar.gz) = 3931a29bccc2ebbed13fcc3229643bfd9cdf9e81b5f09ed298f2062016e6f302 SIZE (USCiLab-cereal-v1.3.0-5-g60c69df9_GH0.tar.gz) = 374806 SHA256 (wolfSSL-wolfssl-v4.5.0-stable-80-g39b544860_GH0.tar.gz) = ae8198711705b989268fc46be5a614f8fede4dcaff39cacb1cc1e4e20f9e7d32 SIZE (wolfSSL-wolfssl-v4.5.0-stable-80-g39b544860_GH0.tar.gz) = 7481334 SHA256 (zeux-pugixml-v1.11.4_GH0.tar.gz) = 017139251c122dbff400a507cddc4cb74120a431a50c6c524f30edcc5b331ade SIZE (zeux-pugixml-v1.11.4_GH0.tar.gz) = 566750 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 @@ -1,45 +1,45 @@ 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 %%DATADIR%%/GuiConfigs/Kuroi (Dark) by Ani.qss %%DATADIR%%/GuiConfigs/ModernBlue Theme by TheMitoSan.qss %%DATADIR%%/GuiConfigs/Nekotekina by GooseWing.qss %%DATADIR%%/GuiConfigs/Skyline (Nightfall).qss %%DATADIR%%/GuiConfigs/Skyline.qss %%DATADIR%%/GuiConfigs/YoRHa by Ani.qss %%DATADIR%%/GuiConfigs/YoRHa-background.jpg %%DATADIR%%/GuiConfigs/kot-bg.jpg %%DATADIR%%/GuiConfigs/list_arrow_blue.png %%DATADIR%%/GuiConfigs/list_arrow_down_blue.png %%DATADIR%%/GuiConfigs/list_arrow_down_green.png %%DATADIR%%/GuiConfigs/list_arrow_down_white.png %%DATADIR%%/GuiConfigs/list_arrow_green.png %%DATADIR%%/GuiConfigs/list_arrow_white.png %%DATADIR%%/Icons/ui/L1.png %%DATADIR%%/Icons/ui/L2.png %%DATADIR%%/Icons/ui/R1.png %%DATADIR%%/Icons/ui/R2.png %%DATADIR%%/Icons/ui/circle.png %%DATADIR%%/Icons/ui/cross.png %%DATADIR%%/Icons/ui/dpad.png %%DATADIR%%/Icons/ui/dpad_down.png %%DATADIR%%/Icons/ui/dpad_left.png %%DATADIR%%/Icons/ui/dpad_right.png %%DATADIR%%/Icons/ui/dpad_up.png %%DATADIR%%/Icons/ui/fade_bottom.png %%DATADIR%%/Icons/ui/fade_top.png %%DATADIR%%/Icons/ui/left_stick.png %%DATADIR%%/Icons/ui/new.png %%DATADIR%%/Icons/ui/right_stick.png %%DATADIR%%/Icons/ui/save.png %%DATADIR%%/Icons/ui/select.png %%DATADIR%%/Icons/ui/square.png %%DATADIR%%/Icons/ui/start.png %%DATADIR%%/Icons/ui/triangle.png %%DATADIR%%/git/README.md %%DATADIR%%/git/commits.lst