diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index 43a5af063e73..e33b317226a2 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -2,10 +2,13 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.7-8748 # git rev-list --count HEAD -DISTVERSIONSUFFIX= -gcaef52e3b +DISTVERSION= 0.0.7-8760 # git rev-list --count HEAD +DISTVERSIONSUFFIX= -g5ec35c7da CATEGORIES= emulators +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 0d9c9c4358e9.patch:-p1 + MAINTAINER= jbeich@FreeBSD.org COMMENT= PS3 emulator/debugger diff --git a/emulators/rpcs3/distinfo b/emulators/rpcs3/distinfo index 930b83f5e3dc..fea36eb80c42 100644 --- a/emulators/rpcs3/distinfo +++ b/emulators/rpcs3/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1569010360 -SHA256 (RPCS3-rpcs3-v0.0.7-8748-gcaef52e3b_GH0.tar.gz) = 1c21d264118c90dd2ded0ec0468aeed237bfa4a16d39f1ca21bacaa8d5e25007 -SIZE (RPCS3-rpcs3-v0.0.7-8748-gcaef52e3b_GH0.tar.gz) = 5601231 +TIMESTAMP = 1569197741 +SHA256 (RPCS3-rpcs3-v0.0.7-8760-g5ec35c7da_GH0.tar.gz) = 8be1b5ee89331f539e575d375fb094b3e1f8c11800afbd2f0e338a7f94f7d5b5 +SIZE (RPCS3-rpcs3-v0.0.7-8760-g5ec35c7da_GH0.tar.gz) = 5601486 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-b860b5e8f4ee_GH0.tar.gz) = c151972a0c8ceac568c24b61e63d2ecbdac0f125185e23fc2238e0a14048256e @@ -19,3 +19,5 @@ SHA256 (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 1ccf3ed205a7a2f0d6a060415b123f1ae0d9 SIZE (USCiLab-cereal-v1.2.0_GH0.tar.gz) = 299883 SHA256 (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 37bed90f3dadb642acca41508391d1409a75af05f34f13da56c866d5c3c4b00d SIZE (zeux-pugixml-v1.9-51-g8bf806c_GH0.tar.gz) = 560956 +SHA256 (0d9c9c4358e9.patch) = 10fbe5b4a92917ecceb0870c8c30a28fa518432ce2facee621cc8816e7e1c8b8 +SIZE (0d9c9c4358e9.patch) = 920 diff --git a/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h b/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h deleted file mode 100644 index 1691691d9a4f..000000000000 --- a/emulators/rpcs3/files/patch-rpcs3_Emu_IdManager.h +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/RPCS3/rpcs3/issues/6529 - ---- rpcs3/Emu/IdManager.h.orig 2019-09-09 16:16:02 UTC -+++ rpcs3/Emu/IdManager.h -@@ -30,7 +30,7 @@ namespace id_manager - static const u32 base = T::id_base; - static const u32 step = T::id_step; - static const u32 count = T::id_count; -- static const u32 invalid = base > 0 ? 0 : -1; -+ static constexpr u32 invalid = base > 0 ? 0 : -1; - - // Note: full 32 bits range cannot be used at current implementation - static_assert(count > 0 && step > 0 && u64{step} * count + base < u64{UINT32_MAX} + (base != 0 ? 1 : 0), "ID traits: invalid object range");