Skip to content

Commit

Permalink
emulators/yuzu: back out r540846, need more testing before 2020Q3
Browse files Browse the repository at this point in the history 
No PORTEPOCH bump because this port wasn't stable to begin with.

* thread #9, name = 'yuzu:CPUThread', stop reason = signal SIGABRT
  * frame #0: 0x0000000804146a8a libc.so.7`__sys_thr_kill at thr_kill.S:4
    frame #1: 0x0000000804146424 libc.so.7`__raise(s=6) at raise.c:52:10
    frame #2: 0x00000008040aef19 libc.so.7`abort at abort.c:67:8
    frame #3: 0x00000008038f39b9 libcxxrt.so.1`report_failure(err=<unavailable>, thrown_exception=0x00000009d701aa88) at exception.cc:719:5
    frame #4: 0x00000008038c34dc libc++.so.1`std::__1::__throw_system_error(ev=11, what_arg="mutex lock failed") at system_error.cpp:287:5
    frame #5: 0x00000008038a834d libc++.so.1`std::__1::mutex::lock(this=<unavailable>) at mutex.cpp:35:9
    frame #6: 0x0000000000dbb534 yuzu`std::__1::unique_lock<std::__1::mutex>::unique_lock(this=0x00000009c68f1d90, __m=0x0000000805984918) at __mutex_base:119:61
    frame #7: 0x000000000136167d yuzu`Service::NVFlinger::NVFlinger::Lock(this=0x000000080c8c6958) at nvflinger.h:90:16
    frame #8: 0x00000000014c5ab4 yuzu`Service::VI::IHOSBinderDriver::TransactParcel(this=0x00000009d536e6f8, thread=std::__1::shared_ptr<Kernel::Thread>::element_type @ 0x000000090faedc20 strong=9 weak=2, ctx=0x00000009d536e310, reason=Signal)::'lambda'(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)::operator()(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason) const at vi.cpp:554:37
    frame #9: 0x00000000014c59f5 yuzu`decltype(__f=0x00000009d536e6f8, __args=nullptr, __args=0x00000009d536e310, __args=0x00000009c68f2004)::'lambda'(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)&>(fp)(std::__1::forward<std::__1::shared_ptr<Kernel::Thread> >(fp0), std::__1::forward<Kernel::HLERequestContext&>(fp0), std::__1::forward<Kernel::ThreadWakeupReason>(fp0))) std::__1::__invoke<Service::VI::IHOSBinderDriver::TransactParcel(Kernel::HLERequestContext&)::'lambda'(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)&, std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason>(Service::VI::IHOSBinderDriver::TransactParcel(Kernel::HLERequestContext&)::'lambda'(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)&, std::__1::shared_ptr<Kernel::Thread>&&, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason&&) at type_traits:3539:1
    frame #10: 0x00000000014c594c yuzu`void std::__1::__invoke_void_return_wrapper<void>::__call<Service::VI::IHOSBinderDriver::TransactParcel(__args=0x00000009d536e6f8, __args=nullptr, __args=0x00000009d536e310, __args=0x00000009c68f2004)::'lambda'(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)&, std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason>(Service::VI::IHOSBinderDriver::TransactParcel(Kernel::HLERequestContext&)::'lambda'(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)&, std::__1::shared_ptr<Kernel::Thread>&&, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason&&) at __functional_base:348:9
    frame #11: 0x00000000014c58dc yuzu`std::__1::__function::__alloc_func<Service::VI::IHOSBinderDriver::TransactParcel(Kernel::HLERequestContext&)::'lambda'(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason), std::__1::allocator<Service::VI::IHOSBinderDriver::TransactParcel(Kernel::HLERequestContext&)::'lambda'(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>, void (std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>::operator(this=0x00000009d536e6f8, __arg=nullptr, __arg=0x00000009d536e310, __arg=0x00000009c68f2004)(std::__1::shared_ptr<Kernel::Thread>&&, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason&&) at functional:1540:16
    frame #12: 0x00000000014c480d yuzu`std::__1::__function::__func<Service::VI::IHOSBinderDriver::TransactParcel(Kernel::HLERequestContext&)::'lambda'(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason), std::__1::allocator<Service::VI::IHOSBinderDriver::TransactParcel(Kernel::HLERequestContext&)::'lambda'(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>, void (std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>::operator(this=0x00000009d536e6f0, __arg=nullptr, __arg=0x00000009d536e310, __arg=0x00000009c68f2004)(std::__1::shared_ptr<Kernel::Thread>&&, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason&&) at functional:1714:12
    frame #13: 0x0000000001116862 yuzu`std::__1::__function::__value_func<void (std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>::operator(this=0x00000009d536e6f0, __args=nullptr, __args=0x00000009d536e310, __args=0x00000009c68f2004)(std::__1::shared_ptr<Kernel::Thread>&&, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason&&) const at functional:1867:16
    frame #14: 0x00000000011167bc yuzu`std::__1::function<void (std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>::operator(this= Lambda in File vi.cpp at Line 552, __arg=<unavailable>, __arg=0x00000009d536e310, __arg=Signal)(std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason) const at functional:2473:12
    frame #15: 0x000000000110a6a4 yuzu`Kernel::HLERequestContext::SleepClientThread(this=0x00000009d536e310, thread=std::__1::shared_ptr<Kernel::Thread>::element_type @ 0x000000090faedc20 strong=9 weak=2)>&&, std::__1::shared_ptr<Kernel::WritableEvent>)::$_0::operator()(std::__1::shared_ptr<Kernel::Thread>) at hle_ipc.cpp:67:17
    frame #16: 0x000000000110a5b1 yuzu`decltype(__f=0x00000009d536e310, __args=nullptr)>&&, std::__1::shared_ptr<Kernel::WritableEvent>)::$_0&>(fp)(std::__1::forward<std::__1::shared_ptr<Kernel::Thread> >(fp0))) std::__1::__invoke<Kernel::HLERequestContext::SleepClientThread(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, unsigned long, std::__1::function<void (std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>&&, std::__1::shared_ptr<Kernel::WritableEvent>)::$_0&, std::__1::shared_ptr<Kernel::Thread> >(Kernel::HLERequestContext::SleepClientThread(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, unsigned long, std::__1::function<void (std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>&&, std::__1::shared_ptr<Kernel::WritableEvent>)::$_0&, std::__1::shared_ptr<Kernel::Thread>&&) at type_traits:3539:1
    frame #17: 0x000000000110a532 yuzu`bool std::__1::__invoke_void_return_wrapper<bool>::__call<Kernel::HLERequestContext::SleepClientThread(__args=0x00000009d536e310, __args=nullptr)>&&, std::__1::shared_ptr<Kernel::WritableEvent>)::$_0&, std::__1::shared_ptr<Kernel::Thread> >(Kernel::HLERequestContext::SleepClientThread(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, unsigned long, std::__1::function<void (std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>&&, std::__1::shared_ptr<Kernel::WritableEvent>)::$_0&, std::__1::shared_ptr<Kernel::Thread>&&) at __functional_base:317:16
    frame #18: 0x000000000110a4f2 yuzu`std::__1::__function::__alloc_func<Kernel::HLERequestContext::SleepClientThread(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, unsigned long, std::__1::function<void (std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>&&, std::__1::shared_ptr<Kernel::WritableEvent>)::$_0, std::__1::allocator<Kernel::HLERequestContext::SleepClientThread(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, unsigned long, std::__1::function<void (std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>&&, std::__1::shared_ptr<Kernel::WritableEvent>)::$_0>, bool (std::__1::shared_ptr<Kernel::Thread>)>::operator(this=0x00000009d536e310, __arg=nullptr)(std::__1::shared_ptr<Kernel::Thread>&&) at functional:1540:16
    frame #19: 0x00000000011094b3 yuzu`std::__1::__function::__func<Kernel::HLERequestContext::SleepClientThread(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, unsigned long, std::__1::function<void (std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>&&, std::__1::shared_ptr<Kernel::WritableEvent>)::$_0, std::__1::allocator<Kernel::HLERequestContext::SleepClientThread(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, unsigned long, std::__1::function<void (std::__1::shared_ptr<Kernel::Thread>, Kernel::HLERequestContext&, Kernel::ThreadWakeupReason)>&&, std::__1::shared_ptr<Kernel::WritableEvent>)::$_0>, bool (std::__1::shared_ptr<Kernel::Thread>)>::operator(this=0x00000009d536e300, __arg=nullptr)(std::__1::shared_ptr<Kernel::Thread>&&) at functional:1714:12
    frame #20: 0x00000000011834ed yuzu`std::__1::__function::__value_func<bool (std::__1::shared_ptr<Kernel::Thread>)>::operator(this=0x000000090faee1c0, __args=nullptr)(std::__1::shared_ptr<Kernel::Thread>&&) const at functional:1867:16
    frame #21: 0x0000000001180c18 yuzu`std::__1::function<bool (std::__1::shared_ptr<Kernel::Thread>)>::operator(this=0x000000090faee1c0, __arg=<unavailable>)(std::__1::shared_ptr<Kernel::Thread>) const at functional:2473:12
    frame #22: 0x000000000117edb2 yuzu`Kernel::Thread::InvokeHLECallback(this=0x000000090faedc20, thread=nullptr) at thread.cpp:403:12
    frame #23: 0x00000000011929d7 yuzu`Kernel::Svc::SendSyncRequest(system=0x000000000252f3d8, handle=622615) at svc.cpp:365:17
    frame #24: 0x000000000118b3b5 yuzu`void Kernel::SvcWrap64<&(Kernel::Svc::SendSyncRequest(Core::System&, unsigned int))>(system=0x000000000252f3d8) at svc_wrap.h:50:24
    frame #25: 0x000000000118a334 yuzu`Kernel::Svc::Call(system=0x000000000252f3d8, immediate=33) at svc.cpp:2649:13
    frame #26: 0x00000000011a60e3 yuzu`Core::DynarmicCallbacks64::CallSVC(this=0x00000009c657df60, swi=33) at arm_dynarmic_64.cpp:123:9
    frame #27: 0x00000000023f2c74 yuzu`Dynarmic::Backend::X64::impl::ThunkBuilder<void (Dynarmic::A64::UserCallbacks::*)(unsigned int), &(Dynarmic::A64::UserCallbacks::CallSVC(unsigned int))>::Thunk(this_=0x00000009c657df60, args=33) at devirtualize.h:28:16
  • Loading branch information
