diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index 1e69008da3195..da3badd14b90a 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,5 @@ PORTNAME= yuzu -PORTVERSION= s20220109 +PORTVERSION= s20220111 PORTREVISION?= 0 CATEGORIES= emulators .if make(makesum) @@ -32,18 +32,18 @@ ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= requires int128 and dynarmic backend BROKEN_aarch64= https://github.com/yuzu-emu/yuzu/issues/5290 -BUILD_DEPENDS= catch>0:devel/catch \ - boost-libs>0:devel/boost-libs \ +BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ nlohmann-json>0:devel/nlohmann-json \ glslangValidator:graphics/glslang LIB_DEPENDS= liblz4.so:archivers/liblz4 \ libzstd.so:archivers/zstd \ libopus.so:audio/opus \ libavcodec.so:multimedia/ffmpeg +TEST_DEPENDS= catch>0:devel/catch USE_GITHUB= yes GH_ACCOUNT= yuzu-emu -GH_TAGNAME= b3308830b +GH_TAGNAME= eb7197eb4 GH_TUPLE= yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-32-ga3fdfe8:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \ KhronosGroup:Vulkan-Headers:v1.2.202:Vulkan_Headers/externals/Vulkan-Headers \ @@ -63,6 +63,8 @@ USE_SDL= sdl2 CMAKE_ON= Boost_USE_STATIC_LIBS CMAKE_ON+= BUNDLE_SPEEX # only used by cubeb tests CMAKE_OFF= YUZU_USE_BUNDLED_OPUS YUZU_USE_EXTERNAL_SDL2 ENABLE_GNUTLS ENABLE_MBEDTLS +CMAKE_OFF+= ${CMAKE_TESTING_ON} +CMAKE_TESTING_ON= YUZU_TESTS LDFLAGS+= -static-libstdc++ # avoid libc++ conflict, requires files/patch-fmt LDFLAGS+= -Wl,--as-needed # Qt5Network diff --git a/emulators/yuzu/distinfo b/emulators/yuzu/distinfo index 2bc704054dc75..24ae6df6877eb 100644 --- a/emulators/yuzu/distinfo +++ b/emulators/yuzu/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1641781799 +TIMESTAMP = 1641963496 SHA256 (yuzu/compatibility_list.json) = d0e2b865f30b815d1fb42c32be533f663d79df51497a8197e4bbad112e36498e SIZE (yuzu/compatibility_list.json) = 1255228 -SHA256 (yuzu-emu-yuzu-s20220109-b3308830b_GH0.tar.gz) = c3716fcfc5dc39b3556e94455536cbcfedd313bea36f85393eefe0af313870fe -SIZE (yuzu-emu-yuzu-s20220109-b3308830b_GH0.tar.gz) = 4485018 +SHA256 (yuzu-emu-yuzu-s20220111-eb7197eb4_GH0.tar.gz) = 0fb83339717a5bf6542ae6816accf5b876d71e184fd940b397f9606946c8383d +SIZE (yuzu-emu-yuzu-s20220111-eb7197eb4_GH0.tar.gz) = 4488279 SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450 SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = bd629d6296dd374eb2aeff923c75895ba0f3ce6448dad89763930e65b954e0cb diff --git a/emulators/yuzu/files/patch-fmt b/emulators/yuzu/files/patch-fmt index cd85017cb2c31..1b97693431f27 100644 --- a/emulators/yuzu/files/patch-fmt +++ b/emulators/yuzu/files/patch-fmt @@ -47,12 +47,12 @@ microinstruction.cpp:(.text._ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR6Opcod microinstruction.cpp:(.text._ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR4TypeEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE[_ZN3fmt2v76detail12format_valueIcN8Dynarmic2IR4TypeEEEvRNS1_6bufferIT_EERKT0_NS1_10locale_refE]+0x10f): undefined reference to `std::locale fmt::v7::detail::locale_ref::get() const' collect2: error: ld returned 1 exit status ---- CMakeLists.txt.orig 2022-01-10 02:29:59 UTC +--- CMakeLists.txt.orig 2022-01-12 04:58:16 UTC +++ CMakeLists.txt -@@ -169,7 +169,6 @@ macro(yuzu_find_packages) +@@ -170,7 +170,6 @@ macro(yuzu_find_packages) + # Capitalization matters here. We need the naming to match the generated paths from Conan set(REQUIRED_LIBS # Cmake Pkg Prefix Version Conan Pkg - "Catch2 2.13.7 catch2/2.13.7" - "fmt 8.0.1 fmt/8.1.1" "lz4 1.8 lz4/1.9.2" "nlohmann_json 3.8 nlohmann_json/3.8.0"