diff --git a/emulators/rpcs3/Makefile b/emulators/rpcs3/Makefile index b67e30d51c51..c0ae300b2218 100644 --- a/emulators/rpcs3/Makefile +++ b/emulators/rpcs3/Makefile @@ -1,109 +1,109 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v DISTVERSION= 0.0.22-13597 # git rev-list --count HEAD -PORTREVISION= 1 DISTVERSIONSUFFIX= -g1e1b111678 +PORTREVISION= 2 CATEGORIES= emulators MAINTAINER= jbeich@FreeBSD.org COMMENT= PS3 emulator/debugger LICENSE= APACHE20 ISCL GPLv2 MIT ZLIB LICENSE_COMB= multi LICENSE_FILE_ISCL= ${WRKSRC_cubeb}/LICENSE LICENSE_FILE_ZLIB= ${WRKSRC_asmjit}/LICENSE.md -BUILD_DEPENDS= flatc:devel/flatbuffers205 # until https://github.com/RPCS3/rpcs3/issues/12011 is fixed +BUILD_DEPENDS= flatbuffers>=2.0.6,1:devel/flatbuffers LIB_DEPENDS= libxxhash.so:devel/xxhash \ libcurl.so:ftp/curl \ libpng.so:graphics/png \ libavcodec.so:multimedia/ffmpeg \ libpugixml.so:textproc/pugixml ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= requires int128 and SSE2 USE_GITHUB= yes GH_ACCOUNT= RPCS3 GH_TUPLE= RPCS3:hidapi:hidapi-0.11.2-4-g6cf1336:hidapi/3rdparty/hidapi/hidapi \ RPCS3:llvm-mirror:509d31ad8967:llvm/llvm \ RPCS3:soundtouch:2.3.1-16-g83cfba6:soundtouch/3rdparty/SoundTouch/soundtouch \ asmjit:asmjit:fc2a5d8:asmjit/3rdparty/asmjit/asmjit \ jbeder:yaml-cpp:yaml-cpp-0.7.0-1-g0b67821:yamlcpp/3rdparty/yaml-cpp/yaml-cpp \ KhronosGroup:SPIRV-Headers:1.5.3.reservations1:spirv_headers/3rdparty/SPIRV/SPIRV-Headers \ KhronosGroup:SPIRV-Tools:v2020.4:spirv_tools/3rdparty/SPIRV/SPIRV-Tools \ KhronosGroup:glslang:11.9.0:glslang/3rdparty/glslang/glslang \ kinetiknz:cubeb:cubeb-0.2-1381-g708f52c:cubeb/3rdparty/cubeb/cubeb \ wolfSSL:wolfssl:v5.2.0-stable-245-gdcaa218ed:wolfssl/3rdparty/wolfssl/wolfssl USES= cmake compiler:c++17-lang elfctl 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 multimedia svg widgets USE_XORG= x11 CMAKE_ON= CMAKE_SKIP_RPATH ${CURL FFMPEG FLATBUFFERS LIBPNG PUGIXML XXHASH:L:S/^/USE_SYSTEM_/} CMAKE_ON+= BUNDLE_SPEEX # only used by cubeb tests CMAKE_OFF= USE_NATIVE_INSTRUCTIONS USE_PRECOMPILED_HEADERS LDFLAGS+= -Wl,--as-needed # GLU ELF_FEATURES= +noaslr,wxneeded:bin/${PORTNAME} OPTIONS_DEFINE= ALSA EVDEV FAUDIO PULSEAUDIO JACK SNDIO VULKAN OPTIONS_DEFAULT=EVDEV FAUDIO PULSEAUDIO JACK SNDIO VULKAN ALSA_BUILD_DEPENDS= alsa-lib>0:audio/alsa-lib 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_LIB_DEPENDS= libFAudio.so:audio/faudio FAUDIO_CMAKE_BOOL= USE_FAUDIO USE_SYSTEM_FAUDIO JACK_BUILD_DEPENDS= jackit>0:audio/jack JACK_CMAKE_BOOL= USE_JACK PULSEAUDIO_BUILD_DEPENDS=pulseaudio>0:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSE SNDIO_BUILD_DEPENDS= sndio>0:audio/sndio SNDIO_CMAKE_BOOL= USE_SNDIO 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= 13 # 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} # XXX Move into separate port and standardize via USES GH_TUPLE+= llvm:llvm-project:llvmorg-13.0.1-rc1:libcxx CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt pre-configure: bundled-libcxx bundled-libcxx: @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS:M*Ninja*} \ -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build .include diff --git a/emulators/rpcs3/files/patch-flatbuffers-2.0.5 b/emulators/rpcs3/files/patch-flatbuffers-2.0.5 deleted file mode 100644 index b143b0c748f3..000000000000 --- a/emulators/rpcs3/files/patch-flatbuffers-2.0.5 +++ /dev/null @@ -1,531 +0,0 @@ -Revert https://github.com/RPCS3/rpcs3/commit/d02a8ba2b90b -until https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=263552 - -In file included from rpcs3/Emu/Cell/lv2/sys_net.cpp:34: -In file included from rpcs3/Emu/NP/np_handler.h:11: -In file included from rpcs3/Emu/NP/rpcn_client.h:29: -rpcs3/Emu/NP/generated/np2_structs_generated.h:128:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_ID, 2) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:191:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_ID, 2) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:192:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_NUM, 4) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:242:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_UPDATEDATE, 8) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:298:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_UPDATEDATE, 8) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:299:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_UPDATEMEMBERID, 2) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:360:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_TYPE, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:361:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_FLAG, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:362:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_HUBMEMBERID, 2) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:425:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_SLOTNUM, 4) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:426:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_WITHLABEL, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:429:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_WITHPASSWORD, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:609:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_JOINDATE, 8) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:610:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_MEMBERID, 2) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:611:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_TEAMID, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:614:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_NATTYPE, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:615:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_FLAGATTR, 4) && - ^~~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:737:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_GROUPID, 1) && - ^~~~~~~~~~~~~~~~~~~~ -rpcs3/Emu/NP/generated/np2_structs_generated.h:738:12: error: no matching member function for call to 'VerifyField' - VerifyField(verifier, VT_WITHPASSWORD, 1) && - ^~~~~~~~~~~~~~~~~~~~ -/usr/local/include/flatbuffers/table.h:115:8: note: candidate function template not viable: requires 2 arguments, but 3 were provided - bool VerifyField(const Verifier &verifier, voffset_t field) const { - ^ -fatal error: too many errors emitted, stopping now [-ferror-limit=] - ---- rpcs3/Emu/NP/generated/np2_structs_generated.h.orig 2022-04-24 18:18:36 UTC -+++ rpcs3/Emu/NP/generated/np2_structs_generated.h -@@ -125,7 +125,7 @@ struct BinAttr FLATBUFFERS_FINAL_CLASS : private flatb - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ID, 2) && -+ VerifyField(verifier, VT_ID) && - VerifyOffset(verifier, VT_DATA) && - verifier.VerifyVector(data()) && - verifier.EndTable(); -@@ -188,8 +188,8 @@ struct IntAttr FLATBUFFERS_FINAL_CLASS : private flatb - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ID, 2) && -- VerifyField(verifier, VT_NUM, 4) && -+ VerifyField(verifier, VT_ID) && -+ VerifyField(verifier, VT_NUM) && - verifier.EndTable(); - } - }; -@@ -239,7 +239,7 @@ struct RoomMemberBinAttrInternal FLATBUFFERS_FINAL_CLA - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_UPDATEDATE, 8) && -+ VerifyField(verifier, VT_UPDATEDATE) && - VerifyOffset(verifier, VT_DATA) && - verifier.VerifyTable(data()) && - verifier.EndTable(); -@@ -295,8 +295,8 @@ struct BinAttrInternal FLATBUFFERS_FINAL_CLASS : priva - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_UPDATEDATE, 8) && -- VerifyField(verifier, VT_UPDATEMEMBERID, 2) && -+ VerifyField(verifier, VT_UPDATEDATE) && -+ VerifyField(verifier, VT_UPDATEMEMBERID) && - VerifyOffset(verifier, VT_DATA) && - verifier.VerifyTable(data()) && - verifier.EndTable(); -@@ -357,9 +357,9 @@ struct OptParam FLATBUFFERS_FINAL_CLASS : private flat - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_TYPE, 1) && -- VerifyField(verifier, VT_FLAG, 1) && -- VerifyField(verifier, VT_HUBMEMBERID, 2) && -+ VerifyField(verifier, VT_TYPE) && -+ VerifyField(verifier, VT_FLAG) && -+ VerifyField(verifier, VT_HUBMEMBERID) && - verifier.EndTable(); - } - }; -@@ -422,11 +422,11 @@ struct GroupConfig FLATBUFFERS_FINAL_CLASS : private f - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SLOTNUM, 4) && -- VerifyField(verifier, VT_WITHLABEL, 1) && -+ VerifyField(verifier, VT_SLOTNUM) && -+ VerifyField(verifier, VT_WITHLABEL) && - VerifyOffset(verifier, VT_LABEL) && - verifier.VerifyVector(label()) && -- VerifyField(verifier, VT_WITHPASSWORD, 1) && -+ VerifyField(verifier, VT_WITHPASSWORD) && - verifier.EndTable(); - } - }; -@@ -606,13 +606,13 @@ struct RoomMemberDataInternal FLATBUFFERS_FINAL_CLASS - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_USERINFO) && - verifier.VerifyTable(userInfo()) && -- VerifyField(verifier, VT_JOINDATE, 8) && -- VerifyField(verifier, VT_MEMBERID, 2) && -- VerifyField(verifier, VT_TEAMID, 1) && -+ VerifyField(verifier, VT_JOINDATE) && -+ VerifyField(verifier, VT_MEMBERID) && -+ VerifyField(verifier, VT_TEAMID) && - VerifyOffset(verifier, VT_ROOMGROUP) && - verifier.VerifyTable(roomGroup()) && -- VerifyField(verifier, VT_NATTYPE, 1) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_NATTYPE) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) && - verifier.VerifyVector(roomMemberBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) && -@@ -734,13 +734,13 @@ struct RoomGroup FLATBUFFERS_FINAL_CLASS : private fla - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_GROUPID, 1) && -- VerifyField(verifier, VT_WITHPASSWORD, 1) && -- VerifyField(verifier, VT_WITHLABEL, 1) && -+ VerifyField(verifier, VT_GROUPID) && -+ VerifyField(verifier, VT_WITHPASSWORD) && -+ VerifyField(verifier, VT_WITHLABEL) && - VerifyOffset(verifier, VT_LABEL) && - verifier.VerifyVector(label()) && -- VerifyField(verifier, VT_SLOTNUM, 4) && -- VerifyField(verifier, VT_CURGROUPMEMBERNUM, 4) && -+ VerifyField(verifier, VT_SLOTNUM) && -+ VerifyField(verifier, VT_CURGROUPMEMBERNUM) && - verifier.EndTable(); - } - }; -@@ -865,20 +865,20 @@ struct RoomDataInternal FLATBUFFERS_FINAL_CLASS : priv - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SERVERID, 2) && -- VerifyField(verifier, VT_WORLDID, 4) && -- VerifyField(verifier, VT_LOBBYID, 8) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_PASSWORDSLOTMASK, 8) && -- VerifyField(verifier, VT_MAXSLOT, 4) && -+ VerifyField(verifier, VT_SERVERID) && -+ VerifyField(verifier, VT_WORLDID) && -+ VerifyField(verifier, VT_LOBBYID) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_PASSWORDSLOTMASK) && -+ VerifyField(verifier, VT_MAXSLOT) && - VerifyOffset(verifier, VT_MEMBERLIST) && - verifier.VerifyVector(memberList()) && - verifier.VerifyVectorOfTables(memberList()) && -- VerifyField(verifier, VT_OWNERID, 2) && -+ VerifyField(verifier, VT_OWNERID) && - VerifyOffset(verifier, VT_ROOMGROUP) && - verifier.VerifyVector(roomGroup()) && - verifier.VerifyVectorOfTables(roomGroup()) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) && - verifier.VerifyVector(roomBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomBinAttrInternal()) && -@@ -1067,23 +1067,23 @@ struct RoomDataExternal FLATBUFFERS_FINAL_CLASS : priv - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SERVERID, 2) && -- VerifyField(verifier, VT_WORLDID, 4) && -- VerifyField(verifier, VT_PUBLICSLOTNUM, 2) && -- VerifyField(verifier, VT_PRIVATESLOTNUM, 2) && -- VerifyField(verifier, VT_LOBBYID, 8) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_OPENPUBLICSLOTNUM, 2) && -- VerifyField(verifier, VT_MAXSLOT, 2) && -- VerifyField(verifier, VT_OPENPRIVATESLOTNUM, 2) && -- VerifyField(verifier, VT_CURMEMBERNUM, 2) && -- VerifyField(verifier, VT_PASSWORDSLOTMASK, 8) && -+ VerifyField(verifier, VT_SERVERID) && -+ VerifyField(verifier, VT_WORLDID) && -+ VerifyField(verifier, VT_PUBLICSLOTNUM) && -+ VerifyField(verifier, VT_PRIVATESLOTNUM) && -+ VerifyField(verifier, VT_LOBBYID) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_OPENPUBLICSLOTNUM) && -+ VerifyField(verifier, VT_MAXSLOT) && -+ VerifyField(verifier, VT_OPENPRIVATESLOTNUM) && -+ VerifyField(verifier, VT_CURMEMBERNUM) && -+ VerifyField(verifier, VT_PASSWORDSLOTMASK) && - VerifyOffset(verifier, VT_OWNER) && - verifier.VerifyTable(owner()) && - VerifyOffset(verifier, VT_ROOMGROUP) && - verifier.VerifyVector(roomGroup()) && - verifier.VerifyVectorOfTables(roomGroup()) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_ROOMSEARCHABLEINTATTREXTERNAL) && - verifier.VerifyVector(roomSearchableIntAttrExternal()) && - verifier.VerifyVectorOfTables(roomSearchableIntAttrExternal()) && -@@ -1261,7 +1261,7 @@ struct IntSearchFilter FLATBUFFERS_FINAL_CLASS : priva - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SEARCHOPERATOR, 1) && -+ VerifyField(verifier, VT_SEARCHOPERATOR) && - VerifyOffset(verifier, VT_ATTR) && - verifier.VerifyTable(attr()) && - verifier.EndTable(); -@@ -1313,7 +1313,7 @@ struct BinSearchFilter FLATBUFFERS_FINAL_CLASS : priva - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SEARCHOPERATOR, 1) && -+ VerifyField(verifier, VT_SEARCHOPERATOR) && - VerifyOffset(verifier, VT_ATTR) && - verifier.VerifyTable(attr()) && - verifier.EndTable(); -@@ -1367,7 +1367,7 @@ struct PresenceOptionData FLATBUFFERS_FINAL_CLASS : pr - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_DATA) && - verifier.VerifyVector(data()) && -- VerifyField(verifier, VT_LEN, 4) && -+ VerifyField(verifier, VT_LEN) && - verifier.EndTable(); - } - }; -@@ -1430,7 +1430,7 @@ struct RoomGroupPasswordConfig FLATBUFFERS_FINAL_CLASS - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_GROUPID) && - verifier.VerifyVector(groupId()) && -- VerifyField(verifier, VT_WITHPASSWORD, 1) && -+ VerifyField(verifier, VT_WITHPASSWORD) && - verifier.EndTable(); - } - }; -@@ -1523,13 +1523,13 @@ struct SearchRoomRequest FLATBUFFERS_FINAL_CLASS : pri - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_OPTION, 4) && -- VerifyField(verifier, VT_WORLDID, 4) && -- VerifyField(verifier, VT_LOBBYID, 8) && -- VerifyField(verifier, VT_RANGEFILTER_STARTINDEX, 4) && -- VerifyField(verifier, VT_RANGEFILTER_MAX, 4) && -- VerifyField(verifier, VT_FLAGFILTER, 4) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_OPTION) && -+ VerifyField(verifier, VT_WORLDID) && -+ VerifyField(verifier, VT_LOBBYID) && -+ VerifyField(verifier, VT_RANGEFILTER_STARTINDEX) && -+ VerifyField(verifier, VT_RANGEFILTER_MAX) && -+ VerifyField(verifier, VT_FLAGFILTER) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_INTFILTER) && - verifier.VerifyVector(intFilter()) && - verifier.VerifyVectorOfTables(intFilter()) && -@@ -1664,9 +1664,9 @@ struct SearchRoomResponse FLATBUFFERS_FINAL_CLASS : pr - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_STARTINDEX, 4) && -- VerifyField(verifier, VT_TOTAL, 4) && -- VerifyField(verifier, VT_SIZE, 4) && -+ VerifyField(verifier, VT_STARTINDEX) && -+ VerifyField(verifier, VT_TOTAL) && -+ VerifyField(verifier, VT_SIZE) && - VerifyOffset(verifier, VT_ROOMS) && - verifier.VerifyVector(rooms()) && - verifier.VerifyVectorOfTables(rooms()) && -@@ -1804,10 +1804,10 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_WORLDID, 4) && -- VerifyField(verifier, VT_LOBBYID, 8) && -- VerifyField(verifier, VT_MAXSLOT, 4) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_WORLDID) && -+ VerifyField(verifier, VT_LOBBYID) && -+ VerifyField(verifier, VT_MAXSLOT) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) && - verifier.VerifyVector(roomBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomBinAttrInternal()) && -@@ -1825,7 +1825,7 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : - VerifyOffset(verifier, VT_GROUPCONFIG) && - verifier.VerifyVector(groupConfig()) && - verifier.VerifyVectorOfTables(groupConfig()) && -- VerifyField(verifier, VT_PASSWORDSLOTMASK, 8) && -+ VerifyField(verifier, VT_PASSWORDSLOTMASK) && - VerifyOffset(verifier, VT_ALLOWEDUSER) && - verifier.VerifyVector(allowedUser()) && - verifier.VerifyVectorOfStrings(allowedUser()) && -@@ -1837,7 +1837,7 @@ struct CreateJoinRoomRequest FLATBUFFERS_FINAL_CLASS : - VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) && - verifier.VerifyVector(roomMemberBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) && -- VerifyField(verifier, VT_TEAMID, 1) && -+ VerifyField(verifier, VT_TEAMID) && - VerifyOffset(verifier, VT_SIGOPTPARAM) && - verifier.VerifyTable(sigOptParam()) && - verifier.EndTable(); -@@ -2030,7 +2030,7 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : priva - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -+ VerifyField(verifier, VT_ROOMID) && - VerifyOffset(verifier, VT_ROOMPASSWORD) && - verifier.VerifyVector(roomPassword()) && - VerifyOffset(verifier, VT_JOINROOMGROUPLABEL) && -@@ -2040,7 +2040,7 @@ struct JoinRoomRequest FLATBUFFERS_FINAL_CLASS : priva - verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) && - VerifyOffset(verifier, VT_OPTDATA) && - verifier.VerifyTable(optData()) && -- VerifyField(verifier, VT_TEAMID, 1) && -+ VerifyField(verifier, VT_TEAMID) && - verifier.EndTable(); - } - }; -@@ -2131,7 +2131,7 @@ struct LeaveRoomRequest FLATBUFFERS_FINAL_CLASS : priv - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -+ VerifyField(verifier, VT_ROOMID) && - VerifyOffset(verifier, VT_OPTDATA) && - verifier.VerifyTable(optData()) && - verifier.EndTable(); -@@ -2308,7 +2308,7 @@ struct SetRoomDataExternalRequest FLATBUFFERS_FINAL_CL - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -+ VerifyField(verifier, VT_ROOMID) && - VerifyOffset(verifier, VT_ROOMSEARCHABLEINTATTREXTERNAL) && - verifier.VerifyVector(roomSearchableIntAttrExternal()) && - verifier.VerifyVectorOfTables(roomSearchableIntAttrExternal()) && -@@ -2414,16 +2414,16 @@ struct SetRoomDataInternalRequest FLATBUFFERS_FINAL_CL - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_FLAGFILTER, 4) && -- VerifyField(verifier, VT_FLAGATTR, 4) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_FLAGFILTER) && -+ VerifyField(verifier, VT_FLAGATTR) && - VerifyOffset(verifier, VT_ROOMBINATTRINTERNAL) && - verifier.VerifyVector(roomBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomBinAttrInternal()) && - VerifyOffset(verifier, VT_PASSWORDCONFIG) && - verifier.VerifyVector(passwordConfig()) && - verifier.VerifyVectorOfTables(passwordConfig()) && -- VerifyField(verifier, VT_PASSWORDSLOTMASK, 8) && -+ VerifyField(verifier, VT_PASSWORDSLOTMASK) && - VerifyOffset(verifier, VT_OWNERPRIVILEGERANK) && - verifier.VerifyVector(ownerPrivilegeRank()) && - verifier.EndTable(); -@@ -2531,9 +2531,9 @@ struct SetRoomMemberDataInternalRequest FLATBUFFERS_FI - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_MEMBERID, 2) && -- VerifyField(verifier, VT_TEAMID, 1) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_MEMBERID) && -+ VerifyField(verifier, VT_TEAMID) && - VerifyOffset(verifier, VT_ROOMMEMBERBINATTRINTERNAL) && - verifier.VerifyVector(roomMemberBinAttrInternal()) && - verifier.VerifyVectorOfTables(roomMemberBinAttrInternal()) && -@@ -2611,7 +2611,7 @@ struct GetRoomDataInternalRequest FLATBUFFERS_FINAL_CL - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -+ VerifyField(verifier, VT_ROOMID) && - VerifyOffset(verifier, VT_ATTRID) && - verifier.VerifyVector(attrId()) && - verifier.EndTable(); -@@ -2680,7 +2680,7 @@ struct RoomMemberUpdateInfo FLATBUFFERS_FINAL_CLASS : - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_ROOMMEMBERDATAINTERNAL) && - verifier.VerifyTable(roomMemberDataInternal()) && -- VerifyField(verifier, VT_EVENTCAUSE, 1) && -+ VerifyField(verifier, VT_EVENTCAUSE) && - VerifyOffset(verifier, VT_OPTDATA) && - verifier.VerifyTable(optData()) && - verifier.EndTable(); -@@ -2741,8 +2741,8 @@ struct RoomUpdateInfo FLATBUFFERS_FINAL_CLASS : privat - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_EVENTCAUSE, 1) && -- VerifyField(verifier, VT_ERRORCODE, 4) && -+ VerifyField(verifier, VT_EVENTCAUSE) && -+ VerifyField(verifier, VT_ERRORCODE) && - VerifyOffset(verifier, VT_OPTDATA) && - verifier.VerifyTable(optData()) && - verifier.EndTable(); -@@ -2813,8 +2813,8 @@ struct RoomDataInternalUpdateInfo FLATBUFFERS_FINAL_CL - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_NEWROOMDATAINTERNAL) && - verifier.VerifyTable(newRoomDataInternal()) && -- VerifyField(verifier, VT_PREVFLAGATTR, 4) && -- VerifyField(verifier, VT_PREVROOMPASSWORDSLOTMASK, 8) && -+ VerifyField(verifier, VT_PREVFLAGATTR) && -+ VerifyField(verifier, VT_PREVROOMPASSWORDSLOTMASK) && - VerifyOffset(verifier, VT_NEWROOMGROUP) && - verifier.VerifyVector(newRoomGroup()) && - VerifyOffset(verifier, VT_NEWROOMBINATTRINTERNAL) && -@@ -2911,8 +2911,8 @@ struct RoomMemberDataInternalUpdateInfo FLATBUFFERS_FI - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_NEWROOMMEMBERDATAINTERNAL) && - verifier.VerifyTable(newRoomMemberDataInternal()) && -- VerifyField(verifier, VT_PREVFLAGATTR, 4) && -- VerifyField(verifier, VT_PREVTEAMID, 1) && -+ VerifyField(verifier, VT_PREVFLAGATTR) && -+ VerifyField(verifier, VT_PREVTEAMID) && - VerifyOffset(verifier, VT_NEWROOMMEMBERBINATTRINTERNAL) && - verifier.VerifyVector(newRoomMemberBinAttrInternal()) && - verifier.EndTable(); -@@ -2997,10 +2997,10 @@ struct GetPingInfoResponse FLATBUFFERS_FINAL_CLASS : p - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_SERVERID, 2) && -- VerifyField(verifier, VT_WORLDID, 4) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_RTT, 4) && -+ VerifyField(verifier, VT_SERVERID) && -+ VerifyField(verifier, VT_WORLDID) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_RTT) && - verifier.EndTable(); - } - }; -@@ -3072,13 +3072,13 @@ struct SendRoomMessageRequest FLATBUFFERS_FINAL_CLASS - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_ROOMID, 8) && -- VerifyField(verifier, VT_CASTTYPE, 1) && -+ VerifyField(verifier, VT_ROOMID) && -+ VerifyField(verifier, VT_CASTTYPE) && - VerifyOffset(verifier, VT_DST) && - verifier.VerifyVector(dst()) && - VerifyOffset(verifier, VT_MSG) && - verifier.VerifyVector(msg()) && -- VerifyField(verifier, VT_OPTION, 1) && -+ VerifyField(verifier, VT_OPTION) && - verifier.EndTable(); - } - }; -@@ -3173,8 +3173,8 @@ struct RoomMessageInfo FLATBUFFERS_FINAL_CLASS : priva - } - bool Verify(flatbuffers::Verifier &verifier) const { - return VerifyTableStart(verifier) && -- VerifyField(verifier, VT_FILTERED, 1) && -- VerifyField(verifier, VT_CASTTYPE, 1) && -+ VerifyField(verifier, VT_FILTERED) && -+ VerifyField(verifier, VT_CASTTYPE) && - VerifyOffset(verifier, VT_DST) && - verifier.VerifyVector(dst()) && - VerifyOffset(verifier, VT_SRCMEMBER) && -@@ -3289,10 +3289,10 @@ struct MessageDetails FLATBUFFERS_FINAL_CLASS : privat - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_COMMUNICATIONID) && - verifier.VerifyString(communicationId()) && -- VerifyField(verifier, VT_MSGID, 8) && -- VerifyField(verifier, VT_MAINTYPE, 2) && -- VerifyField(verifier, VT_SUBTYPE, 2) && -- VerifyField(verifier, VT_MSGFEATURES, 4) && -+ VerifyField(verifier, VT_MSGID) && -+ VerifyField(verifier, VT_MAINTYPE) && -+ VerifyField(verifier, VT_SUBTYPE) && -+ VerifyField(verifier, VT_MSGFEATURES) && - VerifyOffset(verifier, VT_SUBJECT) && - verifier.VerifyString(subject()) && - VerifyOffset(verifier, VT_BODY) && -@@ -3409,7 +3409,6 @@ struct SendMessageRequest FLATBUFFERS_FINAL_CLASS : pr - return VerifyTableStart(verifier) && - VerifyOffset(verifier, VT_MESSAGE) && - verifier.VerifyVector(message()) && -- verifier.VerifyNestedFlatBuffer(message(), nullptr) && - VerifyOffset(verifier, VT_NPIDS) && - verifier.VerifyVector(npids()) && - verifier.VerifyVectorOfStrings(npids()) &&