diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index a45ec4ea1242..de1662009202 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -35,7 +35,7 @@ GH_TUPLE= citra-emu:ext-soundtouch:019d208:soundtouch/externals/soundtouch \ herumi:xbyak:v5.53-1-gc5da377:xbyak/externals/xbyak \ lsalzman:enet:39a72ab:enet/externals/enet \ neobrain:nihstro:fd69de1:nihstro/externals/nihstro \ - weidai11:cryptopp:CRYPTOPP_6_0_0:cryptopp/externals/cryptopp/cryptopp + weidai11:cryptopp:CRYPTOPP_6_1_0:cryptopp/externals/cryptopp/cryptopp USES= cmake:outsource compiler:c++14-lang iconv localbase:ldflags USE_SDL= sdl2 diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo index 8760bc2c54bb..f470e54110ee 100644 --- a/emulators/citra/distinfo +++ b/emulators/citra/distinfo @@ -17,7 +17,7 @@ SHA256 (lsalzman-enet-39a72ab_GH0.tar.gz) = cdeec4d447266d93dbd56564b260c57e411d SIZE (lsalzman-enet-39a72ab_GH0.tar.gz) = 79471 SHA256 (neobrain-nihstro-fd69de1_GH0.tar.gz) = cebeb307aad4b9fbc4d26eb54c01c90e118bc6287ab65688a50303a59272be5a SIZE (neobrain-nihstro-fd69de1_GH0.tar.gz) = 110417 -SHA256 (weidai11-cryptopp-CRYPTOPP_6_0_0_GH0.tar.gz) = ed951973ae4f4d52edcf25882fa5238145a00adc81edb9d7be4ce7b9aa744269 -SIZE (weidai11-cryptopp-CRYPTOPP_6_0_0_GH0.tar.gz) = 7158162 +SHA256 (weidai11-cryptopp-CRYPTOPP_6_1_0_GH0.tar.gz) = 69ee71fdff9cc0d56634712703c8eba97204bf58feacdfe1a94df87faffeff55 +SIZE (weidai11-cryptopp-CRYPTOPP_6_1_0_GH0.tar.gz) = 7195344 SHA256 (whoshuu-cpr-1.3.0-12-gb5758fb_GH0.tar.gz) = 84ea509dc08766d7182b867b78ba6dd16f3352d85b18b0654661079b8617dae4 SIZE (whoshuu-cpr-1.3.0-12-gb5758fb_GH0.tar.gz) = 34100 diff --git a/emulators/citra/files/patch-externals_cryptopp_cryptopp_config.h b/emulators/citra/files/patch-externals_cryptopp_cryptopp_config.h deleted file mode 100644 index 90e4bb473c89..000000000000 --- a/emulators/citra/files/patch-externals_cryptopp_cryptopp_config.h +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/citra-emu/citra/issues/3435 - ---- externals/cryptopp/cryptopp/config.h.orig 2018-01-22 20:54:51 UTC -+++ externals/cryptopp/cryptopp/config.h -@@ -1027,7 +1027,7 @@ NAMESPACE_END - #endif // alignof - - // lambdas: MS at VS2012 (17.00); GCC at 4.9; Clang at 3.3; Intel 12.0; SunCC 5.14. --#if (CRYPTOPP_MSC_VERSION >= 1700) || __has_feature(cxx_lambda) || \ -+#if (CRYPTOPP_MSC_VERSION >= 1700) || __has_feature(cxx_lambdas) || \ - (__INTEL_COMPILER >= 1200) || (CRYPTOPP_GCC_VERSION >= 40900) || (__SUNPRO_CC >= 0x5140) - # define CRYPTOPP_CXX11_LAMBDA 1 - #endif // lambdas