Date: Fri, 27 Mar 2020 23:33:11 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529285 - in head/emulators/rpcs3: . files Message-ID: <202003272333.02RNXBjk006093@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Mar 27 23:33:11 2020 New Revision: 529285 URL: https://svnweb.freebsd.org/changeset/ports/529285 Log: emulators/rpcs3: update to 0.0.9.10053 Changes: https://github.com/RPCS3/rpcs3/compare/9344b2148...f5a51599d Added: head/emulators/rpcs3/files/patch-libc++8 (contents, props changed) Modified: head/emulators/rpcs3/Makefile (contents, props changed) head/emulators/rpcs3/distinfo (contents, props changed) head/emulators/rpcs3/files/patch-CMakeLists.txt (contents, props changed) head/emulators/rpcs3/files/patch-qt-5.13 (contents, props changed) Modified: head/emulators/rpcs3/Makefile ============================================================================== --- head/emulators/rpcs3/Makefile Fri Mar 27 23:33:03 2020 (r529284) +++ head/emulators/rpcs3/Makefile Fri Mar 27 23:33:11 2020 (r529285) @@ -2,11 +2,15 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.8-9581 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -g9344b2148 -PORTREVISION= 1 +DISTVERSION= 0.0.9-10053 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -gf5a51599d CATEGORIES= emulators +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 713df966dd52.patch:-p1 # https://github.com/RPCS3/rpcs3/pull/7878 +PATCHFILES+= 7a198b85b8b2.patch:-p1 # https://github.com/RPCS3/rpcs3/pull/7880 +PATCHFILES+= f567ebcf74d1.patch:-p1 # https://github.com/RPCS3/rpcs3/pull/7882 + MAINTAINER= jbeich@FreeBSD.org COMMENT= PS3 emulator/debugger @@ -17,7 +21,8 @@ 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= libpng.so:graphics/png \ +LIB_DEPENDS= libcurl.so:ftp/curl \ + libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg ONLY_FOR_ARCHS= amd64 @@ -26,22 +31,22 @@ ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 USE_GITHUB= yes GH_ACCOUNT= RPCS3 GH_TUPLE= RPCS3:hidapi:hidapi-0.8.0-rc1-27-g9220f5e:hidapi/3rdparty/hidapi \ - RPCS3:llvm:1394b1ccc8cf:llvm/llvm \ + RPCS3:llvm-mirror:f5679565d348:llvm/llvm \ Cyan4973:xxHash:v0.6.5:xxHash/3rdparty/xxHash \ - FNA-XNA:FAudio:20.02:FAudio/3rdparty/FAudio \ - jbeder:yaml-cpp:yaml-cpp-0.6.2-23-geca9cfd:yamlcpp/3rdparty/yaml-cpp \ + FNA-XNA:FAudio:20.03:FAudio/3rdparty/FAudio \ + jbeder:yaml-cpp:yaml-cpp-0.6.3-30-g6a211f0:yamlcpp/3rdparty/yaml-cpp \ kobalicek:asmjit:fc251c9:asmjit/asmjit \ KhronosGroup:glslang:8.13.3559-55-gae594356:glslang/Vulkan/glslang \ tcbrindle:span:9d7559a:span/3rdparty/span \ - USCiLab:cereal:v1.2.0:cereal/3rdparty/cereal \ + USCiLab:cereal:v1.3.0-5-g60c69df9:cereal/3rdparty/cereal \ zeux:pugixml:v1.9-51-g8bf806c: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 declarative gui network widgets +USE_QT= qmake_build buildtools_build core concurrent dbus declarative gui widgets USE_XORG= x11 -CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG +CMAKE_ON= CMAKE_SKIP_RPATH USE_SYSTEM_CURL USE_SYSTEM_FFMPEG USE_SYSTEM_LIBPNG CMAKE_OFF= USE_NATIVE_INSTRUCTIONS LDFLAGS+= -Wl,--as-needed # GLU @@ -82,9 +87,9 @@ VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loade VULKAN_CMAKE_BOOL= USE_VULKAN post-patch: - @${REINPLACE_CMD} -e '/GIT_BRANCH/s/unknown/master/' \ - -e '/GIT_TAG/s/unknown/${GH_TAGNAME:C/-.*//}/' \ - -e '/GIT_VERSION/s/unknown/${GH_TAGNAME:C/[^-]*-//}/' \ + @${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 <bsd.port.mk> Modified: head/emulators/rpcs3/distinfo ============================================================================== --- head/emulators/rpcs3/distinfo Fri Mar 27 23:33:03 2020 (r529284) +++ head/emulators/rpcs3/distinfo Fri Mar 27 23:33:11 2020 (r529285) @@ -1,25 +1,31 @@ -TIMESTAMP = 1581689486 +TIMESTAMP = 1585339222 SHA256 (libcxx-8.0.0.src.tar.xz) = c2902675e7c84324fb2c1e45489220f250ede016cc3117186785d9dc291f9de2 SIZE (libcxx-8.0.0.src.tar.xz) = 1752308 -SHA256 (RPCS3-rpcs3-v0.0.8-9581-g9344b2148_GH0.tar.gz) = 96f41968498380c90359fed795ed094a722c2ad9273641f1b5805826051b9099 -SIZE (RPCS3-rpcs3-v0.0.8-9581-g9344b2148_GH0.tar.gz) = 5458778 +SHA256 (RPCS3-rpcs3-v0.0.9-10053-gf5a51599d_GH0.tar.gz) = 301389d3780adb548c3fba86c77610dd4a24c2fa68871df581a19da4dd225494 +SIZE (RPCS3-rpcs3-v0.0.9-10053-gf5a51599d_GH0.tar.gz) = 6324132 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 3120e0b701943f452760e45f9fc1ac50bab356ad4c807b4cac4598041c5ca1a5 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-27-g9220f5e_GH0.tar.gz) = 105400 -SHA256 (RPCS3-llvm-1394b1ccc8cf_GH0.tar.gz) = 7b2337a839566f04b187a6b24f4a5cc5546ed41659b2aee703cdbf8a6e6abd8c -SIZE (RPCS3-llvm-1394b1ccc8cf_GH0.tar.gz) = 51911523 +SHA256 (RPCS3-llvm-mirror-f5679565d348_GH0.tar.gz) = 201b9be34c7ef5f5a81d21b11c532040546cb602307479a4dd56357c02caa7f3 +SIZE (RPCS3-llvm-mirror-f5679565d348_GH0.tar.gz) = 55246543 SHA256 (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 19030315f4fc1b4b2cdb9d7a317069a109f90e39d1fe4c9159b7aaa39030eb95 SIZE (Cyan4973-xxHash-v0.6.5_GH0.tar.gz) = 37521 -SHA256 (FNA-XNA-FAudio-20.02_GH0.tar.gz) = 103a6d278921ce757e5427133626f60ce4876b30d81186f78af35d9f1ca4ef16 -SIZE (FNA-XNA-FAudio-20.02_GH0.tar.gz) = 908051 -SHA256 (jbeder-yaml-cpp-yaml-cpp-0.6.2-23-geca9cfd_GH0.tar.gz) = 554f6fac1d9524f807345f95ba9223332c644e56d7a7fdb2bcea1f5793b764fa -SIZE (jbeder-yaml-cpp-yaml-cpp-0.6.2-23-geca9cfd_GH0.tar.gz) = 1397220 +SHA256 (FNA-XNA-FAudio-20.03_GH0.tar.gz) = 672193396f73cc491543aba78c9fa8c9a541900aca851bfecca6007bcc9f45d5 +SIZE (FNA-XNA-FAudio-20.03_GH0.tar.gz) = 908756 +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 (kobalicek-asmjit-fc251c9_GH0.tar.gz) = 0fb6271fccf8ee86d27affda7e27a6d655bfabfda83a7dd0d41f7fd05b384aad SIZE (kobalicek-asmjit-fc251c9_GH0.tar.gz) = 446910 SHA256 (KhronosGroup-glslang-8.13.3559-55-gae594356_GH0.tar.gz) = 5f403104322ff939f5b22d60a2043c850cb96afdf8332dbdbf09ec75534b8838 SIZE (KhronosGroup-glslang-8.13.3559-55-gae594356_GH0.tar.gz) = 3133760 SHA256 (tcbrindle-span-9d7559a_GH0.tar.gz) = 4fbe8364b8ff9388fd6ca1a11ce39ff448af76394d561d6f879cf1180b14f160 SIZE (tcbrindle-span-9d7559a_GH0.tar.gz) = 130675 -SHA256 (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 1ccf3ed205a7a2f0d6a060415b123f1ae0d984cd4435db01af8de11a2eda49c1 -SIZE (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 299883 +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 (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 37bed90f3dadb642acca41508391d1409a75af05f34f13da56c866d5c3c4b00d SIZE (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 560956 +SHA256 (713df966dd52.patch) = 9df677d1b2b14302c56ad859c502976e0687c7a2a95622a538c95be052fd93b9 +SIZE (713df966dd52.patch) = 1137 +SHA256 (7a198b85b8b2.patch) = 4ad15f369d3797820d4c52b6709c33bb73e30a31e7d89e3259c1f0a0fcda7f7e +SIZE (7a198b85b8b2.patch) = 2179 +SHA256 (f567ebcf74d1.patch) = 28b3df88440aa822b6d1fbf8c32e579346798d4b7fb01cb9d74cba1eafa1e8a2 +SIZE (f567ebcf74d1.patch) = 1153 Modified: head/emulators/rpcs3/files/patch-CMakeLists.txt ============================================================================== --- head/emulators/rpcs3/files/patch-CMakeLists.txt Fri Mar 27 23:33:03 2020 (r529284) +++ head/emulators/rpcs3/files/patch-CMakeLists.txt Fri Mar 27 23:33:11 2020 (r529285) @@ -1,18 +1,18 @@ -std=gnu++2a works fine with old Clang if libc++ is new enough CMake Error at CMakeLists.txt:11 (message): - RPCS3 requires at least clang-10.0. + RPCS3 requires at least clang-9.0. ---- CMakeLists.txt.orig 2020-02-10 21:39:39 UTC +--- CMakeLists.txt.orig 2020-02-28 18:59:56 UTC +++ CMakeLists.txt @@ -7,8 +7,8 @@ if(CMAKE_COMPILER_IS_GNUCXX) message(FATAL_ERROR "RPCS3 requires at least gcc-9.") endif() elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") -- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.0) -- message(FATAL_ERROR "RPCS3 requires at least clang-10.0.") -+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0) -+ message(FATAL_ERROR "RPCS3 requires at least clang-6.0.") +- if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) +- message(FATAL_ERROR "RPCS3 requires at least clang-9.0.") ++ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0) ++ message(FATAL_ERROR "RPCS3 requires at least clang-8.0.") endif() endif() Added: head/emulators/rpcs3/files/patch-libc++8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/rpcs3/files/patch-libc++8 Fri Mar 27 23:33:11 2020 (r529285) @@ -0,0 +1,45 @@ +Drop after FreeBSD 11.3/12.1 EOL. See https://reviews.llvm.org/rL359211 + +rpcs3/Emu/Io/PadHandler.cpp:191:27: error: no member named 'lerp' in namespace 'std' + const float pos = std::lerp(0.13f, 1.f, (mag - dzRange) / (1 - dzRange)); + ~~~~~^ +rpcs3/Emu/Io/PadHandler.cpp:198:27: error: no member named 'lerp' in namespace 'std' + const float pos = std::lerp(0.f, 0.13f, mag / dzRange); + ~~~~~^ + +--- rpcs3/Emu/Io/PadHandler.h.orig 2020-03-18 15:28:46 UTC ++++ rpcs3/Emu/Io/PadHandler.h +@@ -6,6 +6,33 @@ + #include "pad_config_types.h" + #include "Utilities/types.h" + ++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 9000 ++_LIBCPP_BEGIN_NAMESPACE_STD ++template <typename _Fp> ++constexpr ++_Fp __lerp(_Fp __a, _Fp __b, _Fp __t) noexcept { ++ if ((__a <= 0 && __b >= 0) || (__a >= 0 && __b <= 0)) ++ return __t * __b + (1 - __t) * __a; ++ ++ if (__t == 1) return __b; ++ const _Fp __x = __a + __t * (__b - __a); ++ if (__t > 1 == __b > __a) ++ return __b < __x ? __x : __b; ++ else ++ return __x < __b ? __x : __b; ++} ++ ++constexpr float ++lerp(float __a, float __b, float __t) _NOEXCEPT { return __lerp(__a, __b, __t); } ++ ++constexpr double ++lerp(double __a, double __b, double __t) _NOEXCEPT { return __lerp(__a, __b, __t); } ++ ++constexpr long double ++lerp(long double __a, long double __b, long double __t) _NOEXCEPT { return __lerp(__a, __b, __t); } ++_LIBCPP_END_NAMESPACE_STD ++#endif ++ + struct PadDevice + { + pad_config* config{ nullptr }; Modified: head/emulators/rpcs3/files/patch-qt-5.13 ============================================================================== --- head/emulators/rpcs3/files/patch-qt-5.13 Fri Mar 27 23:33:03 2020 (r529284) +++ head/emulators/rpcs3/files/patch-qt-5.13 Fri Mar 27 23:33:11 2020 (r529285) @@ -6,22 +6,22 @@ CMake Warning at 3rdparty/qt5.cmake:3 (find_package): /usr/local/lib/cmake/Qt5/Qt5Config.cmake, version: 5.13.2 ---- 3rdparty/qt5.cmake.orig 2020-02-10 21:39:39 UTC +--- 3rdparty/qt5.cmake.orig 2020-03-27 20:00:22 UTC +++ 3rdparty/qt5.cmake @@ -1,11 +1,11 @@ add_library(3rdparty_qt5 INTERFACE) --find_package(Qt5 5.14 CONFIG COMPONENTS Widgets Network Qml Concurrent) -+find_package(Qt5 5.13 CONFIG COMPONENTS Widgets Network Qml Concurrent) +-find_package(Qt5 5.14 CONFIG COMPONENTS Widgets Concurrent) ++find_package(Qt5 5.13 CONFIG COMPONENTS Widgets Concurrent) if(WIN32) - find_package(Qt5 5.14 COMPONENTS WinExtras REQUIRED) + find_package(Qt5 5.13 COMPONENTS WinExtras REQUIRED) - target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::WinExtras Qt5::Network Qt5::Qml Qt5::Concurrent) + target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::WinExtras Qt5::Concurrent) else() - find_package(Qt5 5.14 COMPONENTS DBus Gui) + find_package(Qt5 5.13 COMPONENTS DBus Gui) if(Qt5DBus_FOUND) - target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::DBus Qt5::Network Qt5::Qml Qt5::Concurrent) + target_link_libraries(3rdparty_qt5 INTERFACE Qt5::Widgets Qt5::DBus Qt5::Concurrent) target_compile_definitions(3rdparty_qt5 INTERFACE -DHAVE_QTDBUS) --- rpcs3/main.cpp.orig 2020-02-10 21:39:39 UTC +++ rpcs3/main.cpp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003272333.02RNXBjk006093>