games-emulation/sudachi: fix building against Boost 1.86.0

Besides the concepts issue, the other issue is caused by boostorg/crc@470537f fixed by boostorg/crc#28 but not sure if it will be merged. Signed-off-by: Andrew Udvare <[email protected]>
Tatsh · Nov 5, 2024 · 85647ac · 85647ac
1 parent 5da9b3a
commit 85647ac
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/games-emulation/sudachi/Manifest b/games-emulation/sudachi/Manifest
@@ -1,5 +1,6 @@
 AUX sudachi-0001-system-libs.patch 334 BLAKE2B e2ce091afbb0be24dc6a3cd26d30cba766a4e40149eee7a0480ce84e30024aeec2231b25d78e9bc6ec02ede99a291d28b1f130ce91136da47515c91b81b8a201 SHA512 b8deef4f6c76a057d7706d9e20932bad909acce58ba91d78c854ffe85420cf7c6ce819ae30b15119ceff7db2c909547d2d0fbe6a4beb52d296de0efa81189f1a
 AUX sudachi-0002-fixes.patch 403 BLAKE2B def87c2f72f981a64ef580670f544bc55145bd99616ea548501e148f14898cf001a4776abbc117a43c11be48c7af69fd005ead187148db7dd2a2bb577fe4b98a SHA512 5a50976ffa37bef1023b845d371b8270221b4b9521ff5ae396ab04ee950b3a22648dc2a51f53fa7b1f5a56eae348c485b9fc1566785f680d620160f9fe9f98f3
+AUX sudachi-0003-boost-fix.patch 1122 BLAKE2B 069d220eac4a61862f64329a759aa6b2029c710f163160d9b67536651f956364b6a84db4db4656c7edc1b73c4eff78482ea5e3aa3dd1ad21975c73817a68280b SHA512 f816c85d74a405a3e552be77fdedce35529ffd44640c3acf3450b3e6fb3bb98185670e3bb287eabfa25522752896ab5aeb488cb30eddacceb91f83e29afaf253
 AUX sudachi-fallback-compat.json.gz 569746 BLAKE2B f7de3d1fb7137cd24878d5a83e587091aee5dc89bafb23ad9a283fe96c4521e35a399df2817dd2ecc5c77c22e5424a02855b4de6c1a162849d634df5c043fdba SHA512 0a22e076f0508196e6cf72c560653a5b2fcbfb9f7265bc853a695f92706ecd8398cd0cd18d46c1c8d9e3988a0b243302240b28f70d68c3d15d36bb3586d44624
 DIST sudachi-1.0.11.zip 13845902 BLAKE2B 5a43f4cfa1f958262bdbdc8f3a88659719c3a7cad7e7f1c59d8fed379655a7249fbfc2cfe791fb0b51c44ac808a2039a8af4173e7ad5eaa3f217b14aa8f1f68b SHA512 5f7cdf4a9bec6d5355e4df59d27af64de77bac3990dda0ec785cd0b4ca949abbbd305c073872a800c949610a698ae1d9d8445cf48746e8a7e3ca8deb9dad028e
 DIST sudachi-dynarmic-efa2ebe.tar.gz 3751750 BLAKE2B 5ba5dadf5b659eee3694552e891376041c6e1d8155c6d8dd68ab3c219ae51c0bbadfbca81ae3cfc132ee0f11fd9b84e7e904f75e5623e78f5b1c000daef09e45 SHA512 c18c2fae83361dc9cf25227b79ad0f907fdeca0b7d7295c6d319d7fb94d309a9e7f9c498f53c40edcee5197c72d505a5752a2de1ca0b1d3846ea8480d3c7fc5b
@@ -10,6 +11,6 @@ DIST sudachi-sdl-e1e36d2.tar.gz 7803581 BLAKE2B b7340dd32341e2cab8b9e92a1148a117
 DIST sudachi-simpleini-f7862c3.tar.gz 65999 BLAKE2B 893da51b21387d1970a6a4e75a8ff7f77981b8cde49d8c50ba392e5b4c7b1c2e7c3fc3869b70bd146af25ee8d860a8282ff11ab4e0443abdd6f96350c103aad3 SHA512 6db7af582bcd40b01ffb93763ba2a9fc517c3651e89bd5629d864b27ed13ba94262a69a74b4ad4c131c9f1e56ffea73d6515531a333a589ee5ff76d6e27eae98
 DIST sudachi-sirit-795ef4d.tar.gz 34790 BLAKE2B 1bf05beb2244ddd9aa926b08e55d185a28a7ec6e68b6f6cbd0c8f6b1dcf483c027dd0a491fb0b7502ee05b569e688e2051a70ce7e9d9e7bfd8ac83861f57e182 SHA512 8a53fbef68b628ba4d406cfe41d99d1f90f4bbfd5870c69c0ec6b323f5551ce564d44f88529438cfcd75126c8ee7cb9e445457cd8c1bb10d24a89413776eba56
 DIST sudachi-xbyak-aabb091.tar.gz 272515 BLAKE2B 51cb5c2794469b69abe8bbe3ee69dabe2d4849ad6726597fd97b2451c086651a95692ef767e0ed05e67a59dc17158986a3bcacd06a28575f7900383789d2b808 SHA512 418c27178448becb359151464584840d35720890da7565c3a8e50968bd06995907530b34f353d44d65dc1196e0574c87375b49d49cff5d7c5bc57e6ce398ea17
