games-emulation/yuzu: 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 · 43a1603 · 43a1603
1 parent 85647ac
commit 43a1603
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/games-emulation/yuzu/Manifest b/games-emulation/yuzu/Manifest
@@ -1,4 +1,5 @@
 AUX yuzu-0001-system-libs.patch 691 BLAKE2B 9658f1fe39fbc49faa7b2be17d6a105aec616feaa4b8ab126c2886d9eb05400f84cb38a632663329565bc2bf88d33ff7c1093e365e7e6ae64a919b5e81d64378 SHA512 fbbc4c030431a15a6151bcf9a9bd5034d2d34c7ae76eb43fe1a1762fb1774bd750c368e6925984e3c25222ef583a57b7a824a50614e64f17f5c6087b2a7de529
+AUX yuzu-0002-boost-fix.patch 1107 BLAKE2B 2c87ab4f1b2c7606400ff0ee05aaeb6d48888d32946e4b5d5e5957c19eddba951fde79849706c6e4dc274e6217841ea9d7815c6827311ad092ef5236ea633ae7 SHA512 e7fe92c455311823590918df001a72afc4c7a9a8913fb88ac2da2fe1e4044b12db634b929cab85925aa6217eb59cd0156856c24cca04b7a80d40aa93cf89baf1
 AUX yuzu-fallback-compat.json.gz 569746 BLAKE2B f7de3d1fb7137cd24878d5a83e587091aee5dc89bafb23ad9a283fe96c4521e35a399df2817dd2ecc5c77c22e5424a02855b4de6c1a162849d634df5c043fdba SHA512 0a22e076f0508196e6cf72c560653a5b2fcbfb9f7265bc853a695f92706ecd8398cd0cd18d46c1c8d9e3988a0b243302240b28f70d68c3d15d36bb3586d44624
 DIST yuzu-0.1734.tar.gz 7142363 BLAKE2B 13bfffa42203d7508b32539cc887e6cbaa34b638c51e45265d7119d690ac9c1cb308453a892fb659a979820eff13770ae76a5a97d2ffd62d06ac5424a9a1da81 SHA512 39d6f03c31afd3fc5ad70cfdf3483af3a3e6406a1c4e5b95d77e96840ca821bced6e87bc86d5309761dccc835ab097a46cf80ada5d668efeb604981c09f28198
 DIST yuzu-cpp-httplib-6d963fb.tar.gz 637708 BLAKE2B e68c74638bb288e72185f3928a3296c96944317aaf8e4e1af2286478a5768c5824c44b6bdba37a032560e4944567b4fa410a150f689920db3616f42c0351d05d SHA512 09b6584ea8d15572ba9e0e834838daaa3ad5945f8f8b005a31bb94ef63a3b81fa47b050a8f846943af394cfc7d0c511e7b2f49fbfebc31ce24d53f688e73ee55
@@ -9,6 +10,6 @@ DIST yuzu-sdl-cc016b0.tar.gz 7716438 BLAKE2B db9784bd4fc6f5fc671f28591ff8f883a7f
 DIST yuzu-simpleini-382ddbb.tar.gz 64873 BLAKE2B 59532f4e3f6362665b6d7a87539173007972434591657747a4b714b9d338557abd66c169b4b4e8a644f9784ab5a179b0ad3e1acc41016580d550c3d7ed174295 SHA512 c4bdb878ab4af8dd07b7194ee3a2c5f22be75abf3d213e081ae720025465b2c9edfa0aeb29c0d24c52947328939e60a4b5be6e6b3313086f5c8f9afc8f9f6f0c
 DIST yuzu-sirit-ab75463.tar.gz 23853 BLAKE2B 4c4e69203a75cf849497e540bb0dcea694a72b4230f205b769447d3d11f7c0fb089ca262009396b9af55503d45b128edb1e99e438b89ab21ac842f789c5109a3 SHA512 43204596db5c6295cc8bdf9355fd71433fa5d1e28d9d8c01f12082d2cd8fb6f78e20d97b396e7bdf202afae2361386f1861a1012d2947569dcbb114996fc6b1d
 DIST yuzu-xbyak-a1ac375.tar.gz 249481 BLAKE2B 94eb81637f410ea88781cb3da94dfce4e4a6104458b0774d36c98f6cd2114f55772182f4535e502a5efa06290677fc67d0bac9db4effb7fa44a79561b16c1738 SHA512 87f6ba92a484738b3a75a4d2c5c7e3f4f9ca65cdc02f71b761dba72c8320a011dd38ea5350516d980b8370211977816de4c3357fc5ae8c9f0a86b4a595768c5e
-EBUILD yuzu-0.1734-r2.ebuild 5970 BLAKE2B cdb436d791164c0b49c6ddffa2fe53af50f932f3d61c8bd82c39e68105675e322db8bab8f08a1b7c7ce38435d13921db80482d0d3d2b4164a622ec2b94742f85 SHA512 e21584b135ea74d6557c111112527c8452fe83684fd129f80b0f65bb15b100deb5ff047ae0853a8c9cd3a42959a871017c7b53fa23e8a0244b0d96bddc3bfacf
+EBUILD yuzu-0.1734-r2.ebuild 6012 BLAKE2B 2bc16e73583ea288651cba9f575e52208640b97cf2ab74a6c63fa2a5d192103d817b9f18d505e63585ebac8db3e8b037ec79ebc46f9ae62c6257a595cd9c7171 SHA512 2b6841b44655bf9d8e5e8276b0352b096367cd023e17dac8b6f13882e1259278e77d7248b979ae03c9c368479786ad90ec8c09a562bf023c8a75e853edbd1b04
 MISC livecheck.json 21 BLAKE2B bb81b4a8446b66ed4968fdb16f7d49cf7cc8b18fefbd5113e0c1d87242e00220f47a68c92f248b4a57c6c7b7a3fd0c08644f7d87cfd62c8a40a8f0943e24932e SHA512 15755d50c96c6d85ffc9f5bcdc0c06e667512f963904a088a46ba334c340bb4baa0a5b3f88e578d4f2f4ea51cddf390c177aaa3245617e39ec476ec627b13492
 MISC metadata.xml 629 BLAKE2B b951012ddeb64ec3284ecf5f4016210d4c4d09c839a627cfc6df929ea7febd541c1aa1142b5fe3b3114232d2a6c9bd59225623342e7c001dac17e01dffc3b096 SHA512 da4c56a7666f72c9b168b2cfed17ed984e2d9444a7ab5d90aed905c75d50a50fff0034655450b98fe41dbcd2c3e6e99dabe4ca0bf947d622da2a8074acc85ea3
diff --git a/games-emulation/yuzu/files/yuzu-0002-boost-fix.patch b/games-emulation/yuzu/files/yuzu-0002-boost-fix.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2a5c14ec4..68ee358ba 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -263,8 +263,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 d9643ffe0..5d0c25a5f 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/yuzu/yuzu-0.1734-r2.ebuild b/games-emulation/yuzu/yuzu-0.1734-r2.ebuild
@@ -84,6 +84,7 @@ S="${WORKDIR}/${PN}-mainline-${MY_PV}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0001-system-libs.patch"
+	"${FILESDIR}/${PN}-0002-boost-fix.patch"
 )
 
 src_prepare() {