@jbeich
jbeich committed Jun 30, 2020
1 parent 5a27f0a commit 256ee9d
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 42 deletions.
36 changes: 17 additions & 19 deletions emulators/yuzu/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
# $FreeBSD$

PORTNAME= yuzu
PORTVERSION= s20200629
PORTVERSION= s20200508
PORTREVISION?= 0
CATEGORIES= emulators

PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= e6085ea35f0b.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4208
PATCHFILES+= dda90ce1c249.patch:-p1 # https://github.com/yuzu-emu/yuzu/pull/4209

MAINTAINER= jbeich@FreeBSD.org
COMMENT= Nintendo Switch emulator/debugger

LICENSE= APACHE20 BSD3CLAUSE GPLv2+ ISCL LGPL21+ LGPL3+ MIT OpenSSL UNLICENSE
LICENSE= APACHE20 BSD2CLAUSE BSD3CLAUSE BSL GPLv2+ ISCL LGPL21+ LGPL3+ MIT OpenSSL UNLICENSE
LICENSE_COMB= multi
LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/externals/fmt/LICENSE.rst
LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/externals/inih/inih/LICENSE.txt
LICENSE_FILE_BSL= ${WRKSRC}/externals/catch/LICENSE.txt
LICENSE_FILE_GPLv2+ = ${WRKSRC}/license.txt
LICENSE_FILE_ISCL= ${WRKSRC}/externals/cubeb/LICENSE
LICENSE_FILE_LGPL21+ = ${_LICENSE_STORE}/LGPL21 # soundtouch
Expand All @@ -25,36 +23,36 @@ LICENSE_FILE_OpenSSL= ${WRKSRC}/externals/libressl/COPYING
ONLY_FOR_ARCHS= aarch64 amd64 powerpc64
ONLY_FOR_ARCHS_REASON= requires int128

