From unknown Tue Aug 19 23:13:35 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75702] [PATCH v3 11/11] gnu: dolphin-emu: Patch data. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 20 Jan 2025 14:32:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75702 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75702@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by submit@debbugs.gnu.org id=B.173738348127946 (code B ref -1); Mon, 20 Jan 2025 14:32:05 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jan 2025 14:31:21 +0000 Received: from localhost ([127.0.0.1]:49562 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZsoD-0007Ga-67 for submit@debbugs.gnu.org; Mon, 20 Jan 2025 09:31:21 -0500 Received: from lists.gnu.org ([2001:470:142::17]:39372) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tZsnm-0007Cy-H5 for submit@debbugs.gnu.org; Mon, 20 Jan 2025 09:30:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tZsnh-0007Pu-02 for guix-patches@gnu.org; Mon, 20 Jan 2025 09:30:49 -0500 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tZsnf-0004xj-72 for guix-patches@gnu.org; Mon, 20 Jan 2025 09:30:48 -0500 Received: by mail-pj1-x102c.google.com with SMTP id 98e67ed59e1d1-2ee67e9287fso7796733a91.0 for ; Mon, 20 Jan 2025 06:30:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737383445; x=1737988245; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=d1MOYg7Re16LFJPTRUR/eiA6HX+0HKWJWDyGBCRDREU=; b=jl1PXvpQ4GEa9NQyr6HU+4nuaHwl38VhkIuuBm5KaAZwy0ZWaijPCyqABOdk2XCUli 094gpQ4NgIxat3Cn/bReIOlMvBXjOdAadSVnPvqD7mFYohZgMFQYt+AScEKo/IPcftG6 m8INinDR8y0MY3EWJlutFN8MnH1Y5eR2jWq7yAC4I9UHfE2Cd03yrS2m+YQLoFZC8Nd7 SohUpo3s34ufK/ZBdg5M17hMJl4xx4Rz+TraxZIkjCR5FvvZvk8yfj2q8W+UAGFuB7w3 m1P3a2ws3Cxm4UmLUy6INudlfQ4ohew+nWPmOkUTmWE0eG5u/MYHPiB+1Uc2EoQQllzS Glig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737383445; x=1737988245; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d1MOYg7Re16LFJPTRUR/eiA6HX+0HKWJWDyGBCRDREU=; b=mKmm5+S4n6MagnmRb5dFaKRWiuUHv3qG2+uBG6g8qCyP+9mV5zXBvW1d41Tr6/3CC7 Wi3XKrUqMLQOuVAAL0cJZSeDbQy1LriTr1Ywst1Ei6S4z5UVLQYIzhDIoWzag9+ntBAl mJb4BqkZDqZXVQxbzpXNpQxrSGO7tCJLZb4QP2ZiGQ0WqtMT128lliy8IyujJSJE1XCG WHBbBQvnbvYkXGCqMwU5svFo5016VFUAgGzILg7v1F325GsYp7yQh6g72/C6VwGg9WIW bjgn89fl1ltNJJqJqHMaHzh+nGEPthOKWD9RdbXMRJz1RBl0hXLRb73MGM5WslxukUMV SDSw== X-Gm-Message-State: AOJu0YyXe68wRM86+lSybD0CSt2/2GA6A2QgVuAOw84lmZwbx095XRzm MJ7yfMJ2yv907wynAKK9Htt+TujwLawe7pbMGbXJ3uKe9jmtaBjAARxo5aHP X-Gm-Gg: ASbGnctXRwWXksm5f+CjaW0otejc+AYMNes0C5qwRxOrcef2DPW6oTcDXPiLOKSZ0EG 6b+HFxlxIRrCdumGfQ5zHku5PzoXOhKfwb5WyUIKw5eOBQO4Qt7GjRt4U56EAiW9U8cQLApRL+1 ZCiR1002NbfJ372bzyHimWXppIiQM/KoAJR0OjlFQFfJgq3f2fhnb2s3De6VyBJCXZqeIR0aUku s4N1OM92JXJ4vrUb5MfLA68+EvWPeBnLBWkpLTC5Eexg8b5cLIf8kpM5Pet9EdPUlbgV210PG56 ALiPbEosnmMz X-Google-Smtp-Source: AGHT+IFpSkMmQ5aeHBfQxDuu33oIOUwsNN2CO6W0vXgCceprEOyp/kA4k3GZLIDrqy4R8ZSbCm5b8A== X-Received: by 2002:a05:6a00:b96:b0:72a:bc6a:3a85 with SMTP id d2e1a72fcca58-72dafbb6205mr17714284b3a.22.1737383445405; Mon, 20 Jan 2025 06:30:45 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72dab9c8d2bsm7396313b3a.92.2025.01.20.06.30.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2025 06:30:44 -0800 (PST) From: Maxim Cournoyer Date: Mon, 20 Jan 2025 23:28:33 +0900 Message-ID: <58a47261265702f0fd8f19e1905954c559d1a224.1737383313.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <7a983f303aba15d35ec687bcba4de4fee572899b.1737383313.git.maxim.cournoyer@gmail.com> References: <7a983f303aba15d35ec687bcba4de4fee572899b.1737383313.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::102c; envelope-from=maxim.cournoyer@gmail.com; helo=mail-pj1-x102c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This resolves a hang in the menu of the WaveRace game. * gnu/packages/patches/dolphin-emu-data.patch: New file. * gnu/packages/patches/libretro-dolphin-emu-data.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/emulators.scm (dolphin-emu) [source]: Apply dolphin-emu patch. (libretro-dolphin-emu) [source]: Apply libretro-dolphin-emu patch. Change-Id: Ie22a7bba527724179f5296a44f1874d2efdbd94c --- New commit in v3. gnu/local.mk | 4 +++- gnu/packages/emulators.scm | 6 ++++-- gnu/packages/patches/dolphin-emu-data.patch | 16 ++++++++++++++++ .../patches/libretro-dolphin-emu-data.patch | 19 +++++++++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/dolphin-emu-data.patch create mode 100644 gnu/packages/patches/libretro-dolphin-emu-data.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8f5dcaf7fb..5e4dae4ffb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -19,7 +19,7 @@ # Copyright © 2018 Amirouche Boubekki # Copyright © 2018, 2019, 2020, 2021, 2022, 2024 Oleg Pykhalov # Copyright © 2018 Stefan Stefanović -# Copyright © 2018, 2020, 2021, 2022, 2023, 2024 Maxim Cournoyer +# Copyright © 2018, 2020-2025 Maxim Cournoyer # Copyright © 2019, 2020, 2021, 2022, 2024 Guillaume Le Vaillant # Copyright © 2019, 2020 John Soo # Copyright © 2019 Jonathan Brielmaier @@ -1182,6 +1182,7 @@ dist_patch_DATA = \ %D%/packages/patches/docbook2x-static-datadir-evaluation.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ + %D%/packages/patches/dolphin-emu-data.patch \ %D%/packages/patches/dovecot-opensslv3.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ @@ -1659,6 +1660,7 @@ dist_patch_DATA = \ %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ %D%/packages/patches/libguestfs-syms.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ + %D%/packages/patches/libretro-dolphin-emu-data.patch \ %D%/packages/patches/librewolf-use-system-wide-dir.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index ac838bdecc..3f2a31fdfe 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -336,7 +336,8 @@ (define-public dolphin-emu (substitute* "CMakeLists.txt" ((".*add_subdirectory.*Externals/enet.*") "") ((".*add_subdirectory.*Externals/soundtouch.*") "") - ((".*add_subdirectory.*Externals/xxhash.*") "")))))) + ((".*add_subdirectory.*Externals/xxhash.*") "")))) + (patches (search-patches "dolphin-emu-data.patch")))) (build-system cmake-build-system) (arguments (list @@ -498,7 +499,8 @@ (define-public libretro-dolphin-emu (file-name (git-file-name name version)) (sha256 (base32 - "1fvm6hy0ihc0j3sgv88a7ak08c0kyikmmiif827j981fy7zvglvz")))) + "1fvm6hy0ihc0j3sgv88a7ak08c0kyikmmiif827j981fy7zvglvz")) + (patches (search-patches "libretro-dolphin-emu-data.patch")))) (arguments (substitute-keyword-arguments (package-arguments dolphin-emu) ((#:configure-flags flags ''()) diff --git a/gnu/packages/patches/dolphin-emu-data.patch b/gnu/packages/patches/dolphin-emu-data.patch new file mode 100644 index 0000000000..5ff1bcfe98 --- /dev/null +++ b/gnu/packages/patches/dolphin-emu-data.patch @@ -0,0 +1,16 @@ +Resolve a hang in the menu of this game. + +Upstream-status: https://github.com/dolphin-emu/dolphin/pull/13285 + +diff --git a/Data/Sys/GameSettings/GWRE01.ini b/Data/Sys/GameSettings/GWRE01.ini +index ec292da619..1f9f445901 100644 +--- a/Data/Sys/GameSettings/GWRE01.ini ++++ b/Data/Sys/GameSettings/GWRE01.ini +@@ -2,6 +2,7 @@ + + [Core] + # Values set here will override the main Dolphin settings. ++CPUThread = False + + [OnFrame] + # Add memory patches to be applied every frame here. diff --git a/gnu/packages/patches/libretro-dolphin-emu-data.patch b/gnu/packages/patches/libretro-dolphin-emu-data.patch new file mode 100644 index 0000000000..a49feabbf8 --- /dev/null +++ b/gnu/packages/patches/libretro-dolphin-emu-data.patch @@ -0,0 +1,19 @@ +Resolve a hang in the menu of this game. + +Upstream-status: https://github.com/libretro/dolphin/pull/337 + +diff --git a/Data/Sys/GameSettings/GWRE01.ini b/Data/Sys/GameSettings/GWRE01.ini +index b789141fcf..4d19779c9c 100644 +--- a/Data/Sys/GameSettings/GWRE01.ini ++++ b/Data/Sys/GameSettings/GWRE01.ini +@@ -3,6 +3,10 @@ + [Core] + # Values set here will override the main Dolphin settings. + ++# TODO: Change to 'CPUThread = False' after rebasing to latest ++# upstream (see commit 869edd5a66). ++SyncGPU = True ++ + [OnLoad] + # Add memory patches to be loaded once on boot here. + -- 2.47.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 23 07:13:24 2025 Received: (at control) by debbugs.gnu.org; 23 Jan 2025 12:13:25 +0000 Received: from localhost ([127.0.0.1]:39643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taw5M-0002mz-MD for submit@debbugs.gnu.org; Thu, 23 Jan 2025 07:13:24 -0500 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:56441) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1taw5K-0002mY-PQ for control@debbugs.gnu.org; Thu, 23 Jan 2025 07:13:23 -0500 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2f78a4ca5deso1177737a91.0 for ; Thu, 23 Jan 2025 04:13:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737634396; x=1738239196; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=nr4AtfTtbfMIUb4tSzjECQCDAA55Fr4OjYgb+9rCZ7c=; b=ZDKJesT4XxC4F6jxpGbztYGB0los8AC/B45KVxa6hvWdRw7mxp2jPTQwzKMnQfjNQc bxbgJ+vzco3y8dT9TGtMGw50/LjWJAJ8Tk9Z/dJfZDIG03+8wzg4EM3Jju2Qd4H/54cr IO/QoPaEqJ0AHyIWAGYI7PjQgYWwDS0Wk1KwEoRUx2MfqTc6krr9b9vMzDX4p347ZKbq f3Uv1u6juwu4SZKWOywF2WnHfsmMvOVdoSOxtHslAsPTtppvQlMb40Sp2p+Wst4K9hQj ZoBxVdoaKaANneSvffh6/tz6Qyy2MLaLikfj/4PrTOZSvLIxVj6KMCoPAGonjb1a4tPK MTkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737634396; x=1738239196; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nr4AtfTtbfMIUb4tSzjECQCDAA55Fr4OjYgb+9rCZ7c=; b=Mpf6IA0ivacy/g3F5ZHsTyIKGghQcq6QyvIza4caK5zdYcRAIgwoCzQtUnSd1sNiEI LUel+cKhrvWYyyiziush60iHLMZ4+tVCOTO3K4LBwDY4nfk1KUCTQWV7pLEb6KkSljmT 5IjpUmjowPV8CnjqC/tXP1IAhRn1qKqW6/ybhDPcst7B7CJ0r3Tv1jAK6dq1o5Ad1GjS HsQ+LurM1pzayIl4Br00Yve0DrNKyOdILC4FpLOi4jaXr0v0zzSMHSVYKMEZajvsLdGs 2dcTcoJFOCm42DvI0ETfH+j4cnJi2Qin3JoROLnTyqXpZMFnmesiy19+BCwxiL/56Of5 uPyw== X-Gm-Message-State: AOJu0Yzc1gwYRdfzMpOT7lGIQCMiZiIA3sEshtNp0br/MEjKSA107KP7 fss4UAvVWeJyrET1DZhQpF6ojUBHjc91T6AUPffokhokBV3yqLhGZ5XWkg== X-Gm-Gg: ASbGncsgKL1G6ckjQBOQYFCl8mcGP4217HGK75jr3H6/pl0/yIuBINdDvWCJnNahrHO 9F8m7a6MkJc+ZIcTPjOkgOBCfMPdF8NgqxGSl02IAlH0MP2tw7W9Rw0TkstqT02scWIrjpxSHKU mhoxm//4WGndhhSXqJNnPDda/lQWPo7AV/ds2lVuGBmsSoeiL1TiDpZuRmQNpyxAs1wuBxEAMuY 3Ieu9/VmvCl1NxcYImnFPF4Xj0iqoL6gTlZ9tEc9NRFObizFEmuWQVqTXpSv7beGBtW1kgFOSa0 hw== X-Google-Smtp-Source: AGHT+IG2Q2YcOT/TcwuhBZIkUprFqmKHksGgZ+GR09WTsIJ3JOL3rjAmrREqUDYmoDhqbNGY05Snnw== X-Received: by 2002:a17:90b:2e4b:b0:2ee:5bc9:75b5 with SMTP id 98e67ed59e1d1-2f782c51387mr36411801a91.4.1737634396333; Thu, 23 Jan 2025 04:13:16 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2f7e6b71e75sm3743946a91.30.2025.01.23.04.13.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2025 04:13:15 -0800 (PST) Date: Thu, 23 Jan 2025 21:13:04 +0900 Message-Id: <87frl9iv8v.fsf@gmail.com> To: control@debbugs.gnu.org From: Maxim Cournoyer Subject: control message for bug #75702 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 75702 notabug close 75702 quit