games-emulation/citra: fix building against Boost 1.86.0

Closes #394 Closes boostorg/asio#437 Signed-off-by: Andrew Udvare <[email protected]>
Tatsh · Nov 5, 2024 · f27c3f3 · f27c3f3
1 parent 60d50a4
commit f27c3f3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/games-emulation/citra/Manifest b/games-emulation/citra/Manifest
@@ -1,5 +1,6 @@
 AUX citra-0001-system-libraries.patch 5796 BLAKE2B 2c51c24e1513a799f842cb06b06eb4e33a6b79e9d8b7f8b376346935fb721d526d8d71ea2fd4f125d5b49ad625fb7440f7f33019fef13af8005025c5c00a693e SHA512 cc189c09674ddc993870e2a2fb691ec5379df5f79bb1af9450f395ca5d3fcd621e3b1e63e9d7ca8e13f00669d973b837f008bfcae52f5a8027cfc35ddb026a30
 AUX citra-0002-inih-fix.patch 1275 BLAKE2B 9baa9ac7b99b50d4ce3b7b46f045c8874f8933eb0c95f98387422693680277eb9715bcaef5cc42ae941233491addfba2040fbf4c658c2e5aaf1a523bfc19a5cf SHA512 d1e097292dac46cf05483a3c15530f68e7abaaf62d041d0dedf7adb272fba686354f66c9f6256cd2345309f6ddc5c96a764001cce3981d5dbb35e83b00b76f24
+AUX citra-0003-boost-fix.patch 536 BLAKE2B 477b045b27935c38380fec9ee9b7f2665f6ee5fa6bb8c7f84b9cbc5b5a48bfb39c9c69ccddd008d4e7f13e765de2b9a528a06657914e44d53fc0809efd2b4722 SHA512 6a11030c318e26e94ea77bd9dce90852b8691d5cf330514c9d8df78b43d8b808b88740651e7071abbb742249149a08740fa554450d69dc9a8e9a76080a94779a
 DIST citra-20241029-864414f.tar.gz 8016661 BLAKE2B efd1e1dbb08e7f720864d7ebcad9984776517209ee7aed3bf6d85a716179b2f3b870067004c862974922bcc38064f9451ef16d8fe44615f783cce0354da8ba4f SHA512 a994cd4096f83f0ceef3d32555738527189bb5bc553b68f397cddaf25b43fad432414f18c5cbc6d98ea88a45de99b3368ac691f10eacb5f68b7bd7a871ea11e2
 DIST citra-compatibility_list.json 2131779 BLAKE2B 874864fff51971bf8519288370457de883687dc8b998cce91f83509bbbd5ec3aea5146093862030211827446584852e65718aa09e95d2d313d44e0eccccf13c4 SHA512 3e09c0d32f1e5d19fa67f44faabed130c69d3891691b52e33e2204cfcf21071ed5e5cf90eb7a8c3f2594f1b972e90af3af54176bbbb3793600a0355130aae77d
 DIST citra-dds-ktx-42dd8aa.tar.gz 264403 BLAKE2B bb202227325f4a051458713e6271b9da9f940e4a998f5af3233298c26728c06c04c6d439cdb86a7e6ef814a2c925063f5d472bc2a2ab052681cec4e72034e047 SHA512 2af702e36b595dcb38e8a4ddf1d5c75accb25361fe11b8db0b51e2acfe42391696fe7ee73b59d889da4a0781b4404df01ab244b27d21267743d81f1bb0a1a7a2