BUILD_DEPENDS= catch>0:devel/catch \
gmake:devel/gmake \
nlohmann-json>0:devel/nlohmann-json
LIB_DEPENDS= liblz4.so:archivers/liblz4 \
libzstd.so:archivers/zstd \
libopus.so:audio/opus \
libboost_context.so:devel/boost-libs \
libfmt.so:devel/libfmt
BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs \
gmake:devel/gmake

USE_GITHUB= yes
GH_ACCOUNT= yuzu-emu
GH_TAGNAME= f84cbf642
GH_TAGNAME= 50c27d5ae
GH_TUPLE= yuzu-emu:unicorn:1.0.1-153-g73f45735:unicorn/externals/unicorn \
DarkLordZach:mbedtls:a280e60:mbedtls/externals/mbedtls \
KhronosGroup:SPIRV-Headers:2c51218:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \
KhronosGroup:Vulkan-Headers:v1.2.140:Vulkan_Headers/externals/Vulkan-Headers \
MerryMage:dynarmic:r3-220-g4f967387:dynarmic/externals/dynarmic \
ReinUsesLisp:sirit:eefca56:sirit/externals/sirit \
MerryMage:dynarmic:r3-1-ge7166e8b:dynarmic/externals/dynarmic \
ReinUsesLisp:sirit:414fc4d:sirit/externals/sirit \
arsenm:sanitizers-cmake:aab6948:sanitizers_cmake/externals/cubeb/cmake/sanitizers-cmake \
catchorg:Catch2:v2.3.0:catch/externals/catch \
citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \
citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \
herumi:xbyak:v5.911:xbyak/externals/xbyak \
facebook:zstd:v1.3.8:zstd/externals/zstd \
fmtlib:fmt:6.2.0:fmt/externals/fmt \
kinetiknz:cubeb:cubeb-0.2-1194-g616d773:cubeb/externals/cubeb \
lz4:lz4:v1.8.0-8-g4db65c1:lz4/externals/lz4 \
madler:zlib:v1.2.11:zlib/externals/zlib/zlib \
nih-at:libzip:rel-1-5-2-93-g89bd6d63:libzip/externals/libzip/libzip \
svn2github:inih:603729d:inih/externals/inih/inih \
weidai11:cryptopp:CRYPTOPP_7_0_0-23-gf320e7d9:cryptopp/externals/cryptopp/cryptopp
weidai11:cryptopp:CRYPTOPP_7_0_0-23-gf320e7d9:cryptopp/externals/cryptopp/cryptopp \
xiph:opus:v1.3.1-4-gad8fe90d:opus/externals/opus/opus

