From patchwork Wed Mar 26 08:03:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: msglm X-Patchwork-Id: 40837 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2315227BBEC; Wed, 26 Mar 2025 08:05:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4F54527BBE2 for ; Wed, 26 Mar 2025 08:05:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txLl3-0007VV-2B; Wed, 26 Mar 2025 04:05:05 -0400 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 1txLl0-0007V7-UC for guix-patches@gnu.org; Wed, 26 Mar 2025 04:05:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1txLl0-0007Xc-Je for guix-patches@gnu.org; Wed, 26 Mar 2025 04:05:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=wQoqHNhji8QiOjBCAwalfT8anA27+6agWP9lsn+Enng=; b=YNg9WlRBs2l6sH+dL7A/9IhGRkI8RyH4YJ1LIFsEwPGNB5HMOmaCFMFPf0uZuXmdnB7CxHKF3cD+/WtcC61X65TywElKg3SBMoxekY+BpqTuOpnwbg53Om4TaZPSyOSJH9perMaVZIgQqkXPlkDlM3H5YCVgeyB0MTOpdNtP+GBLsFo9TYYCtMNmfVTrBVbsqQgRsT7Gy0xHADqV7XlO8ULDbMnBxWL++8S5jX4Dzh8CSQCz91TtZhdLQohxI510qLL+mX50+K6XK/pbFaxPSD9S2CJW0+wQv+iaKfh77heFI/5M9EJR4BVw0p8LGOQ+qjGCixW0zQU9/82Zuufu2g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txLl0-0003gf-Bg for guix-patches@gnu.org; Wed, 26 Mar 2025 04:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77271] [PATCH 1/2] gnu: openbox: Fix alt-tabbing crash Resent-From: msglm Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Mar 2025 08:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77271 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77271@debbugs.gnu.org Cc: msglm X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174297629114136 (code B ref -1); Wed, 26 Mar 2025 08:05:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Mar 2025 08:04:51 +0000 Received: from localhost ([127.0.0.1]:41161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txLko-0003fv-NN for submit@debbugs.gnu.org; Wed, 26 Mar 2025 04:04:51 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58760) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1txLkm-0003fa-9q for submit@debbugs.gnu.org; Wed, 26 Mar 2025 04:04:49 -0400 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 1txLkg-0007Rj-TI for guix-patches@gnu.org; Wed, 26 Mar 2025 04:04:42 -0400 Received: from techchud.xyz ([2001:19f0:6401:770:5400:3ff:feee:3207] helo=mail.techchud.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txLke-0007Ua-T4 for guix-patches@gnu.org; Wed, 26 Mar 2025 04:04:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=techchud.xyz; s=mail; t=1742976275; bh=8vjJiK3YkX2Uw5Tc5d8fiskLfnf6BaU8tr2OIbcdw8w=; h=From:To:Cc:Subject:Date:From; b=d/+CbpFbunjL47LulIF1oH2L5ii1xNa0wwPg4CrEoKe4oS8rZ6QaOftEhE23LavxN XOJv5Zouox3J+hOGLvcEyhkgeIbEbDRbp/3Bkoir6JCNYFPMid8w1xVwbkM/knP8n0 UQxuN1wrRhJk/pfX3bqU4UB9gt45xqOeFaFsrglB3ngGboA57KLgvSgJOX1rw3d740 OT3v8PD3TvE0y+Xg5tQRvDwLv9xcMCBKZnfFoyS+Vh079Gt3bLF6pCSWaXyZab770b Hs0FxtY4mgqILYfi9UeMwVtG7UkTU/pzNUgRnypb3B1ao5a41p9bA9cNciUuouxJ3F OZVIaquce7e5Q== Date: Wed, 26 Mar 2025 03:03:27 -0500 Message-ID: <9d96f0a2d095e74f1a4bf0ef1d8f60138810321d.1742976208.git.msglm@techchud.xyz> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2001:19f0:6401:770:5400:3ff:feee:3207; envelope-from=msglm@techchud.xyz; helo=mail.techchud.xyz X-Spam_score_int: 16 X-Spam_score: 1.6 X-Spam_bar: + X-Spam_report: (1.6 / 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, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=1.179, PDS_OTHER_BAD_TLD=1.999, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: msglm X-ACL-Warn: , msglm via Guix-patches X-Patchwork-Original-From: msglm via Guix-patches via From: msglm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Add patch to fix crashing when full screening and alt-tabbing. Patch harvested from: https://bugs.archlinux.org/attachments/77853/22501/0001-add-fix-for-glib2-exposed-segfault.patch * gnu/packages/openbox.scm (openbox): New patch * gnu/packages/patches/openbox-add-fix-for-glib2-exposed-segfault.patch: New File Change-Id: I593b50bf14bdbeb300ea545ab9efe184651112fb --- gnu/packages/openbox.scm | 2 +- ...x-add-fix-for-glib2-exposed-segfault.patch | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openbox-add-fix-for-glib2-exposed-segfault.patch base-commit: 4d655e48836d5be89942a38da532431316f6887b diff --git a/gnu/packages/openbox.scm b/gnu/packages/openbox.scm index 38afb9d9a0..85c3bda958 100644 --- a/gnu/packages/openbox.scm +++ b/gnu/packages/openbox.scm @@ -51,7 +51,7 @@ (define-public openbox (sha256 (base32 "0vg2y1qddsdxkjv806mzpvmkgzliab8ll4s7zm7ma5jnriamirxb")) - (patches (search-patches "openbox-python3.patch")))) + (patches (search-patches "openbox-add-fix-for-glib2-exposed-segfault.patch" "openbox-python3.patch")))) (build-system gnu-build-system) (arguments (list #:phases diff --git a/gnu/packages/patches/openbox-add-fix-for-glib2-exposed-segfault.patch b/gnu/packages/patches/openbox-add-fix-for-glib2-exposed-segfault.patch new file mode 100644 index 0000000000..ef68d31213 --- /dev/null +++ b/gnu/packages/patches/openbox-add-fix-for-glib2-exposed-segfault.patch @@ -0,0 +1,50 @@ +From 9ed6fdd71890c5cc43747f105382d5677e5d37e7 Mon Sep 17 00:00:00 2001 +From: pldubouilh +Date: Fri, 17 Mar 2023 18:23:47 +0100 +Subject: [PATCH] Fix list traversal issue in client_calc_layer + +The calls to client_calc_layer_internal can modify stacking_list, which +can cause us to follow dangling ->next pointers (either by the pointer +itself already being freed, or it pointing to a freed area). Avoid this +by copying the list first, the goal is to visit every client in the list +once so this should be fine. +--- + openbox/client.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/openbox/client.c b/openbox/client.c +index 7168b2407..b8264587c 100644 +--- a/openbox/client.c ++++ b/openbox/client.c +@@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self) + void client_calc_layer(ObClient *self) + { + GList *it; ++ /* the client_calc_layer_internal calls below modify stacking_list, ++ so we have to make a copy to iterate over */ ++ GList *list = g_list_copy(stacking_list); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* find the windows in the fullscreen layer, and mark them not-visited */ +@@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self) + client_calc_layer_internal(self); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* now recalc any windows in the fullscreen layer which have not +@@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self) + !WINDOW_AS_CLIENT(it->data)->visited) + client_calc_layer_internal(it->data); + } ++ ++ g_list_free(it); + } + + gboolean client_should_show(ObClient *self) From patchwork Wed Mar 26 08:03:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: msglm X-Patchwork-Id: 40838 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CE38827BBE2; Wed, 26 Mar 2025 08:05:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5062F27BBE9 for ; Wed, 26 Mar 2025 08:05:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1txLl5-0007WD-G5; Wed, 26 Mar 2025 04:05:07 -0400 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 1txLl3-0007VZ-5w for guix-patches@gnu.org; Wed, 26 Mar 2025 04:05:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1txLl2-0007in-Qh for guix-patches@gnu.org; Wed, 26 Mar 2025 04:05:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=OWp09d5pBerXiCz9yhpRbaFqkO+OjKa/Ske76JbSTuo=; b=VMexQIk/c/+QBnXQkqmGwHQlMSfCXEs6D6GR7ZtGGpdyt+VLL95IXpg+mm+p6IF1CTKV+UwobRewX7uZqP9r5AfLoabQfSzaiqQMKahzOImK0dESsJhnpi3lPqpqSd4FCLrXDn69vjfwsDLLFHNah9cKHYcV9g4dtVk1wFn3Iv9Gu/++uC0ZuEcZLxtpuC5StrASZ4+5Kr2K9juMx4Tx/9Ju9tX15X2dqVHdCcTpFvk4dkiH07MuWxjekHxBLyd0IdbBm0eKjhxlcxyTuf+7y1zmG1p48vdFYNs8v7xkm8TeSflRKtFHleu5AdygiHZUeqk+vv/qxpW3HycFNfAfWA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1txLl1-0003gu-8M; Wed, 26 Mar 2025 04:05:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77272] [PATCH 2/2] gnu: dolphin-emu: Update to 2503. Resent-From: msglm Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 26 Mar 2025 08:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77272 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77272@debbugs.gnu.org Cc: msglm , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by submit@debbugs.gnu.org id=B.174297629914157 (code B ref -1); Wed, 26 Mar 2025 08:05:03 +0000 Received: (at submit) by debbugs.gnu.org; 26 Mar 2025 08:04:59 +0000 Received: from localhost ([127.0.0.1]:41163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1txLkw-0003gG-8l for submit@debbugs.gnu.org; Wed, 26 Mar 2025 04:04:58 -0400 Received: from lists.gnu.org ([2001:470:142::17]:45144) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1txLko-0003fe-Kn for submit@debbugs.gnu.org; Wed, 26 Mar 2025 04:04:52 -0400 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 1txLki-0007SE-Ne for guix-patches@gnu.org; Wed, 26 Mar 2025 04:04:44 -0400 Received: from techchud.xyz ([2001:19f0:6401:770:5400:3ff:feee:3207] helo=mail.techchud.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1txLkg-0007VQ-LK for guix-patches@gnu.org; Wed, 26 Mar 2025 04:04:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=techchud.xyz; s=mail; t=1742976279; bh=LgVu/BPHqeUt9Alvi4qg+DJrpZGQCwUiG0HJ8TNufKk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GKoizkwzKi4COM+zAjc4LmgKEy4i8NvF5ohw+70k4D3vEzAJluN6T+84fV+ADoN1F nRVPAYW4eSKHkGY0Eipxn0xzcHK2h47YvFAGoaRAAo2LL2F3lEOB+0pU9ssrpzYdNj hP8LB4jzTo6g++9sDFm0AB7XN8r0Ln8vOqYV+QigDQKSybsQHjqJ32T5XJCI0JL56u R48S+0nYob1hP8afD0lMNYF1QchMV42BGr5S6fkJ4/HPrXFI646No5vx2M6HEC673b O9fjoA9rm4HFYoKTqqdhcfb0FJaveLA5L0IeqFi2FC71eEqG1ILilhQL8olhSDZzxS rx8+46OslvIQQ== Date: Wed, 26 Mar 2025 03:03:28 -0500 Message-ID: <5a3b9b27f3438825fb9056246acaf56ef8a3bd7c.1742976208.git.msglm@techchud.xyz> X-Mailer: git-send-email 2.48.1 In-Reply-To: <9d96f0a2d095e74f1a4bf0ef1d8f60138810321d.1742976208.git.msglm@techchud.xyz> References: <9d96f0a2d095e74f1a4bf0ef1d8f60138810321d.1742976208.git.msglm@techchud.xyz> MIME-Version: 1.0 Received-SPF: pass client-ip=2001:19f0:6401:770:5400:3ff:feee:3207; envelope-from=msglm@techchud.xyz; helo=mail.techchud.xyz X-Spam_score_int: 4 X-Spam_score: 0.4 X-Spam_bar: / X-Spam_report: (0.4 / 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, FROM_SUSPICIOUS_NTLD=0.499, PDS_OTHER_BAD_TLD=1.999, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: msglm X-ACL-Warn: , msglm via Guix-patches X-Patchwork-Original-From: msglm via Guix-patches via From: msglm Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emulators.scm (dolphin-emu): Update to 2503, Fix netplay * gnu/packages/game-development.scm (sfml-3): New Package * gnu/packages/game-development.scm (miniaudio): New Package * gnu/packages/networking.scm (enet): Update to 2.30.9 Change-Id: I5242f46e457db6552663c03c19dc0f227efb80cc --- gnu/packages/emulators.scm | 50 ++++++++++++++++-------- gnu/packages/game-development.scm | 65 +++++++++++++++++++++++++++++++ gnu/packages/networking.scm | 4 +- gnu/packages/sdl.scm | 4 +- 4 files changed, 103 insertions(+), 20 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index e71c2803a3..83ae89c172 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -278,20 +278,19 @@ (define-public desmume ;; Following commits and revision numbers of beta versions listed at ;; https://dolphin-emu.org/download/. (define-public dolphin-emu - (let ((commit "f9deb68aee962564b1495ff04c54c015e58d086f") - (revision "13669")) (package (name "dolphin-emu") - (version (git-version "5.0" revision commit)) + (version "2503") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/dolphin-emu/dolphin") - (commit commit))) + (recursive? #t) + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1p8qsxlabgmz3nic0a9ghh9d3lzl5f8i3kmdrrvx6w8kdlp33018")) + (base32 "0yyl91sb8w422zfdml9hmwwn3088gxv977aailc0l5icaxf4m8m2")) (modules '((guix build utils) (ice-9 regex))) (snippet @@ -300,14 +299,19 @@ (define-public dolphin-emu (for-each (lambda (dir) (delete-file-recursively (string-append "Externals/" dir))) - '("LZO" "OpenAL" "Qt" "SFML" "bzip2" + '( + ;"LZO" "OpenAL" "Qt" "SFML" "bzip2" + + "LZO" "OpenAL" "Qt" "bzip2" ;;TODO: Ensure SFML is removed and update the package to make it happen + ;; XXX: Attempting to use the vulkan-headers package ;; results in "error: ;; ‘VK_PRESENT_MODE_RANGE_SIZE_KHR’ was not declared ;; in this scope". ;;"Vulkan" "cubeb" "curl" "enet" - "ffmpeg" "fmt" "gettext" + ;"ffmpeg" "fmt" "gettext" + "fmt" "gettext" ;; XXX: Attempting to use an unbundled glslang at the ;; exact commit used by Dolphin still results in ;; "error: ‘DefaultTBuiltInResource’ is not a member @@ -317,10 +321,14 @@ (define-public dolphin-emu ;; unbundled, as there are missing linking ;; directives. ;;"gtest" - "hidapi" "libpng" "libusb" "mbedtls" - "miniupnpc" "minizip" "MoltenVK" "pugixml" + ;"hidapi" "libpng" "libusb" "mbedtls" + "hidapi" "libusb" "mbedtls" + ;"miniupnpc" "minizip" "MoltenVK" "pugixml" + "miniupnpc" "MoltenVK" "pugixml" "soundtouch" - "xxhash" "zlib" "zstd")) + ;"xxhash" "zlib" "zstd" + "xxhash" "zstd" + )) ;; Clean up the source. (for-each delete-file (find-files @@ -339,12 +347,21 @@ (define-public dolphin-emu ((".*add_subdirectory.*Externals/enet.*") "") ((".*add_subdirectory.*Externals/soundtouch.*") "") ((".*add_subdirectory.*Externals/xxhash.*") "")))) - (patches (search-patches "dolphin-emu-data.patch")))) + )) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases + (add-before 'configure 'set-scm-desc-str + (lambda _ + ;;For netplay to work, the SCM_REV_STR must match the + ;;commit hash of whatever version we're on. + ;;THIS MUST BE UPDATED EVERY UPDATE SO THAT NETPLAY + ;;CONTINUES TO FUNCTION! + (substitute* "Source/Core/Common/scmrev.h.in" (("#define SCM_REV_STR \"\\$\\{DOLPHIN_WC_REVISION\\}\"") "#define SCM_REV_STR \"9763c0a1e2b9db0c3861d25bc2f5a0ace6a15ee3\"")) + )) + (add-before 'configure 'remove-unittests-target-post-build-command (lambda _ ;; To skip a few problematic tests, CTest will be manually @@ -442,8 +459,8 @@ (define-public dolphin-emu curl enet eudev - ffmpeg-4 - fmt-7 + ffmpeg + fmt-10 font-wqy-microhei freetype glew @@ -465,9 +482,10 @@ (define-public dolphin-emu openal pugixml pulseaudio - qtbase-5 + qtbase + qtsvg sdl2 - sfml + sfml-3 soil soundtouch-1/integer-samples vulkan-loader @@ -482,7 +500,7 @@ (define-public dolphin-emu turbo speed, networked multiplayer, and graphical enhancements.") (supported-systems '("x86_64-linux" "aarch64-linux")) ;; dolphin/Data/Sys/GC/font_*.bin: Licensed under ASL2.0. - (license (list license:gpl2+ license:asl2.0 license:fdl1.2+))))) + (license (list license:gpl2+ license:asl2.0 license:fdl1.2+)))) (define-public libretro-dolphin-emu ;; There are no tag or release; use the latest commit. diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 91369089b9..bb1ae5bc2f 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1115,6 +1115,71 @@ (define-public sfml of five modules: system, window, graphics, audio and network.") (license license:zlib))) +(define-public sfml-3 ;;For dolphin-emu + (package + (inherit sfml) + (name "sfml-3") + (version "3.0.0") + (inputs (modify-inputs (package-inputs sfml) + (prepend libxcursor libxi miniaudio))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SFML/SFML") + (recursive? #t) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y37cmpp490gcibajigxsbjc6icggqv40jrhzj2kwygpc0ppzb3v")) + (modules '((guix build utils))) + ;(snippet + ; '(begin + ; ;; Ensure system libraries are used. + ; (delete-file-recursively "extlibs") + ; #t)) + )) + )) + +;; For sfml-3 +(define-public miniaudio + (package + (name "miniaudio") + (version "0.11.22") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mackron/miniaudio") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pjaiq71x24n9983vkhjxrsbraa24053h727db22b1rb2xyfrzm3")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + (let ((out #$output)) + ;; Ensure the output directory exists + (mkdir-p (string-append out "/lib")) + ;; Copy the static libraries to the output directory + (for-each (lambda (file) + (copy-file file (string-append out "/lib/" file))) ; Ensure the destination is a file + '("libminiaudio.a" + "libminiaudio_channel_combiner_node.a" + "libminiaudio_channel_separator_node.a" + "libminiaudio_ltrim_node.a" + "libminiaudio_reverb_node.a" + "libminiaudio_vocoder_node.a")))))))) + (synopsis "Audio playback and capture library written in C, in a single source file.") + (description "miniaudio is written in C with no dependencies except the standard library and should compile clean on all major compilers without the need to install any additional development packages. All major desktop and mobile platforms are supported.") + (home-page "https://miniaud.io/") + (license license:expat))) + (define-public csfml (package (name "csfml") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 65d44e975a..ff3e032a2b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2627,14 +2627,14 @@ (define-public proxychains-ng (define-public enet (package (name "enet") - (version "1.3.17") + (version "1.3.18") (source (origin (method url-fetch) (uri (string-append "http://enet.bespin.org/download/" "enet-" version ".tar.gz")) (sha256 - (base32 "1p6f9mby86af6cs7pv6h48032ip9g32c05cb7d9mimam8lchz3x3")))) + (base32 "0djxz2j8248bsvbrs42vr39fhxlrqr3lqbhzs7yb92ync19hr2ia")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 80de707819..3a736107c8 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -72,7 +72,7 @@ (define-module (gnu packages sdl) (define-public sdl2 (package (name "sdl2") - (version "2.30.8") + (version "2.30.9") (source (origin (method url-fetch) (uri @@ -80,7 +80,7 @@ (define-public sdl2 version ".tar.gz")) (sha256 (base32 - "0n006l1zds2av8a9p6m6l0mj7jwb3jbr6mq7j0nxg6vblxg2j31q")))) + "197bdcfnnsd4k7q91y518kari0p3rcqbdfq40zsn79w73kvp9d94")))) (build-system gnu-build-system) (arguments (list