From b423ab36456a7b05264ac332cc54e474eab1c191 Mon Sep 17 00:00:00 2001 From: Andrew Udvare Date: Mon, 23 Oct 2023 16:04:07 -0400 Subject: [PATCH] games-emulation/citra: fix build Signed-off-by: Andrew Udvare --- games-emulation/citra/Manifest | 2 +- .../citra/files/citra-0002-inih-fix.patch | 22 +++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/games-emulation/citra/Manifest b/games-emulation/citra/Manifest index 690414eac..ce7c3a462 100644 --- a/games-emulation/citra/Manifest +++ b/games-emulation/citra/Manifest @@ -1,5 +1,5 @@ AUX citra-0001-system-libraries.patch 8615 BLAKE2B 3ea4f9c80d0f7eed23a9586b937616b6758c10d094a17be4cfd035b80f984dea558a1f7fd8c31c67a10ec8eab6d1e6335e8f12150d01972a14307e623fc51532 SHA512 1f1cd5e72c52261ab37d94fb9b1e4a736c872637300cca8d648cf27bb169307f4d808016149d772229c3fac56689ab986d2dbce4ba74a9e6eefcae404068043b -AUX citra-0002-inih-fix.patch 1258 BLAKE2B 801c81e4a70de23de0b5d2deca10e807ae4fa97072c789870db2e30da9d7ac8fb11aa5b6f4d35c5d3a5c0375e8a3710bda5883c9f0c62ba4d28a76abc91ed78e SHA512 6a181a6090d50294efd57f41331eb9ff86be78c8adb017ca3270240b68e13212a75485358246499a5cc829a0ebbe2571548e58ee540a4dad8a2a4f17d4db2fa7 +AUX citra-0002-inih-fix.patch 1924 BLAKE2B abaf80106f5726918011f2e03695c6a5514d0aaffe6de487613367c5364a1b02f261284546d3322ac58f2f5103ed1f36c6d3f02d3b21deabe0858e9a82ce0a28 SHA512 13e7041dbf3014702a3a06b9fec01fe7a9bb0accfa74564c0be3eb2ab2bdbd0270ab29791b404e2cdc699b127b0ca99455804219b87629439aaec542d2051f70 DIST citra-20231022-3614645.tar.gz 7908182 BLAKE2B b27def6bc3304db86dda717e0464ae9c444fe76a1960d18afe356767a7db497d11bb25db4b31a66143ee406614575f93ae232308d61294a6d8825b85afd51f99 SHA512 e6e4d37b7552efe3046ddcbc8f0cfa507abc159dbcadaafd2cdc7998f9e02f4274b6ff2b208997c64159c0a8d14458140e8a0b9c03ebcaf345af2d997d044f1b DIST citra-dds-ktx-42dd8aa.tar.gz 264403 BLAKE2B bb202227325f4a051458713e6271b9da9f940e4a998f5af3233298c26728c06c04c6d439cdb86a7e6ef814a2c925063f5d472bc2a2ab052681cec4e72034e047 SHA512 2af702e36b595dcb38e8a4ddf1d5c75accb25361fe11b8db0b51e2acfe42391696fe7ee73b59d889da4a0781b4404df01ab244b27d21267743d81f1bb0a1a7a2 DIST citra-dynarmic-c08c5a9.tar.gz 3595510 BLAKE2B 7a988eabd1850bc8dcd8cdf9f30ac9b605d062ae2f383630f8213b290dc498daba745d4c1b1e1b0a3bcd6493b3fe223dbfda59695c40e1100b368c8adaa94335 SHA512 8103506bce04c981b3677b4d8a5317e9a983c96c42dbdad1c3a108ebde3baffdc2fea47feb66d45d6dd51e1836ee817786484638fa3c9942a8ae9adf1af6602b diff --git a/games-emulation/citra/files/citra-0002-inih-fix.patch b/games-emulation/citra/files/citra-0002-inih-fix.patch index c48a80577..9ac3dd669 100644 --- a/games-emulation/citra/files/citra-0002-inih-fix.patch +++ b/games-emulation/citra/files/citra-0002-inih-fix.patch @@ -1,13 +1,31 @@ -From 8aa392b07418fe8be95be0d5f61b33aaeedd80f8 Mon Sep 17 00:00:00 2001 +From 829dc5f006802069b2dc5ccd1cb58c854552714a Mon Sep 17 00:00:00 2001 From: Andrew Udvare Date: Sun, 30 Oct 2022 22:55:47 -0400 Subject: [PATCH 2/2] inih fix --- + src/citra/CMakeLists.txt | 6 +----- src/citra/config.cpp | 1 + src/video_core/renderer_vulkan/vk_shader_util.cpp | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) + 3 files changed, 3 insertions(+), 6 deletions(-) +diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt +index 498b77027..d78d65e76 100644 +--- a/src/citra/CMakeLists.txt ++++ b/src/citra/CMakeLists.txt +@@ -22,11 +22,7 @@ create_target_directory_groups(citra) + + target_link_libraries(citra PRIVATE citra_common citra_core input_common network) + target_link_libraries(citra PRIVATE glad) +-if (NOT USE_SYSTEM_INIH) +- target_link_libraries(citra PRIVATE inih) +-else() +- target_link_libraries(citra PRIVATE ${INIH_LIBS}) +-endif() ++target_link_libraries(citra PRIVATE inih) + if (MSVC) + target_link_libraries(citra PRIVATE getopt) + endif() diff --git a/src/citra/config.cpp b/src/citra/config.cpp index 1cbcf0262..4e773f60d 100644 --- a/src/citra/config.cpp