From nobody Thu Feb 10 07:59:36 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 77FE419B9625; Thu, 10 Feb 2022 07:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JvTfw60zHz3t86; Thu, 10 Feb 2022 07:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644479977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qcnOxnYa/dBoZEIXkAVSq+TbbQZOYbG/LX5H2v2EiJY=; b=GHNGijgdSh70Py2sbxK944/i3lYZY29XdIwiGgHBOfispyyP91msiHgGse4expGa2L/v5l PG9l/0jjWyolBVMy5y11Kfd4nR5hOGRpTnVWNUjxozM9m4lZhO5XiksFan2JbhHH/L4r1G V0CNTioiHFVXcAAOutcD5Q4ZbwEtailBEgpWx+Ym4eC3nfPY2iVwKjgeCiRKVm+bb35hxV +z6hTqBAzsDmIZXvW5pYGNYNmwK/VJOACVSyAy3Hsg+12lozRhrZ1Pi9VYKsxw6+Ppanrc JyPlqu+zMd9Nk9wvRr9Nerb8Z8RW87jRd33JIEOmCJCTVfz2yXI4bQRR5ljfRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6ADC11CC1A; Thu, 10 Feb 2022 07:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21A7xaQ4081739; Thu, 10 Feb 2022 07:59:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21A7xagM081738; Thu, 10 Feb 2022 07:59:36 GMT (envelope-from git) Date: Thu, 10 Feb 2022 07:59:36 GMT Message-Id: <202202100759.21A7xagM081738@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: b7d3f79bb0f0 - 2022Q1 - emulators/yuzu: unbreak under Plasma after 4021ff7b85d9 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: b7d3f79bb0f00e2610414910e301c105fe0a5700 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644479977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qcnOxnYa/dBoZEIXkAVSq+TbbQZOYbG/LX5H2v2EiJY=; b=hhYkVCZujYiPBkpVRIxWYXpUcUWAojMIsNqoXrlWzjVN2HqyEg1iwQv3ps8nqE8Um4Wm0l 6EjyZnN9gCdTaTOsKYgo/b5MJloQUVXWxJLrbgq/nlrN8asQMweKh/Jkc5i/goD7xKMifb lTOHzFzndWcOWGz1UROC8D49vqJMWVGt6+++MThT7ShqDKnyoPpQyEDt26ZsPeXx/sElgE yxUbCsCNsfOE3ZwDxK2X9vH8oWSXZT3aPeIIPMMRm1tRNWbYpqhEezabG/GxUf2t46ECGm WlI0VGC8ii6u0o+WDt3qelDOHgfXBBz+jMqUj9utk6ZK1UzjT3QyZHgC+EbvNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644479977; a=rsa-sha256; cv=none; b=auzElwXvFD1uFG5m0tDGTL0Bno3eojfa1uRydzDrVtd2CWl+7yV5bVmMMp8A17nVAyoJg+ tffVwylNePw847FGZdtGMnwrPH/ZjG9v0tvKkG2gjmkfdsuMy2rHjjMWgXu5nA4Nac8DIB ZwsWpz7idAwbLm+UlGkdGjgcUjYjpqh0Az+j4EGe5PNHc32k3rUU9z8diuuD9KhvY4l+tN Y0ismhCCQvsSoYkTL+XS6BwkUMQ19ojgYMG9+Aowh8xkU+GdBuUOBLITE0JanLXlzXtxKD nDeHOPjMccS9PxDMQKeC901W/Tx5DiXz1Q9aFYejALKXZ5CCBm5WDvYIkZ0LSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b7d3f79bb0f00e2610414910e301c105fe0a5700 commit b7d3f79bb0f00e2610414910e301c105fe0a5700 Author: Jan Beich AuthorDate: 2022-02-10 06:54:13 +0000 Commit: Jan Beich CommitDate: 2022-02-10 07:59:32 +0000 emulators/yuzu: unbreak under Plasma after 4021ff7b85d9 $ yuzu Unhandled SIGSEGV at rip 0x0000083a532c18 PR: 256914 Reported by: jkim Submitted by: Loic (based on) (cherry picked from commit 8240af3d530bd4210f7739b6303e663ca21a441d) --- emulators/yuzu/Makefile | 1 + emulators/yuzu/files/patch-kde | 71 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/emulators/yuzu/Makefile b/emulators/yuzu/Makefile index e1767ff1113b..9a1a03fc37c7 100644 --- a/emulators/yuzu/Makefile +++ b/emulators/yuzu/Makefile @@ -1,5 +1,6 @@ PORTNAME= yuzu PORTVERSION= s20220209 +PORTREVISION= 1 CATEGORIES= emulators .if make(makesum) MASTER_SITES= https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb diff --git a/emulators/yuzu/files/patch-kde b/emulators/yuzu/files/patch-kde new file mode 100644 index 000000000000..32c9c04d74e7 --- /dev/null +++ b/emulators/yuzu/files/patch-kde @@ -0,0 +1,71 @@ +$ pkg install yuzu plasma5-plasma-integration +$ export XDG_CURRENT_DESKTOP=KDE KDE_FULL_SESSION=true +$ yuzu +[...] +* thread #1, name = 'yuzu', stop reason = signal SIGSEGV: address access protected (fault address: 0x83c1ccc18) + frame #0: 0x000000083c1ccc18 libcxxrt.so.1`vtable for __cxxabiv1::__si_class_type_info + 16 +libcxxrt.so.1`vtable for __cxxabiv1::__si_class_type_info: +-> 0x83c1ccc18 <+16>: nop + 0x83c1ccc19 <+17>: xchgl %ecx, %eax + 0x83c1ccc1a <+18>: imull $0x0, (%rcx), %eax + 0x83c1ccc1d <+21>: addb %al, (%rax) +(lldb) bt +* thread #1, name = 'yuzu', stop reason = signal SIGSEGV: address access protected (fault address: 0x83c1ccc18) + * frame #0: 0x000000083c1ccc18 libcxxrt.so.1`vtable for __cxxabiv1::__si_class_type_info + 16 + frame #1: 0x0000000822adcf48 + frame #2: 0x000000089c992d16 libKF5ConfigCore.so.5`KConfigGroupPrivate::create(master=0x0000000822adcf48, name=0x0000000822adceb0, isImmutable=false, isConst=false) at kconfiggroup.cpp:114:13 + frame #3: 0x000000089c98bc2a libKF5ConfigCore.so.5`KConfigGroup::KConfigGroup(this=0x0000000822adcf38, master=0x0000000822adcf48, _group="Inactive") at kconfiggroup.cpp:476:9 + frame #4: 0x00000008964fc32f libKF5ConfigWidgets.so.5`KColorSchemePrivate::KColorSchemePrivate(this=0x0000000875c8b3c0, config=0x0000000822add248, state=Inactive, group="Colors:View", defaults=0x00000008964c84b0) at kcolorscheme.cpp:313:38 + frame #5: 0x00000008964fe613 libKF5ConfigWidgets.so.5`KColorScheme::KColorScheme(this=0x0000000822add250, state=Inactive, set=View, config=KSharedConfigPtr @ 0x0000000822add248) at kcolorscheme.cpp:552:17 + frame #6: 0x00000008964ff40c libKF5ConfigWidgets.so.5`KColorScheme::createApplicationPalette(config=0x000000088d3a7160) at kcolorscheme.cpp:702:22 + frame #7: 0x000000088ef1fb6d KDEPlasmaPlatformTheme.so`KHintsSettings::loadPalettes(this=0x000000088d3a7140) at khintssettings.cpp:423:66 + frame #8: 0x000000088ef1e242 KDEPlasmaPlatformTheme.so`KHintsSettings::KHintsSettings(this=0x000000088d3a7140, kdeglobals=KSharedConfig::Ptr @ 0x0000000822addd10) at khintssettings.cpp:144:5 + frame #9: 0x000000088ef183e8 KDEPlasmaPlatformTheme.so`KdePlatformTheme::loadSettings(this=0x000000088d3b19c0) at kdeplatformtheme.cpp:179:19 + frame #10: 0x000000088ef182a2 KDEPlasmaPlatformTheme.so`KdePlatformTheme::KdePlatformTheme(this=0x000000088d3b19c0) at kdeplatformtheme.cpp:62:5 + frame #11: 0x000000088ef4544a KDEPlasmaPlatformTheme.so`KdePlatformThemePlugin::create(this=0x000000088d38a750, key=0x0000000822adde40, paramList=0x0000000822adde60) at main.cpp:25:20 + frame #12: 0x000000083710e720 libQt5Gui.so.5`QPlatformTheme* qLoadPlugin(loader=0x00000008376e6358, key=0x0000000822adde40, args=0x0000000822adde60) at qfactoryloader_p.h:108:52 + frame #13: 0x000000083710e016 libQt5Gui.so.5`QPlatformThemeFactory::create(key=0x0000000875bc4bb0, platformPluginPath=0x0000000822ade300) at qplatformthemefactory.cpp:73:12 + frame #14: 0x000000083711adaf libQt5Gui.so.5`init_platform(pluginNamesWithArguments=0x0000000822ade1c8, platformPluginPath=0x0000000822ade300, platformThemeName=0x0000000822ade220, argc=0x0000000822ade6bc, argv=0x0000000822ade9d8) at qguiapplication.cpp:1282:50 + frame #15: 0x000000083711a111 libQt5Gui.so.5`QGuiApplicationPrivate::createPlatformIntegration(this=0x0000000875c56000) at qguiapplication.cpp:1481:5 + frame #16: 0x000000083711b22c libQt5Gui.so.5`QGuiApplicationPrivate::createEventDispatcher(this=0x0000000875c56000) at qguiapplication.cpp:1498:9 + frame #17: 0x000000083573cb75 libQt5Widgets.so.5`QApplicationPrivate::createEventDispatcher(this=0x0000000875c56000) at qapplication.cpp:167:29 + frame #18: 0x0000000838c2ffc6 libQt5Core.so.5`QCoreApplicationPrivate::init(this=0x0000000875c56000) at qcoreapplication.cpp:835:9 + frame #19: 0x00000008371157f3 libQt5Gui.so.5`QGuiApplicationPrivate::init(this=0x0000000875c56000) at qguiapplication.cpp:1527:30 + frame #20: 0x000000083573d129 libQt5Widgets.so.5`QApplicationPrivate::init(this=0x0000000875c56000) at qapplication.cpp:513:29 + frame #21: 0x000000083573d105 libQt5Widgets.so.5`QApplication::QApplication(this=0x0000000822ade6d0, argc=0x0000000822ade6bc, argv=0x0000000822ade9d8, _internal=331522) at qapplication.cpp:501:8 + frame #22: 0x00000000006447c1 yuzu`main(argc=1, argv=0x0000000822ade9d8) at main.cpp:3697:32 + frame #23: 0x0000000000445890 yuzu`_start(ap=, cleanup=) at crt1_c.c:73:7 +(lldb) f 2 +frame #2: 0x000000089bdbad16 libKF5ConfigCore.so.5`KConfigGroupPrivate::create(master=0x000000082359a8a8, name=0x000000082359a810, isImmutable=false, isConst=false) at kconfiggroup.cpp:114:13 + 111 static QExplicitlySharedDataPointer create(KConfigBase *master, const QByteArray &name, bool isImmutable, bool isConst) + 112 { + 113 QExplicitlySharedDataPointer data; +-> 114 if (dynamic_cast(master)) { + 115 data = new KConfigGroupPrivate(static_cast(master), isImmutable, isConst, name); + 116 } else { + 117 data = new KConfigGroupPrivate(dynamic_cast(master), isImmutable, isConst, name); +(lldb) f 22 +frame #22: 0x00000000006447c1 yuzu`main(argc=1, argv=0x0000000822ade9d8) at main.cpp:3697:32 + 3694 + 3695 // Enables the core to make the qt created contexts current on std::threads + 3696 QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); +-> 3697 QApplication app(argc, argv); + 3698 + 3699 // Qt changes the locale and causes issues in float conversion using std::to_string() when + 3700 // generating shaders + +--- src/yuzu/main.cpp.orig 2022-02-09 18:29:32 UTC ++++ src/yuzu/main.cpp +@@ -3692,6 +3692,12 @@ int main(int argc, char* argv[]) { + } + #endif + ++#if (defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(_LIBCPP_VERSION) ++ // -static-libstdc++ is fragile on libc++ systems ++ qunsetenv("XDG_CURRENT_DESKTOP"); ++ qunsetenv("KDE_FULL_SESSION"); ++#endif ++ + // Enables the core to make the qt created contexts current on std::threads + QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity); + QApplication app(argc, argv);