@@ -9,5 +10,5 @@ DIST citra-soundtouch-dd2252e.tar.gz 583070 BLAKE2B be61e03d8994457b0e6c412aa851
 DIST citra-xbyak-a1ac375.tar.gz 249481 BLAKE2B 94eb81637f410ea88781cb3da94dfce4e4a6104458b0774d36c98f6cd2114f55772182f4535e502a5efa06290677fc67d0bac9db4effb7fa44a79561b16c1738 SHA512 87f6ba92a484738b3a75a4d2c5c7e3f4f9ca65cdc02f71b761dba72c8320a011dd38ea5350516d980b8370211977816de4c3357fc5ae8c9f0a86b4a595768c5e
 DIST citra-yuzu-emu-sirit-4ab79a8.tar.gz 24196 BLAKE2B cd9512d79352bd00b33f59afff61059fa8e31b5e8792f37753543e37cd08967e0828dfa27a9f561281d800cf43a1466e8222f3d787385c3eabb1c24ecc13713b SHA512 768871f203bd1263fb2f01cba1a661fb85e8681f7af6f92403abe4fa34d79908edd863bfcbac1cacaad7dd08e0b720122fffe793881ffb0e4ee3af7c9c55affc
 DIST citra-yuzu-emu-sirit-spirv-headers-c214f6f.tar.gz 445653 BLAKE2B ca482ec348a690711cca0d57df1377101014d7137c9ae3642aa6eb4712a5f1de483c61d2c6eb961614bc17724d8b158465f1b9f93689a50a16dff7394439a1e0 SHA512 0ec901a8e446cdee82f9fa498d368f90532488d0f3810b6b13b18456fc0fec884f753bb11d720e695d04a49e33744edacf35f64b3bbc28cf63c857986f182278
-EBUILD citra-20241029.ebuild 5139 BLAKE2B 9fbc52680cf4a9b3cd2b824f68cc026657d2678c8432bd810df345e6703350380c39523244c8e945d31df320917e5718e946e455477d084c0c976c019d051972 SHA512 77c6a49b63ff50d56eb3fe2455efcd9bb198187e2ac43f74b3ee007eeb5730369b6baef7dd774e18becc124c1e18e7a21b5956d39fbc51d6680e51e427d92b5a
+EBUILD citra-20241029.ebuild 5181 BLAKE2B a3ebb2bae6042239debcc50aa13557c139615f28f7aca06b4bb6e39c54384da553c5701d7bb5bd8d24a472de04cc180ca600848942f416065548d214c6eb9520 SHA512 46d5a706edc997c7bc33001979780f79af058107dd5072d84b5200f38cda67c42199fed0a17d59a0b3f83fbd944ab6e7db2d576b5540295cc0e9cf4d10502d0d
 MISC metadata.xml 477 BLAKE2B 6d75b22747b29368095d8a0de6ce2a4a2f9568d1ae291f062963f7a33f2ee022a6fff4fbba3a35b58f17dfbfb7248728835052f3af45b6ca281a829ec9fbe7c9 SHA512 4f19f1c7abf5ce7daa24ecc07be29be0507792235e9e44eadcf9db610306fb5da11a503ef6e15b8ccc96f3ec3123355006c662e12e33cba61fb390e81bcba615
diff --git a/games-emulation/citra/citra-20241029.ebuild b/games-emulation/citra/citra-20241029.ebuild
@@ -57,6 +57,7 @@ BDEPEND="dev-cpp/catch:0 media-libs/fdk-aac"
 PATCHES=(
 	"${FILESDIR}/${PN}-0001-system-libraries.patch"
 	"${FILESDIR}/${PN}-0002-inih-fix.patch"
+	"${FILESDIR}/${PN}-0003-boost-fix.patch"
 )
 
 S="${WORKDIR}/${PN}-${SHA}"

diff --git a/games-emulation/citra/files/citra-0003-boost-fix.patch b/games-emulation/citra/files/citra-0003-boost-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6931cda9d..f4138802a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -227,8 +227,6 @@ message(STATUS "Target architecture: ${ARCHITECTURE}")
+ # Configure C++ standard
+ # ===========================
+
+-# boost asio's concept usage doesn't play nicely with some compilers yet.
+-add_definitions(-DBOOST_ASIO_DISABLE_CONCEPTS)
+ # boost can have issues compiling with C++17 and up on newer versions of Clang.
+ add_definitions(-DBOOST_NO_CXX98_FUNCTION_BASE)
+ set(CMAKE_CXX_STANDARD 20)