-EBUILD sudachi-1.0.11.ebuild 6217 BLAKE2B 40b747eb85f0308db8058e47e4242c674f0348135ed90698af75ca8b9b4bb9f31aa22f8b7f73fdb232af092ba9c867749fea58320ac2bd4484b2844d47447656 SHA512 acc255488da320026e150115d09d5316eb1e56411eea2868a01a14e069bb21031db5047d2f4262fd2d6876c6b5757c87020a25751b5afbb6691f797e29333469
+EBUILD sudachi-1.0.11.ebuild 6259 BLAKE2B 13ed19f01a198b4b1760451c724d5b54292e3ab191e38e062d6dc514b8fcf9058fc3ec9981003fb12adff4747627cb9148433f73ccf134ceca6e973011755d02 SHA512 12ee2b5a107b04c2648d14c3ed7b604a34eb55699fa673a3670e9108ead128354fde6254754adc040e99ca46a1b4e394a4c549857f00a3444e4340a793243f25
 MISC livecheck.json 21 BLAKE2B 1de70d2f5294408ee9b12a1b7de8e269e3235e364057b1990639ed44e1fb321b332f8d2f7dbee7d7a5e9cee7d7715a7cfc648a70f5712a50469dbe42b692c9f6 SHA512 2c88382dcef11ddac7290ceea8b608e969bc3bea609bab020cbcfbf08e67b7dc3fed6c648bde9a319ff9273e80cf13b2dedd2c6d743e9c941eca7ebd249e5bd5
 MISC metadata.xml 489 BLAKE2B 879b4f6883f53ba4f2678fc0dda1250b59848ea79cb3304fb618273e03e35662fb7a795d9bf5186aede70ad253b8c51b35b55f8a14de025acfbef166ea9993b3 SHA512 4a6a974ed1ce43bb85bce58a5a04fbe7b31f4a4a3bfb2b758d96e72b14f5b749f80e38571e816e0c2647f62ce3c64604fd6f7a54fb5d04c53be554ea4b5bfcf0
diff --git a/games-emulation/sudachi/files/sudachi-0003-boost-fix.patch b/games-emulation/sudachi/files/sudachi-0003-boost-fix.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a39d08d..14a7a50 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -274,8 +274,6 @@ endif()
+ # Configure C++ standard
+ # ===========================
+
+-# boost asio's concept usage doesn't play nicely with some compilers yet.
+-add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS)
+ if (MSVC)
+     add_compile_options($<$<COMPILE_LANGUAGE:CXX>:/std:c++20>)
+
+diff --git a/src/input_common/helpers/udp_protocol.h b/src/input_common/helpers/udp_protocol.h
+index 7bc5992..e64127e 100644
+--- a/src/input_common/helpers/udp_protocol.h
++++ b/src/input_common/helpers/udp_protocol.h
+@@ -13,6 +13,7 @@
+ #endif
+
+ #include <boost/crc.hpp>
++#include <boost/numeric/conversion/cast.hpp>
+
+ #ifdef _MSC_VER
+ #pragma warning(pop)
+@@ -69,7 +70,7 @@ Message<T> CreateMessage(const u32 magic, const T data, const u32 sender_id) {
+     };
+     Message<T> message{header, data};
+     crc.process_bytes(&message, sizeof(Message<T>));
+-    message.header.crc = crc.checksum();
++    message.header.crc = boost::numeric_cast<u32_le>(crc.checksum());
+     return message;
+ }
+
diff --git a/games-emulation/sudachi/sudachi-1.0.11.ebuild b/games-emulation/sudachi/sudachi-1.0.11.ebuild
@@ -70,6 +70,7 @@ BDEPEND="app-arch/unzip
 PATCHES=(
 	"${FILESDIR}/${PN}-0001-system-libs.patch"
 	"${FILESDIR}/${PN}-0002-fixes.patch"
+	"${FILESDIR}/${PN}-0003-boost-fix.patch"
 )
 
 src_unpack() {