USES= cmake compiler:c++17-lang iconv localbase:ldflags \
python:build sdl ssl
USE_SDL= sdl2
CMAKE_OFF= ENABLE_GNUTLS ENABLE_MBEDTLS
CXXFLAGS+= -Wno-narrowing # https://github.com/yuzu-emu/yuzu/issues/3407
LDFLAGS+= -Wl,--as-needed # Qt5Network
TEST_TARGET= test
Expand Down
32 changes: 19 additions & 13 deletions emulators/yuzu/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TIMESTAMP = 1593407558
SHA256 (yuzu-emu-yuzu-s20200629-f84cbf642_GH0.tar.gz) = 8a887316476f4b094d0b370d59bd363e3042dc47d73853b67665534a462be042
SIZE (yuzu-emu-yuzu-s20200629-f84cbf642_GH0.tar.gz) = 2754796
TIMESTAMP = 1588965413
SHA256 (yuzu-emu-yuzu-s20200508-50c27d5ae_GH0.tar.gz) = 1c9bc5e7a638dd3ed47cc98047e56885f45217c829fbadf28ad47fd60767f731
SIZE (yuzu-emu-yuzu-s20200508-50c27d5ae_GH0.tar.gz) = 2802360
SHA256 (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 8f7b4d8eb998c2a4c146268d83b44fc22ca8d4d276f26d6af1071e51f4b5bd4f
SIZE (yuzu-emu-unicorn-1.0.1-153-g73f45735_GH0.tar.gz) = 3296254
SHA256 (DarkLordZach-mbedtls-a280e60_GH0.tar.gz) = 4fc6ddc256bc75b975fd5ad8bb7d31ff79c62d49daafb0108585c9ef80c6c5a7
Expand All @@ -9,27 +9,33 @@ SHA256 (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 08f70947b69e17c7e322156
SIZE (KhronosGroup-SPIRV-Headers-2c51218_GH0.tar.gz) = 280829
SHA256 (KhronosGroup-Vulkan-Headers-v1.2.140_GH0.tar.gz) = c708a05b0ef673ae783f8968c5396dc207b9f8c7cde2ddb4a9a281e04661185a
SIZE (KhronosGroup-Vulkan-Headers-v1.2.140_GH0.tar.gz) = 755873
SHA256 (MerryMage-dynarmic-r3-220-g4f967387_GH0.tar.gz) = f5d9d9c9a86222814204ed177ad5041cd048169976f64e8f50590f8185ba3b7d
SIZE (MerryMage-dynarmic-r3-220-g4f967387_GH0.tar.gz) = 1643717
SHA256 (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = cc95e8155e14e596526c378d0a3cc2bb4bfe7da68773a79f224d48f89b20685a
SIZE (ReinUsesLisp-sirit-eefca56_GH0.tar.gz) = 22035
SHA256 (MerryMage-dynarmic-r3-1-ge7166e8b_GH0.tar.gz) = a0a29e8726df53e249f6b7573cbf6c97fa07994485a84d17ff9e04b20680ffe1
SIZE (MerryMage-dynarmic-r3-1-ge7166e8b_GH0.tar.gz) = 1551535
SHA256 (ReinUsesLisp-sirit-414fc4d_GH0.tar.gz) = 4561c2a4d36ce2a554aff9b681dfe3060fa564f6b8604e84cf22a07937267142
SIZE (ReinUsesLisp-sirit-414fc4d_GH0.tar.gz) = 21897
SHA256 (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = d9009e17948aff769a6f6e16b52d4d8752c5cc2cab1e9c381d3a31fd1a680b58
SIZE (arsenm-sanitizers-cmake-aab6948_GH0.tar.gz) = 7240
SHA256 (catchorg-Catch2-v2.3.0_GH0.tar.gz) = aaf6bbf81ce8522131bae2ea4d013a77b003bbb2017614f5872d5787687f8f5f
SIZE (catchorg-Catch2-v2.3.0_GH0.tar.gz) = 506374
SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3
SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942
SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c
SIZE (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = 59514
SHA256 (herumi-xbyak-v5.911_GH0.tar.gz) = 7b5ec57fb887a25c563e24bd82a0a350d68b8b0219e94b680c040f6cd59bdc40
SIZE (herumi-xbyak-v5.911_GH0.tar.gz) = 224126
SHA256 (facebook-zstd-v1.3.8_GH0.tar.gz) = 90d902a1282cc4e197a8023b6d6e8d331c1fd1dfe60f7f8e4ee9da40da886dc3
SIZE (facebook-zstd-v1.3.8_GH0.tar.gz) = 1875233
SHA256 (fmtlib-fmt-6.2.0_GH0.tar.gz) = fe6e4ff397e01c379fc4532519339c93da47404b9f6674184a458a9967a76575
SIZE (fmtlib-fmt-6.2.0_GH0.tar.gz) = 733403
SHA256 (kinetiknz-cubeb-cubeb-0.2-1194-g616d773_GH0.tar.gz) = 651694a3b29936f0e96ff2cf2e6342906e781fbe6ca6a1d84ec5671368de1df9
SIZE (kinetiknz-cubeb-cubeb-0.2-1194-g616d773_GH0.tar.gz) = 195355
SHA256 (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) = 31a61b29dcb0204c9ac283d24cd53ae4d7e15e6f4e7dd88919d965ff9cf8ced5
SIZE (lz4-lz4-v1.8.0-8-g4db65c1_GH0.tar.gz) = 222985
SHA256 (madler-zlib-v1.2.11_GH0.tar.gz) = 629380c90a77b964d896ed37163f5c3a34f6e6d897311f1df2a7016355c45eff
SIZE (madler-zlib-v1.2.11_GH0.tar.gz) = 644492
SHA256 (nih-at-libzip-rel-1-5-2-93-g89bd6d63_GH0.tar.gz) = 63050daee06c5bcf0f8fd82103e3e84e83772f3a646f42bfa3851afc7aca4ce1
SIZE (nih-at-libzip-rel-1-5-2-93-g89bd6d63_GH0.tar.gz) = 1211650
SHA256 (svn2github-inih-603729d_GH0.tar.gz) = b4faa364c3e33261707d4b669e1c669ca3818d7b9515c15fe0befd9df3f1f00a
SIZE (svn2github-inih-603729d_GH0.tar.gz) = 8342
SHA256 (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) = 1d6f029b83a230561e75bab26b5aaf98055b8439363a25bf113ac9ff6f9d2ef4
SIZE (weidai11-cryptopp-CRYPTOPP_7_0_0-23-gf320e7d9_GH0.tar.gz) = 7209489
SHA256 (e6085ea35f0b.patch) = c5b49c4512bb88f1aca85b10341f4d5f587af940026c4b52a461de101f07957b
SIZE (e6085ea35f0b.patch) = 1867
SHA256 (dda90ce1c249.patch) = 7664619a899860339dec98dceb27b1beb5ca0faafb996a469dd096c55cf87da3
SIZE (dda90ce1c249.patch) = 1029
SHA256 (xiph-opus-v1.3.1-4-gad8fe90d_GH0.tar.gz) = a5169e4de7266dca46f8fe08cdc3b9d331c14eaaffc7d9d8abc02d70c4f555da
SIZE (xiph-opus-v1.3.1-4-gad8fe90d_GH0.tar.gz) = 828993
42 changes: 32 additions & 10 deletions emulators/yuzu/files/patch-CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,37 @@
yuzu (Qt) currently needs SDL for input

--- CMakeLists.txt.orig 2020-06-29 05:12:38 UTC
--- CMakeLists.txt.orig 2020-02-19 21:13:50 UTC
+++ CMakeLists.txt
@@ -225,7 +225,9 @@ if(ENABLE_SDL2)
list(APPEND CMAKE_MODULE_PATH "${CONAN_SDL2_ROOT_RELEASE}")
list(APPEND CMAKE_PREFIX_PATH "${CONAN_SDL2_ROOT_RELEASE}")
@@ -157,19 +157,21 @@ if (ENABLE_SDL2)
target_include_directories(SDL2 INTERFACE "${SDL2_INCLUDE_DIR}")
else()
find_package(SDL2 REQUIRED)
-
- # Some installations don't set SDL2_LIBRARIES
- if("${SDL2_LIBRARIES}" STREQUAL "")
- message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
- set(SDL2_LIBRARIES "SDL2::SDL2")
- endif()
-
- include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
- add_library(SDL2 INTERFACE)
- target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
endif()
- find_package(SDL2)
else()
- set(SDL2_FOUND NO)
+ find_package(SDL2)
+endif()
+find_package(SDL2)
+if(ENABLE_SDL2)
if (NOT SDL2_FOUND)
# otherwise add this to the list of libraries to install
list(APPEND CONAN_REQUIRED_LIBS "sdl2/2.0.12@bincrafters/stable")
+
+if (SDL2_FOUND)
+ # Some installations don't set SDL2_LIBRARIES
+ if("${SDL2_LIBRARIES}" STREQUAL "")
+ message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
+ set(SDL2_LIBRARIES "SDL2::SDL2")
+ endif()
+
+ include_directories(SYSTEM ${SDL2_INCLUDE_DIRS})
+ add_library(SDL2 INTERFACE)
+ target_link_libraries(SDL2 INTERFACE "${SDL2_LIBRARIES}")
endif()

# If unicorn isn't found, msvc -> download bundled unicorn; everyone else -> build external

0 comments on commit 256ee9d

Please sign in to comment.