From patchwork Sat Jan 18 08:50:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37141 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 0595227BBEA; Sat, 18 Jan 2025 08:53:05 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 800AD27BBE2 for ; Sat, 18 Jan 2025 08:53:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Z7-0003Sd-D9; Sat, 18 Jan 2025 03:52:25 -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 1tZ4Ym-0003NL-Jl for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:04 -0500 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 1tZ4Yl-0007cd-EK for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:03 -0500 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:In-Reply-To:References:Subject; bh=/GjdLMsRuyPizSyP3TcUcTNlvvKiMaF3PKnN2Uwi+Mk=; b=MoQf7jKExZ4GdGoLHqsr1XbPxcTe8RJLARjXtHh2qeSl0fSu+91V8JhIeSLL9mBdrKVQu+i+wCwEJOHTFoliSGURMDRYbtor4K/drVOQaZ41ccp8ks0DpSz+jyfz2hPpXga88OCjj8ob9YBJojhj6Lm+zlWXN9DvUFnsSR6khiuTpKPug9iy8Yul/sPotbTnqbd7KbVJBZwkar41ogp+zuFfMxbMkNxi6zIszVGx0m1JoyW5FhrllBDJPAIjJRoVNu1s3sv7xKUvSb7885tnJ44Mir34+857uhq0TjF4w9numHqbYnFps036386KqFDTilmmFaFd/llaUslmGXwyGA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Yj-000889-Up; Sat, 18 Jan 2025 03:52:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 01/10] gnu: Add soundtouch-1/integer-samples. References: In-Reply-To: Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Sat, 18 Jan 2025 08:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Gabriel Wicki X-Debbugs-Original-Xcc: Gabriel Wicki Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719028631102 (code B ref 75619); Sat, 18 Jan 2025 08:52:01 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:51:26 +0000 Received: from localhost ([127.0.0.1]:40035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4Y9-00085Z-AG for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:25 -0500 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:58574) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4Y5-00085B-EZ for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:23 -0500 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-218c8aca5f1so70937565ad.0 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190275; x=1737795075; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=/GjdLMsRuyPizSyP3TcUcTNlvvKiMaF3PKnN2Uwi+Mk=; b=i3I5GAAGOmYdbSI4OU8DyE73tt0wy58RpfW+XdnWN5MAnvsGeK7m46U0wyfNdSGTDJ DgjEEHzfe2RVAHSDCGIK2AAVurn0fJXgYtVwfjF449hm3kv1qU8AxUlo39J5CjCdpc3x ZN09I8P1u4BE1W6h7G28kGSUxY9TGN+0oNTKbJBwfqiooA90RuBt3Eg4lLNRAshnOnDB RGDNE7paKL8CZfj0tudkJUF2oQTnJ0Vxr8OORuWv2D8PrYfZq/y00kuj+qypU1ptT1ip Dkrn11WrDDfaq4bx/VYSz4zTlyoYuO4Uq9tsWvvMrQJGk3sVrtEDHVdTBYstS4MOfimi ROrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190275; x=1737795075; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/GjdLMsRuyPizSyP3TcUcTNlvvKiMaF3PKnN2Uwi+Mk=; b=mQMGlNK3ON8EXPyJQF7pHuJ0W3//g6fc5xMGJYIj5O3HGh8MCsNnxTG65e9UoVLfnW WALI0ajWorbmlyJwJPDG1eH95x18jwCMSkPCQeI0yPtpbJ7IxBkukF/wHUvB9igIFmIc wula2sFSHGCiBZ8/6/mU6pw/1WQhdWxkNtd5UP+cdLKO5+AnUDhrodts85N8M1dRZN19 dP4BHb/I3J3gfiInLYcRNaxPIOMHivePQ3fehL6bgmSc0VSVluiIB+Sk/Z9e53kaeK2f /9c4jA2tB2/EjxXHGpO46WozWd91ur4vIF0l4WB94OtFZDIp82WckTA3bNVCbYfOUAwo i5Og== X-Gm-Message-State: AOJu0Yz99J2e+391enp40+hyMavAqIkUKNhxxzARqdrtYEv1g0z7fkII n9muXCcZoRMWemLy3pYeeVz+TfgnoqfRxfWPiF5FbwcVb5wpJ3jlqlxMFNLcsj8= X-Gm-Gg: ASbGncuaNKABLp3aKORlH60kkMrY5x3ialAmyG1x/XPnKIJ9Zu1DB1tHSdWl0lmN+Hf HvuBvvooTvi9DNVD5ZSZC7fziFlM8nL6toA5jGIeklD4933UUVUstNFfuhpXNLLPoCeIVwFS0ef oyAxjN+t4lN+cuzc38nN/vkxpPAAStSF04P8rBG/2lT3NNVNScgpC8slZaatiBVn4/otbG0P9hb /wsfpON0S8/d939kYkpmWIGjB9pIiJvv2bS+7xWDvI2feGsipL5fZgb43oFD/KwSeC69vFRihPe Syqdiot0jzkL X-Google-Smtp-Source: AGHT+IFNSIAfxTkXv6sPXjgEhxu3SOUgLXoZqAsaKaVFIzV8tJkOsvKqgZuje38qSLVhOV+4Jp5rNw== X-Received: by 2002:a17:902:c408:b0:216:7761:cc36 with SMTP id d9443c01a7336-21c356209demr80807125ad.43.1737190274582; Sat, 18 Jan 2025 00:51:14 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:13 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:45 +0900 Message-ID: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 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: , 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/audio.scm (soundtouch-1/integer-samples): New variable. Change-Id: Iea6e1313f2c7189ded9abf100f07ed530793f9f0 --- gnu/packages/audio.scm | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) base-commit: 0b06a5bc97938cae3da19e566c2f6f71cc299d78 diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 712337dda8..1c4f3176ee 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016–2023 Tobias Geerinckx-Rice ;;; Copyright © 2018, 2020, 2024 Oleg Pykhalov ;;; Copyright © 2018 okapi -;;; Copyright © 2018, 2020, 2022, 2023, 2024 Maxim Cournoyer +;;; Copyright © 2018, 2020, 2022-2025 Maxim Cournoyer ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018 Brett Gilio ;;; Copyright © 2018, 2019, 2022 Marius Bakke @@ -4355,6 +4355,30 @@ (define-public soundtouch control functionality, or just for playing around with the sound effects.") (license license:lgpl2.1+))) +(define-public soundtouch-1/integer-samples + (package + (inherit soundtouch) + (name "soundtouch") + (version "1.9.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/soundtouch/soundtouch.git") + (commit (string-append name "-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ir961w5gz86cm6yivr1ypi6n2y52vn319gy2gvdkkbbz5wyjkrq")))) + (arguments + ;; Dolphin expects the samples to be of the integer type. + (list #:configure-flags #~(list "--enable-integer-samples") + #:phases #~(modify-phases %standard-phases + (replace 'bootstrap + (lambda _ + ;; Avoid the bootstrap script, which has a broken + ;; shebang. + (invoke "autoreconf" "-vif")))))))) + (define-public stargate-soundtouch ;; Stargate's fork of soundtouch. (let ((commit "464f474c0be5d7e0970909dd30593012e4621468") From patchwork Sat Jan 18 08:50:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37137 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 2C8D327BBEA; Sat, 18 Jan 2025 08:52:48 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 5DE6327BBE2 for ; Sat, 18 Jan 2025 08:52:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Yt-0003On-4Q; Sat, 18 Jan 2025 03:52:11 -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 1tZ4Ym-0003NJ-Jh for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:04 -0500 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 1tZ4Ym-0007cr-Ao for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:04 -0500 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=TU0K7RMdntPDF45tCth/xpeHqW9nJog/J1/Rljq2UVE=; b=MGoABYhAgcamy9MIecAsN4/PHXwdckObC1FWPbpNu/2L+bWZyb4J9iBQPnxSr2VEX+/YNO+C+nHyDlepWC5z8f5dtx/n+sW8uho4drRJL/nSbNIGyhKhIerqmtzuXDZcRs+hRcrug7A0q5rWxDUqCR8I2/36qZdRM3CdXvt5ObBTAj+NFRO0S3noSbjgQbmvV7xvjdbBWfMBGIsNk500jPVpe4fM56lwlo/01/9A97g2gZAwpohjeWuDswis8uct4k2Dc0GoMFrrBZemgy9z3aQVXHLGYEz2upQbAadrnwMqhMDWI4Eqi4rEVHRNrX47LVoFTB4b3ksgqqydzy+XCA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Yk-00088F-EE; Sat, 18 Jan 2025 03:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 02/10] gnu: dolphin-emu: Unbundle more libraries and enable tests. 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: Sat, 18 Jan 2025 08:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719029231133 (code B ref 75619); Sat, 18 Jan 2025 08:52:02 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:51:32 +0000 Received: from localhost ([127.0.0.1]:40040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4YF-00085y-2B for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:31 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:56829) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4Y7-00085E-RK for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:25 -0500 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-2166360285dso57902075ad.1 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190277; x=1737795077; darn=debbugs.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=TU0K7RMdntPDF45tCth/xpeHqW9nJog/J1/Rljq2UVE=; b=cZjVrRyaMdleKa7Ekuce9F6HhpO9cHdiIeInVbwkC9A1LvtLdFOnb+s+zFWtLchy7/ PA0p1VYuIfUaPtV7l0CEEPGvIK6GX26Z0olH6JUTJvTyrLHR90QaV+CzQYXQgpJN7ApU v2RaIxH3H1OywTUNtQa7uFFjopjF6oyvitYCPysuEBjg8KO0Nflx7fqgpZsd9w9GUYr/ 8HKL97Jh1P1/L7Enzjyzp0WVnwSWA1xGOT6vLR6IqXrys2M3R8WlhLrjG0TTPwx4xjrK CKGCS7IcFWRIZDQSOm5i1TQc4L2D02J2OGvMcyMN0f7yBjmOsQ2AT7B5WVh3vuXLSJOS 9SSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190277; x=1737795077; 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=TU0K7RMdntPDF45tCth/xpeHqW9nJog/J1/Rljq2UVE=; b=lU7PltHv8B6KKMp1HPb3H+nEloyZexFPUUkmAWc0GZmC2YVvbGobLKEzfLQid/1cqN aY46xhTsAONY0i2W6Fn1q2KChGl4iv26KsLU7tU/p6kZxMeJ0CpEOLC/09nzVnYtJxLm qzU8o3eZMdvF5U1xhOr3xCExdVQQtM4aOLkUvRDk6Oxq+DgkcYc84aoKYopb0KDJX9ts DkBzjLPc80dwhtOVoeBQb0rqOm/NbBjE4qzJ0xTOLL7/ym7HgyavyntEoP3eg/4Af4rX ZzNU4xmHa//T9UgqXp06BFfB9c+zrAJv+RHvbefycNYFeIT3JgQy9VosVaS9GJW8V7a4 e49Q== X-Gm-Message-State: AOJu0YyWFnutrked4ZXQb2HKQyUc1gHSwutlcUTHh19IasvWJ+1BnvTI 1LiUd20IgSz9i6o2KpqAqYVGmyHeaKTIWg0XbyOkLK+xaUMVeLCo1QOdA2JX2bQ= X-Gm-Gg: ASbGncuuob8VzvkUbZT52bpS2gqgBRXBwDSm3A7E5RT/ROE8BJytuYieiW7PzzUrZSy yb8x94zJKqMB7t046oOYfTaBWTqTEBjApPBbxRk3NSf/heIyfUllO23F3LkN/5332oiGnb4fzkN SEWNnN8BrmBvFQOr/40gX1QVVM3GfKFZb0GfrYrNXoY6RoLGgilOTM7/p13HIhhA9d+AvfkD2Fz K66zxjYrSp9Sl6yxazezLGb9FuMKhNbooQpCnTQ7fmss5IOm6jz7IS7D2ZwBMQFMBgwHojpLhZM IhB5UAcU27mk X-Google-Smtp-Source: AGHT+IHw/sacXXsArbH3tR3bdUdiokb5Znc7n+G3T6G1DCYNBDbVGjU7i+QGdJZFPUzWpepLhoHoEg== X-Received: by 2002:a17:903:32cb:b0:215:54a1:8584 with SMTP id d9443c01a7336-21c35503ae9mr87236905ad.17.1737190276572; Sat, 18 Jan 2025 00:51:16 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:16 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:46 +0900 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> References: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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) [source] : Delete bzip2, cubeb, enet, fmt, pugixml, soundtouch, xxhash and zstd sources and de-register enet, soundtouch and xxhash from the build system. [arguments] <#:tests?>: Delete argument. <#:phases>: Add remove-unittests-target-post-build-command and post-check phases. <#:configure-flags>: Specify CMAKE_CXX_FLAGS to locate soundtouch headers. <#:test-target>: New argument. [inputs]: Add bzip2, cubeb, enet, fmt-7, minizip-ng, xxhash and zstd:lib. Replace soundtouch with soundtouch-1/integer-samples. Change-Id: Id996d992674f9efbbb2eb562286447a388716a82 --- gnu/packages/emulators.scm | 142 ++++++++++++++++++++++++++----------- 1 file changed, 100 insertions(+), 42 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 9e2d6485dd..6f77329f27 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2020 Christopher Howard ;;; Copyright © 2021 Felipe Balbi ;;; Copyright © 2021, 2024 Felix Gruber -;;; Copyright © 2021, 2024 Maxim Cournoyer +;;; Copyright © 2021, 2024, 2025 Maxim Cournoyer ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2023 c4droid ;;; Copyright © 2023 Yovan Naumovski @@ -94,6 +94,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-build) @@ -294,58 +295,112 @@ (define-public dolphin-emu ;; Remove external stuff we don't need. (for-each (lambda (dir) (delete-file-recursively - (string-append "Externals/" dir))) - '("LZO" "OpenAL" "Qt" "SFML" "curl" "ffmpeg" - "gettext" "hidapi" "libpng" "libusb" "mbedtls" - "miniupnpc" "MoltenVK" "zlib")) + (string-append "Externals/" dir))) + '("LZO" "OpenAL" "Qt" "SFML" "bzip2" + ;; 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" + ;; XXX: Attempting to use an unbundled glslang at the + ;; exact commit used by Dolphin still results in + ;; "error: ‘DefaultTBuiltInResource’ is not a member + ;; of ‘glslang’". + ;;"glslang" + ;; XXX: Googletest cannot currently easily be + ;; unbundled, as there are missing linking + ;; directives. + ;;"gtest" + "hidapi" "libpng" "libusb" "mbedtls" + "miniupnpc" "minizip" "MoltenVK" "pugixml" + "soundtouch" + "xxhash" "zlib" "zstd")) ;; Clean up source. (for-each delete-file - (find-files "." ".*\\.(bin|dsy|exe|jar|rar)$")))))) + (find-files "." ".*\\.(bin|dsy|exe|jar|rar)$")) + ;; Do not attempt to include now-missing directories. + (substitute* "CMakeLists.txt" + ((".*add_subdirectory.*Externals/enet.*") "") + ((".*add_subdirectory.*Externals/soundtouch.*") "") + ((".*add_subdirectory.*Externals/xxhash.*") "")))))) (build-system cmake-build-system) (arguments - '(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'generate-fonts&hardcore-libvulkan-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((fontfile - (search-input-file inputs - "/share/fonts/truetype/wqy-microhei.ttc")) - (libvulkan - (search-input-file inputs "/lib/libvulkan.so"))) - (chdir "docs") - (invoke "bash" "-c" "g++ -O2 $(freetype-config \ + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'remove-unittests-target-post-build-command + (lambda _ + ;; To skip a few problematic tests, CTest will be manually + ;; invoked in the post-check phase. + (with-directory-excursion "Source/UnitTests" + (substitute* "CMakeLists.txt" + (("add_custom_command\\(TARGET unittests POST_BUILD.*") + ""))))) + (add-before 'configure 'generate-fonts&hardcore-libvulkan-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((fontfile + (search-input-file inputs + "/share/fonts/truetype/wqy-microhei.ttc")) + (libvulkan + (search-input-file inputs "/lib/libvulkan.so"))) + (chdir "docs") + (invoke "bash" "-c" "g++ -O2 $(freetype-config \ --cflags --libs) gc-font-tool.cpp -o gc-font-tool") - (invoke "./gc-font-tool" "a" fontfile "font_western.bin") - (invoke "./gc-font-tool" "s" fontfile "font_japanese.bin") - (copy-file "font_japanese.bin" "../Data/Sys/GC/font_japanese.bin") - (copy-file "font_western.bin" "../Data/Sys/GC/font_western.bin") - (chdir "..") - (substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp" - (("\"vulkan\", 1") (string-append "\"vulkan\"")) - (("\"vulkan\"") (string-append "\"" libvulkan "\"")) - (("Common::DynamicLibrary::GetVersionedFilename") "")))))) - - ;; The FindGTK2 cmake script only checks hardcoded directories for - ;; glib/gtk headers. - - #:configure-flags - (list (string-append "-DX11_INCLUDE_DIR=" - (assoc-ref %build-inputs "libx11") - "/include") - (string-append "-DX11_LIBRARIES=" - (assoc-ref %build-inputs "libx11") - "/lib/libX11.so") - "-DX11_FOUND=1"))) + (invoke "./gc-font-tool" "a" fontfile "font_western.bin") + (invoke "./gc-font-tool" "s" fontfile "font_japanese.bin") + (copy-file "font_japanese.bin" "../Data/Sys/GC/font_japanese.bin") + (copy-file "font_western.bin" "../Data/Sys/GC/font_western.bin") + (chdir "..") + (substitute* "Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp" + (("\"vulkan\", 1") (string-append "\"vulkan\"")) + (("\"vulkan\"") (string-append "\"" libvulkan "\"")) + (("Common::DynamicLibrary::GetVersionedFilename") ""))))) + (add-after 'check 'post-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "Source/UnitTests" + (invoke "ctest" "-V" "--output-on-failure" + ;; These tests fail due to libusb failing to + ;; init inside the build container. + "-E" (string-join + '("MMIOTest" + "PageFaultTest" + "CoreTimingTest" + "FileSystemTest" + "PowerPCTest" + "VertexLoaderTest") + "|"))))))) + ;; The FindGTK2 cmake script only checks hardcoded directories for + ;; glib/gtk headers. Also add some include directories via the CXX + ;; flags to let GCC find some headers not actively searched by the + ;; build system. + #:configure-flags + #~(list (string-append "-DCMAKE_CXX_FLAGS=" + "-I" (search-input-directory + %build-inputs "include/soundtouch")) + (string-append "-DX11_INCLUDE_DIR=" + #$(this-package-input "libx11") + "/include") + (string-append "-DX11_LIBRARIES=" + (search-input-file %build-inputs + "lib/libX11.so")) + "-DX11_FOUND=1") + #:test-target "unittests")) (native-inputs (list gettext-minimal pkg-config)) (inputs (list alsa-lib ao bluez + bzip2 + cubeb curl + enet eudev ffmpeg-4 + fmt-7 font-wqy-microhei freetype glew @@ -363,6 +418,7 @@ (define-public dolphin-emu mbedtls-lts mesa miniupnpc + minizip-ng openal pugixml pulseaudio @@ -370,9 +426,11 @@ (define-public dolphin-emu sdl2 sfml soil - soundtouch + soundtouch-1/integer-samples vulkan-loader - zlib)) + xxhash + zlib + `(,zstd "lib"))) (home-page "https://dolphin-emu.org/") (synopsis "Nintendo Wii and GameCube emulator") (description @@ -380,7 +438,7 @@ (define-public dolphin-emu GameCube and the Wii. It provides compatibility with all PC controllers, turbo speed, networked multiplayer, and graphical enhancements.") (supported-systems '("x86_64-linux" "aarch64-linux")) - ; dolphin/Data/Sys/GC/font_*.bin: Licensed under ASL2.0. + ;; dolphin/Data/Sys/GC/font_*.bin: Licensed under ASL2.0. (license (list license:gpl2+ license:asl2.0 license:fdl1.2+))))) (define-public dosbox From patchwork Sat Jan 18 08:50:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37134 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 8951527BBE2; Sat, 18 Jan 2025 08:52:31 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 65F7927BBED for ; Sat, 18 Jan 2025 08:52:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Yn-0003Nq-8Z; Sat, 18 Jan 2025 03:52:05 -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 1tZ4Ym-0003N9-1D for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:04 -0500 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 1tZ4Yl-0007ch-Km for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:03 -0500 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=T5RsxWDs8q5GrbfpoFm97GWxQ7oUsUa2lgitQKyJiGY=; b=HB9GebcY/FwBl3TPKcXAKSmU8gOsTa+fWssUIiiNlOzFmkZ1HkPnAyLuRmYFCtdOOAAnGr0IUBgX3BQapoHpfjqMvV0Yc1dfy8i3JIn1p6q4LH1YZqYaocydlTmC5cYkms2lM8UYI1NrcSt2mn0da/ooxvhVAtVwt+kDKuayEWYgdiuuILIE6E5NaBmc0EFFaBgD6RO3NjOxF3T7pod7uWpOjgRcaTlrFR0KtRQut92KSdQd5ce1L3eaptk7JKOfQaIT1w3peAxVO3PquHxTgbAz0TBJTCpZkhhIP7o8ipsVhknNYuL3c3J2w2SG0H0hhbOC6zTryDRhE6MuZYrdHg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Yk-00088O-TO; Sat, 18 Jan 2025 03:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 03/10] gnu: dolphin-emu: Build .bin binary files and preserve data ones. 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: Sat, 18 Jan 2025 08:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719029231141 (code B ref 75619); Sat, 18 Jan 2025 08:52:02 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:51:32 +0000 Received: from localhost ([127.0.0.1]:40042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4YG-00086B-0n for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:32 -0500 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:48567) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4Y9-00085I-PU for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:27 -0500 Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-21bc1512a63so57895695ad.1 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190279; x=1737795079; darn=debbugs.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=T5RsxWDs8q5GrbfpoFm97GWxQ7oUsUa2lgitQKyJiGY=; b=dDuvrTdQrdIyc9U9vG8VJtV1RlWEr7qtr7bcrmOkrFJpw+qkzWrZXWugNT6e4B5Lke pqLlf95zBQFrY2KBgWvexsoJhvY+4uSxIFOAJmqvCSXCe8HbOjVJj8etUZwofSyNDCCj 545NK08zqTGmxoag8KsAaU6RFaW8OQAZCNGFz/ioIOElz7SG1qgEWOO2SHPWfl4Ab1au scIVHdFy9UMtyQiR+MksHkhzCQiwZLwoqq3tkz/Nxr/avHqB4JskfCOKXW4yAGCc//SC NtG1zhx51mdJbaQiqIqSdG3VWjuII2w4bd+V94WhMUdBidfx5Iy36gqBU3hmar5tceCj UQuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190279; x=1737795079; 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=T5RsxWDs8q5GrbfpoFm97GWxQ7oUsUa2lgitQKyJiGY=; b=bjVYWznNdPLfx3RqTVPGR9HICJqR/snieHZnDWm0PJkNcQ4cVLoR5dP2H5Gtemqmil boR0RTwwk9zeYaJRGKF5djfl3T43v7VFy/ktpqEX69mcWHU8cxkOCYP9ivKoWUNVacG+ 9fL374o/62UjCA0rtCilKyoXaUJ2ecNVL8rpl/oNZZmy49Yacta3hRn3WbcTPCjvlMG1 Va/x+IgQ3Ql2W03++o26wK7w2hdTGSQt5CJWhp5/zSuOlnaQIGdRcKER5IRa0/nJxqxN i8sm/fwvufe98IjHNJGo3vOoTenhRmDoqWFZ/jYrvWGi+QD8qaDuQu+9jNm9wviCKjfb /PdA== X-Gm-Message-State: AOJu0YyElN8eJ99Pdp0m5nWf9xHvheThSIRLUPqFKhuiqHTFVS1sDPYQ l9MR9/4cnonqJgmbFQTwukDF8I5sW6KcGi9Xgk5iHGtWyPjqV28ZoLXZtAkfjto= X-Gm-Gg: ASbGncvA6AT0uCcPrzeL9fqqK99JTL8w3CwxgRLZ5QpnBPszrA/sOvG7Ff0gzFt7gQ1 0sE1mu5hGFjDlcA+4vFB/O/cQpOGFZiI+p8wZ2TS0Tu1OQYZeckq4Ha0lyqpEJH3Bqno4R3K0WI am5bFqEOTWGrUL2DYcS5GDa3sYrx7LgU+v9rRinLbs8e2UxqB0+lgHhdaW92O0WwSVLZVr5jyEm qkUOcmOpfr06aezH6xNO33onxfMgfFrFPlnEFY1RqghkTtGhet2iRYEiuowk6zuuwFLb57NgGW5 reHxcXE9o+qS X-Google-Smtp-Source: AGHT+IFLiJ6CG4AZp4k48wao4NtEJ+mrxP4DjEEPV0l7keJ41Mxc1Y5LJzSuLJMTxjqCon2atX7FXg== X-Received: by 2002:a17:902:f644:b0:215:8d29:af2d with SMTP id d9443c01a7336-21c3563060amr100888715ad.38.1737190278690; Sat, 18 Jan 2025 00:51:18 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:18 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:47 +0900 Message-ID: <87b75e47d4fc308896e1ab8e86bd58cd049ab97f.1737190254.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> References: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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 These files are necessary to save games, enable cheat codes, etc. * gnu/packages/emulators.scm (dolphin-emu) [source] : Refine to avoid deleting a few .bin which are not executable objects but rather configuration files samples. [phases]: Add build-codeloader.bin, build-dsp_rom.bin and build-dsp_coefs.bin phases. [arguments] : Add -DDSPTOOL=ON. [native-inputs]: Add a cross-compiler for powerpc. Add python-minimal and python-numpy. Change-Id: Ida8df1add940e1708c557223409d854aa995e8a5 --- gnu/packages/emulators.scm | 50 ++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 6f77329f27..2486485805 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -98,6 +98,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-build) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) @@ -289,7 +290,8 @@ (define-public dolphin-emu (file-name (git-file-name name version)) (sha256 (base32 "1p8qsxlabgmz3nic0a9ghh9d3lzl5f8i3kmdrrvx6w8kdlp33018")) - (modules '((guix build utils))) + (modules '((guix build utils) + (ice-9 regex))) (snippet '(begin ;; Remove external stuff we don't need. @@ -317,9 +319,19 @@ (define-public dolphin-emu "miniupnpc" "minizip" "MoltenVK" "pugixml" "soundtouch" "xxhash" "zlib" "zstd")) - ;; Clean up source. + ;; Clean up the source. (for-each delete-file - (find-files "." ".*\\.(bin|dsy|exe|jar|rar)$")) + (find-files + "." + (lambda (file _) + (and (string-match "\\.(bin|dsy|exe|jar|rar)$" file) + ;; Preserve the important wc24 .bin + ;; configuration *data* files. + (not (member (basename file) + '("misc.bin" + "nwc24dl.bin" + "nwc24fl.bin" + "nwc24fls.bin"))))))) ;; Do not attempt to include now-missing directories. (substitute* "CMakeLists.txt" ((".*add_subdirectory.*Externals/enet.*") "") @@ -371,7 +383,30 @@ (define-public dolphin-emu "FileSystemTest" "PowerPCTest" "VertexLoaderTest") - "|"))))))) + "|")))))) + (add-before 'install 'build-codeloader.bin + (lambda _ + (with-directory-excursion "../source/docs" + ;; The following command-line is adapted from the example in + ;; codehandler.s. + (invoke "powerpc-linux-gnu-gcc" "-mpowerpc" "-mbig" + "codehandler.s" "-nostartfiles" "-nodefaultlibs" + "-nostdlib" "-T" "codehandler.ld" + "-o" "codehandler.bin") + (copy-file "codehandler.bin" "../Data/Sys/codehandler.bin")))) + (add-before 'install 'build-dsp_rom.bin + (lambda _ + ;; Ensure dsptool is on PATH. + (setenv "PATH" (string-append (getenv "PATH") ":" + (getcwd) "/Binaries")) + (with-directory-excursion "../source" + (invoke "dsptool" "-o" "Data/Sys/GC/dsp_rom.bin" + "docs/DSP/free_dsp_rom/dsp_rom.ds")))) + (add-before 'install 'build-dsp_coefs.bin + (lambda _ + (with-directory-excursion "../source" + (invoke "python3" "docs/DSP/free_dsp_rom/generate_coefs.py") + (rename-file "dsp_coef.bin" "Data/Sys/GC/dsp_coef.bin"))))) ;; The FindGTK2 cmake script only checks hardcoded directories for ;; glib/gtk headers. Also add some include directories via the CXX ;; flags to let GCC find some headers not actively searched by the @@ -380,6 +415,7 @@ (define-public dolphin-emu #~(list (string-append "-DCMAKE_CXX_FLAGS=" "-I" (search-input-directory %build-inputs "include/soundtouch")) + "-DDSPTOOL=ON" (string-append "-DX11_INCLUDE_DIR=" #$(this-package-input "libx11") "/include") @@ -389,7 +425,11 @@ (define-public dolphin-emu "-DX11_FOUND=1") #:test-target "unittests")) (native-inputs - (list gettext-minimal pkg-config)) + (list (cross-gcc "powerpc-linux-gnu") + gettext-minimal + pkg-config + python-minimal + python-numpy)) (inputs (list alsa-lib ao From patchwork Sat Jan 18 08:50:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37136 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 5F40F27BBEA; Sat, 18 Jan 2025 08:52:45 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 7899427BBE2 for ; Sat, 18 Jan 2025 08:52:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Yz-0003RN-RP; Sat, 18 Jan 2025 03:52:17 -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 1tZ4Ym-0003NA-76 for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:04 -0500 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 1tZ4Yl-0007ci-TS for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:03 -0500 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=1tCA9+eTgr83ngkp+5K3BKRoML1ecAz+VHE6rPfNNCY=; b=jrhBK1QeihSmDgn7i66qSRfXTV7Eg/46FHdPty2wJFKCwAVOQAShLeJ8XYk1cy2xt2v+tiQvHFCOupJuuXMIvezVxtL7DdEBKvLJBE4XoX2KCcuyduZKFogEyCOtfTtDhRe4sPmYQhfKdoZ+skfdIipfgSK4dAan6cRdqUZH/jqJru6RpHSooAzLYNnoMi4bt2EnM6JiUKqmzvYZo6hPfU6Vf5mwG/nEIqy2deXJG2jxSj/9F6tGhfwNK/PupmsneQDUnKQDe/nifocW7bPVrPqXPMsmwAbNgd6wE9cdKsU4X5NS0OopjFepN9eai1Mo+JzNd2mAsnnJcy1IZKnWfg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Yl-00088X-CW; Sat, 18 Jan 2025 03:52:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 04/10] gnu: retroarch-minimal: Add new search paths for database and system files. 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: Sat, 18 Jan 2025 08:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719029431157 (code B ref 75619); Sat, 18 Jan 2025 08:52:03 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:51:34 +0000 Received: from localhost ([127.0.0.1]:40045 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4YG-00086K-SC for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:33 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:42295) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4YB-00085K-EL for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:28 -0500 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-2167141dfa1so52461255ad.1 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190281; x=1737795081; darn=debbugs.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=1tCA9+eTgr83ngkp+5K3BKRoML1ecAz+VHE6rPfNNCY=; b=RdKGoCECtmKCelXrJVxKJXYJHDrvS/aLVoG/N3bmQmduJF6XDiutLgqcPFbd3oK6DT d4tDfBJAndopXgkbpUtPieqt5UpbbbOz3MXi6/kv+w0WJBsfD1zh9qQGbmey3LpelULB G+wB1473vSJW2HsqLJP9vzMwwrKs0ZylDVCPm+qeF/7XIubkH8LXw47KtiopACVBzbjI 0h6iocCok9QpoAdPeO9UVH4+8Aambcg0CSRf/V9nuUDsycwUl+h1hKtMilMv57n/5uZL iqGbdtP23sGjKE5OiduYLp8mUy2eb54tSYhJdIQmOnU2ZhuV6AFGMgZT7Pzfexq2jxSD 7nDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190281; x=1737795081; 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=1tCA9+eTgr83ngkp+5K3BKRoML1ecAz+VHE6rPfNNCY=; b=VaUvxmm5Kfe2Nmj0v7hozCfOBVDUIDlJaz4T4XexWwZpFHxrMJ3oGTFIy+dt02dVO4 yqcTXTIveggxGxItM9SbwqUzKFPftxybWOhBWHHtQRxqHp8xl7I86atZHspLpysIh0vq r0AXb2AqAuk7AjnmIJoUfZ3NXFY9DKa4u9lECocdBi/FLPpQjVP6FMnqklk/CCxkpo8a 6OBdrjzWrzuY/AgIzATR8sLZpKm5Nb0WUDsAAioiMzGxLqSClyjjrSZlzpxHcSH969he 2fm5S0Ume6zJHetBpEv9IuFr95q0umxbFAEhPyYysx1BwrFbHL21b0m4fSmspwF0+IwW 7yrQ== X-Gm-Message-State: AOJu0YyEwjNOWxewmPRITlHlN16BvAhNitDijoLG7jY9h2UIFyLCjoY5 It+Y+qNx/dVpAe+58q+h5FwpSUZVBM8mXKdw2LHFD5/l6Eu9eTZos8hZSYyFJlk= X-Gm-Gg: ASbGncvvRgDXOx3JJaQBd4ELoQlI8DaVAI5xU4XQVQojQ0lRyiYd3SfjMm1xf0515SW 5pgYYj3EYSlhmdsbkEcyP3fJKPA0OtI1vVXusCRgZKc/IQy/kpJLPuw6Up1l1m+oxCZeKkDLf9e Ilx/3lR0aQGah0IP06jTsDHbpXmqBSiWYqz+MyM8nqj/NJnEKCusPYP2IAqsylm/Y0yWhL6JD0C bVjAUt8NB1HaqfleWnusj7eqEImuaRQeJvHfgnwuBecqPuUOh1w1gu3C2rTWN63AdYfLm74jgyV FGp/bX20IaqD X-Google-Smtp-Source: AGHT+IGDCKk3quU4fdOq3s4yDYlv1BbE/SGErjgTlDC1JUeoft1/7Ih6aDLMLlpcpeaIkJPxsoqvrQ== X-Received: by 2002:a17:903:238e:b0:216:311e:b1c4 with SMTP id d9443c01a7336-21bf029e049mr185196115ad.4.1737190280793; Sat, 18 Jan 2025 00:51:20 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:20 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:48 +0900 Message-ID: <394ce53fdb1066c4aa9f711a27dc2b1c6312d106.1737190254.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> References: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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 This makes it possible to locate system files provided by libretro cores, as well as database files. * gnu/packages/patches/retroarch-improved-search-paths.patch: Extend patch. * gnu/packages/emulators.scm (retroarch-minimal) [native-search-paths]: Register new search paths for the LIBRETRO_DATABASE_DIRECTORY and LIBRETRO_SYSTEM_DIRECTORY variables. Change-Id: I48f9a92608c0e36922ce9dcc9bbb61d6ca915002 --- gnu/packages/emulators.scm | 8 ++ .../retroarch-improved-search-paths.patch | 127 ++++++++++++++---- 2 files changed, 108 insertions(+), 27 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 2486485805..28b8914902 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2632,6 +2632,14 @@ (define-public retroarch-minimal (variable "LIBRETRO_AUTOCONFIG_DIRECTORY") (separator #f) ;single entry (files '("share/libretro/autoconfig"))) + (search-path-specification + (variable "LIBRETRO_DATABASE_DIRECTORY") + (separator #f) ;single entry + (files '("share/libretro/database/rdb"))) + (search-path-specification + (variable "LIBRETRO_SYSTEM_DIRECTORY") + (separator #f) ;single entry + (files '("share/libretro/system"))) (search-path-specification (variable "LIBRETRO_VIDEO_FILTER_DIRECTORY") (separator #f) ;single entry diff --git a/gnu/packages/patches/retroarch-improved-search-paths.patch b/gnu/packages/patches/retroarch-improved-search-paths.patch index 6fcd4745ac..037e73fa09 100644 --- a/gnu/packages/patches/retroarch-improved-search-paths.patch +++ b/gnu/packages/patches/retroarch-improved-search-paths.patch @@ -1,25 +1,22 @@ -Allows discovery of assets file via the LIBRETRO_ASSETS_DIRECTORY environment -variable. - -Upstream-status: https://github.com/libretro/RetroArch/pull/17054 - diff --git a/configuration.c b/configuration.c -index 5808a3f21c..0cc2909102 100644 +index 5808a3f21c..e1c56f2f1b 100644 --- a/configuration.c +++ b/configuration.c -@@ -3573,6 +3573,11 @@ static bool config_load_file(global_t *global, +@@ -3573,6 +3573,13 @@ static bool config_load_file(global_t *global, { unsigned i; char tmp_str[PATH_MAX_LENGTH]; + char* libretro_directory = NULL; + char* libretro_assets_directory = NULL; + char* libretro_autoconfig_directory = NULL; ++ char* libretro_database_directory = NULL; ++ char* libretro_system_directory = NULL; + char* libretro_video_filter_directory = NULL; + char* libretro_video_shader_directory = NULL; static bool first_load = true; bool without_overrides = false; unsigned msg_color = 0; -@@ -3848,12 +3853,6 @@ static bool config_load_file(global_t *global, +@@ -3848,12 +3855,6 @@ static bool config_load_file(global_t *global, strlcpy(path_settings[i].ptr, tmp_str, PATH_MAX_LENGTH); } @@ -32,7 +29,7 @@ index 5808a3f21c..0cc2909102 100644 #ifdef RARCH_CONSOLE if (conf) video_driver_load_settings(global, conf); -@@ -3861,6 +3860,20 @@ static bool config_load_file(global_t *global, +@@ -3861,6 +3862,32 @@ static bool config_load_file(global_t *global, /* Post-settings load */ @@ -45,15 +42,27 @@ index 5808a3f21c..0cc2909102 100644 + } + + libretro_autoconfig_directory = getenv("LIBRETRO_AUTOCONFIG_DIRECTORY"); -+ if (libretro_autoconfig_directory) ++ if (libretro_autoconfig_directory) /* override configuration value */ + configuration_set_string(settings, + settings->paths.directory_autoconfig, + libretro_autoconfig_directory); ++ ++ libretro_database_directory = getenv("LIBRETRO_DATABASE_DIRECTORY"); ++ if (libretro_database_directory) /* override configuration value */ ++ configuration_set_string(settings, ++ settings->paths.path_content_database, ++ libretro_database_directory); ++ ++ libretro_system_directory = getenv("LIBRETRO_SYSTEM_DIRECTORY"); ++ if (libretro_system_directory) /* override configuration value */ ++ configuration_set_string(settings, ++ settings->paths.directory_system, ++ libretro_system_directory); + if ( (rarch_flags & RARCH_FLAGS_HAS_SET_USERNAME) && (override_username)) { -@@ -4032,15 +4045,27 @@ static bool config_load_file(global_t *global, +@@ -4032,15 +4059,27 @@ static bool config_load_file(global_t *global, *settings->paths.path_menu_wallpaper = '\0'; if (string_is_equal(settings->paths.path_rgui_theme_preset, "default")) *settings->paths.path_rgui_theme_preset = '\0'; @@ -85,18 +94,18 @@ index 5808a3f21c..0cc2909102 100644 #ifdef _3DS if (string_is_equal(settings->paths.directory_bottom_assets, "default")) diff --git a/docs/retroarch.6 b/docs/retroarch.6 -index 7478040e17..f864e0e0d5 100644 +index 7478040e17..f26a1219f0 100644 --- a/docs/retroarch.6 +++ b/docs/retroarch.6 @@ -1,6 +1,6 @@ .\" retroarch.6: -.TH "RETROARCH" "6" "November 1, 2011" "RETROARCH" "System Manager's Manual: retroarch" -+.TH "RETROARCH" "6" "September 28, 2024" "RETROARCH" "System Manager's Manual: retroarch" ++.TH "RETROARCH" "6" "January 18, 2025" "RETROARCH" "System Manager's Manual: retroarch" .SH NAME -@@ -239,3 +239,36 @@ Disables all kinds of content patching. +@@ -239,3 +239,48 @@ Disables all kinds of content patching. .TP \fB-D, --detach\fR Detach from the current console. This is currently only relevant for Microsoft Windows. @@ -123,6 +132,18 @@ index 7478040e17..f864e0e0d5 100644 +"joypad_autoconfig_dir" configuration file option. + +.TP ++\fBLIBRETRO_DATABASE_DIRECTORY\fR ++Specify the directory where RetroArch looks for database files, ++overriding the value of the "content_database_path" configuration file ++option. ++ ++.TP ++\fBLIBRETRO_SYSTEM_DIRECTORY\fR ++Specify the directory where RetroArch looks for system files, ++overriding the value of the "system_directory" configuration file ++option. ++ ++.TP +\fBLIBRETRO_VIDEO_FILTER_DIRECTORY\fR +Specify the directory where RetroArch looks for video filters, +overriding the value of the "video_filter_dir" configuration file @@ -134,21 +155,23 @@ index 7478040e17..f864e0e0d5 100644 +overriding the value of the "video_shader_dir" configuration file +option. diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c -index c157d355a1..ddf0b5ca87 100644 +index c157d355a1..bec65ca949 100644 --- a/frontend/drivers/platform_unix.c +++ b/frontend/drivers/platform_unix.c -@@ -1324,6 +1324,10 @@ static void frontend_unix_get_env(int *argc, +@@ -1324,6 +1324,12 @@ static void frontend_unix_get_env(int *argc, { unsigned i; const char* libretro_directory = getenv("LIBRETRO_DIRECTORY"); + const char* libretro_assets_directory = getenv("LIBRETRO_ASSETS_DIRECTORY"); + const char* libretro_autoconfig_directory = getenv("LIBRETRO_AUTOCONFIG_DIRECTORY"); ++ const char* libretro_database_directory = getenv("LIBRETRO_DATABASE_DIRECTORY"); ++ const char* libretro_system_directory = getenv("LIBRETRO_SYSTEM_DIRECTORY"); + const char* libretro_video_filter_directory = getenv("LIBRETRO_VIDEO_FILTER_DIRECTORY"); + const char* libretro_video_shader_directory = getenv("LIBRETRO_VIDEO_SHADER_DIRECTORY"); #ifdef ANDROID int32_t major, minor, rel; char device_model[PROP_VALUE_MAX] = {0}; -@@ -1765,12 +1769,20 @@ static void frontend_unix_get_env(int *argc, +@@ -1765,12 +1771,20 @@ static void frontend_unix_get_env(int *argc, "cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO])); else #endif @@ -174,7 +197,7 @@ index c157d355a1..ddf0b5ca87 100644 #ifdef ASSETS_DIR if (path_is_directory(ASSETS_DIR "/assets")) fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], -@@ -1778,7 +1790,10 @@ static void frontend_unix_get_env(int *argc, +@@ -1778,7 +1792,10 @@ static void frontend_unix_get_env(int *argc, "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); else #endif @@ -186,7 +209,7 @@ index c157d355a1..ddf0b5ca87 100644 fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_ASSETS], "/usr/local/share/retroarch", "assets", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); -@@ -1838,7 +1853,11 @@ static void frontend_unix_get_env(int *argc, +@@ -1838,7 +1855,11 @@ static void frontend_unix_get_env(int *argc, "filters/video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER])); else #endif @@ -199,12 +222,21 @@ index c157d355a1..ddf0b5ca87 100644 fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER], "/usr/local/share/retroarch", "filters/video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER])); -@@ -1872,8 +1891,13 @@ static void frontend_unix_get_env(int *argc, +@@ -1870,10 +1891,20 @@ static void frontend_unix_get_env(int *argc, + "records_config", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT], base_path, "records", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path, - "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); +- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path, +- "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); - fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SHADER], base_path, - "shaders", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER])); ++ if (!string_is_empty(libretro_database_directory)) ++ strlcpy(g_defaults.dirs[DEFAULT_DIR_DATABASE], ++ libretro_database_directory, ++ sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); ++ else ++ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_DATABASE], base_path, ++ "database/rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); + if (!string_is_empty(libretro_video_shader_directory)) + strlcpy(g_defaults.dirs[DEFAULT_DIR_SHADER], + libretro_video_shader_directory, @@ -215,16 +247,34 @@ index c157d355a1..ddf0b5ca87 100644 fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], base_path, "cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS])); fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_OVERLAY], base_path, +@@ -1892,8 +1923,13 @@ static void frontend_unix_get_env(int *argc, + "saves", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); + fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], base_path, + "states", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE])); +- fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], base_path, +- "system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ if (!string_is_empty(libretro_system_directory)) ++ strlcpy(g_defaults.dirs[DEFAULT_DIR_SYSTEM], ++ libretro_system_directory, ++ sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ else ++ fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], base_path, ++ "system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); + #endif + + #ifndef IS_SALAMANDER diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c -index 26ed25c04f..0cc9a9dc95 100644 +index 26ed25c04f..77d415f0e7 100644 --- a/frontend/drivers/platform_win32.c +++ b/frontend/drivers/platform_win32.c -@@ -565,24 +565,38 @@ static void frontend_win32_env_get(int *argc, char *argv[], +@@ -565,24 +565,45 @@ static void frontend_win32_env_get(int *argc, char *argv[], { const char *tmp_dir = getenv("TMP"); const char *libretro_directory = getenv("LIBRETRO_DIRECTORY"); + const char *libretro_assets_directory = getenv("LIBRETRO_ASSETS_DIRECTORY"); + const char* libretro_autoconfig_directory = getenv("LIBRETRO_AUTOCONFIG_DIRECTORY"); ++ const char* libretro_database_directory = getenv("LIBRETRO_DATABASE_DIRECTORY"); ++ const char* libretro_system_directory = getenv("LIBRETRO_SYSTEM_DIRECTORY"); + const char* libretro_video_filter_directory = getenv("LIBRETRO_VIDEO_FILTER_DIRECTORY"); + const char* libretro_video_shader_directory = getenv("LIBRETRO_VIDEO_SHADER_DIRECTORY"); if (!string_is_empty(tmp_dir)) @@ -255,15 +305,22 @@ index 26ed25c04f..0cc9a9dc95 100644 + ":\\filters\\video", sizeof(g_defaults.dirs[DEFAULT_DIR_VIDEO_FILTER])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CHEATS], ":\\cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS])); - fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_DATABASE], - ":\\database\\rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); +- fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_DATABASE], +- ":\\database\\rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); ++ if (!string_is_empty(libretro_database_directory)) ++ strlcpy(g_defaults.dirs[DEFAULT_DIR_DATABASE], ++ libretro_database_directory, ++ sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); ++ else ++ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_DATABASE], ++ ":\\database\\rdb", sizeof(g_defaults.dirs[DEFAULT_DIR_DATABASE])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], - ":\\playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_ASSETS])); + ":\\playlists", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG], ":\\config\\record", sizeof(g_defaults.dirs[DEFAULT_DIR_RECORD_CONFIG])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_RECORD_OUTPUT], -@@ -605,12 +619,26 @@ static void frontend_win32_env_get(int *argc, char *argv[], +@@ -605,12 +626,26 @@ static void frontend_win32_env_get(int *argc, char *argv[], else fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CORE], ":\\cores", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE])); @@ -296,3 +353,19 @@ index 26ed25c04f..0cc9a9dc95 100644 fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], ":\\downloads", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS])); fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT], +@@ -619,8 +654,13 @@ static void frontend_win32_env_get(int *argc, char *argv[], + ":\\saves", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM])); + fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], + ":\\states", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE])); +- fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SYSTEM], +- ":\\system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ if (!string_is_empty(libretro_system_directory)) ++ strlcpy(g_defaults.dirs[DEFAULT_DIR_SYSTEM], ++ libretro_system_directory, ++ sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); ++ else ++ fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_SYSTEM], ++ ":\\system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM])); + fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_LOGS], + ":\\logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS])); + From patchwork Sat Jan 18 08:50:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37138 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 A9D7927BBEA; Sat, 18 Jan 2025 08:52:50 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 179E627BBE2 for ; Sat, 18 Jan 2025 08:52:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Yp-0003OC-Sq; Sat, 18 Jan 2025 03:52:07 -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 1tZ4Ym-0003NU-VB for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:05 -0500 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 1tZ4Ym-0007d0-Le for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:04 -0500 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=HpZi7WScDoVk4q1eTY93934wTGdpDtLMoRgiG1grMBI=; b=jUhQnCLjt4Q4x6jYjtcJ0kn/5TUOBdX+utj/RySMJXIZwQHITm0UL9JaSgeSSYnHdhCckluO5WfE7QNZ6WCJj1MnHQaDwFeZim/2p1WyEHBWkgYe5s9lQsNrIPIhm7/Kg7xWokNRfFgFIHVjNYRDJyM0+0K/pZZEd/tTz0q8bnrIXVEftOWwJI3iicqj1J56v/RncnPn3cYESU8O+fTm9uhawrzhs/5m0tSMqEok2t2x1JUl67i/8/Du2GFKocW4r10/ncp9DG37J8zsbG7p3Lj9NgXVvXM2mamm1acZWLg3ScWvWy9cMCmgo1HP6yu0JcSszmm5t+XD37GJvQmqeQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Yl-00088r-W7; Sat, 18 Jan 2025 03:52:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 05/10] gnu: Add libretro-dolphin-emu. 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: Sat, 18 Jan 2025 08:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719030531197 (code B ref 75619); Sat, 18 Jan 2025 08:52:03 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:51:45 +0000 Received: from localhost ([127.0.0.1]:40051 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4YT-000876-05 for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:45 -0500 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:61727) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4YE-00085T-M4 for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:31 -0500 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-21669fd5c7cso53449375ad.3 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190284; x=1737795084; darn=debbugs.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=HpZi7WScDoVk4q1eTY93934wTGdpDtLMoRgiG1grMBI=; b=YZac9W7llPd9MGtYaNlSqGkW+MlZwrBSx6zu8+axHb6WwBR3vadzv7lHoVnnlQtpk8 2hOzZIAsNj4w8pgS30H4cnxq6y+fFUxspbxVSE1KOoYGeKQ0Sx0obq+9t++fW01XHTmK 2D9cEEvvXkrGn6ZlsVekZozIWG9TrKCb4evC/V553Wdbvgo/efhmXWo5Mh/+m4YhYkVY 2sAXVhALVwxtQByT0iyUFyfdnJHdFnaegr8Ek9B9VOf9jMruTAi/ycseoa19mrjoLZFU 016dMPg9GiobDV+rr8cS7aGi+b+aFj7on6vDvOdlROZWKu0LAPY2sbtwVmIX4FZyKiVz dhqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190284; x=1737795084; 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=HpZi7WScDoVk4q1eTY93934wTGdpDtLMoRgiG1grMBI=; b=rqGSpGfzzCgzRtyjIn7ozQFndz71lpiBwb9LCb18dzehCasHUVCh4IoAuBr1RxXhkS 6yEA/08b54mZzZvb/DQ00ce7Y5bkDPatfOUtyPXx4bHFjZVFJ84oK3SAcdfLuH/8LFma 8q2tcPAyaUFTK+UCtFcdYmjuinfUiE1X0+QRCyYj1VwhKPVEFbVRoND+ijhcCWCVhkbZ MGlhA4K+cZNIFPlUBh3JCtaeuCrje9faAz6cOpQhptRhp3ixGHj7BtF24oGdN6+rGKFL X4a0caZrfDjuK632Zf+agJxL3/TFwebDoRm3rZOCMhlhCh6WFb7Eth5CyNfgPmxtxfGC vv8g== X-Gm-Message-State: AOJu0YwJejl+/tPgnB2XqKwmWaIXHJvNEshlDwwBq/7dULqs3MvkIHIv RcDT+FaY4wRwLsQAmETbjHmb1QI/Es9oJoMWcj+gtQr/5W/mOTcgavCZ9z99zpg= X-Gm-Gg: ASbGnctt2H1tVXdWQxjq3nYW0A+X3EC85A04TquNGYo13ejDVxYwIGM0xFlW/x+Isax FnOR4DFmeCl5dHDaMu4fn3c9x7WjhxpzlazU1WplZ2ZuIsC9cZcBQG0bblg/xySnCOoixt3+9wf rC00XqzNxL9HtRadSLdmpTd18ZvvRlXyrjKSXTaXqNx3mx3yeBq8rlGEaexajAAp6CF20s4wrqz yGmpIdrCx3RoRKepsJURyFY7tdRZ1JGiqb1iIo4iPl7osoS60gZOEGYRWTAeQb9QnWENLtQTWzB nK7oTyJX7x6z X-Google-Smtp-Source: AGHT+IGyZg/Idv+beZ9wJiFANb+yXfF+ZJ87lUe6ys8V2g87m7e2VWjyHNbeZjcCPvBp8KM0gVRKQQ== X-Received: by 2002:a17:902:ce8d:b0:216:56d5:d87 with SMTP id d9443c01a7336-21c355ad56cmr92898835ad.34.1737190282771; Sat, 18 Jan 2025 00:51:22 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:22 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:49 +0900 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> References: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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 (libretro-dolphin-emu): New variable. Change-Id: Id05e1d17ff6927bb1492ce2816790f7d94f9e1b8 --- gnu/packages/emulators.scm | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 28b8914902..242c1fa03b 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -481,6 +481,57 @@ (define-public dolphin-emu ;; dolphin/Data/Sys/GC/font_*.bin: Licensed under ASL2.0. (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. + (let ((commit "89a4df725d4eb24537728f7d655cddb1add25c18") + (revision "0")) + (package + (inherit dolphin-emu) + (name "libretro-dolphin-emu") + (version (git-version "5.0" revision commit)) + (source (origin + (inherit (package-source dolphin-emu)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/libretro/dolphin") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1fvm6hy0ihc0j3sgv88a7ak08c0kyikmmiif827j981fy7zvglvz")))) + (arguments + (substitute-keyword-arguments (package-arguments dolphin-emu) + ((#:configure-flags flags ''()) + #~(cons "-DLIBRETRO=ON" #$flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'deregister-bundled-sources + (lambda _ + (substitute* "CMakeLists.txt" + ((".*add_subdirectory.*Externals/curl.*") "") + ((".*add_subdirectory.*Externals/libpng.*") "")))) + (replace 'install + (lambda _ + (install-file "dolphin_libretro.so" + (string-append #$output "/lib/libretro")) + ;; The system data files are also required for the proper + ;; functioning of dolphin; without them, it crashes with + ;; segmentation faults and cannot save files to the memory + ;; card. + (let ((sysdir (string-append + #$output + "/share/libretro/system/dolphin-emu"))) + (mkdir-p sysdir) + (copy-recursively "../source/Data/Sys" + (string-append sysdir "/Sys"))))))))) + (inputs + ;; Delete large and extraneous inputs. + (modify-inputs (package-inputs dolphin-emu) + (delete "ffmpeg" + "gtk+" + "qtbase"))) + (synopsis "Libretro port of Dolphin, the Nintendo Wii/GameCube emulator")))) + (define-public dosbox (package (name "dosbox") From patchwork Sat Jan 18 08:50:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37132 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 8BC7E27BBEA; Sat, 18 Jan 2025 08:52:30 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 5CD6327BBE2 for ; Sat, 18 Jan 2025 08:52:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Yp-0003O8-RP; Sat, 18 Jan 2025 03:52:07 -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 1tZ4Ym-0003NV-VZ for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:05 -0500 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 1tZ4Ym-0007d1-ME for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:04 -0500 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=zBfrtZOYqT+Ea7QRXWUHU0d3Xg+brr0doUtVfXj0Zmc=; b=e0aguTQDqqoNAIHK2Vcw6jWvHuZjSvMYGXgtWO3pgE0jePo5cnxKAngSEsAI8626LaE4dfKo83RXKPLiKCBAmfpZRIVw4Nm3IKzLbOZDsTOC7Ir1N1VCOMenwgetiBKrNM0MV3luZjAgmJNVumVBoR8B/9wv/n7EQPqJW03aLSghZhjw77JkCMPoyy0x75Mh6HPoVCYkge8h4rCxmMA40IPv5d9llW5dPmt6maVeOYoY0IgnaJLdGyOPnQTo4MJeI/aW7VsuhWzjD278MMjJtf8JcQUbao/uo7OawDhSmm8n6BCz9OjPxH8ocBXnhD+AYCo+0UoyetjsOtqCg1aiiA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Ym-000894-GF; Sat, 18 Jan 2025 03:52:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 06/10] gnu: retroarch-minimal: Update to 1.20.0. 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: Sat, 18 Jan 2025 08:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719030631204 (code B ref 75619); Sat, 18 Jan 2025 08:52:04 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:51:46 +0000 Received: from localhost ([127.0.0.1]:40053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4YT-000878-DC for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:46 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]:51417) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4YG-00085i-Cp for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:33 -0500 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-216634dd574so35288095ad.2 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190285; x=1737795085; darn=debbugs.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=zBfrtZOYqT+Ea7QRXWUHU0d3Xg+brr0doUtVfXj0Zmc=; b=hsHfFu+yRYH4fCcQXmg5qyF22/DUXZHkOat9DJ/fe+NN/XjFF0usQaZ477032Ndp8U kNCizIqNUprqh/HU7vTQBSMbtib85P9dYifKWIjOONK+4xwsbJcJRxRCiqwEljWCGBGD rMc9x7oRV+UV85I4cG2W3KsrTMYxwjjp8wV4Sl+AVPRB7V7KVNqVHTZfQh/Kcb3Hl/Tb NKa8C9fEnshW9mxGp/YmGlCZwG1s2IE4Ooz3XKuidTNIqBbgf9wXe37UrqNqY0D6/QoR btEC22BNDTL8OUAyf/EI2ysmGhxGfVJTZGrhXkLanvEHcU2Oi3Hvpy0nyfe9+cAGQ88z bbnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190285; x=1737795085; 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=zBfrtZOYqT+Ea7QRXWUHU0d3Xg+brr0doUtVfXj0Zmc=; b=fTHnkXaVtOWhsuV+simF3441Rp3OUas21YlBLk+eE0+MiWUvC5u+dfdFLNwkbKCuZi V96/byMe5kWQ4RpVhS3bhn2vKm6K2wjKY1Sg8gXZz8L2BCT+DkTrWQPR7fMH1SatpKTB f/jMA5xuAX2h33MWtGKi0HMeZ+TLZGTY2rcGm6bIcx4ftbxK0Tk7pjt6agFXyDb44Ame 0P6jKdcm1biqDlgmA7yLi3vjWQDC1I7Tl+1UFsRHsRj3PyBp1p3Ue0lm6nzv8SddWUiQ eLAGuwlhuZ5jJFkWjfkYLpvBxx9cXyiDrfMiH1RviGovVfLN9az351CSIx4LXBr3m+cD 3JKA== X-Gm-Message-State: AOJu0YxE8yZEoQS3U9PM/pOU9mmxHRXMRWCSbFiqKJnj/54M36bO6vGg 2UgRqipzUoVSDRYaNGo26C4eXl1vrehpUaEV2clXiRIPj/Gy8Ttuepa6+ibwwhY= X-Gm-Gg: ASbGncsX/EUD18lNwWBiiULxAYmXmLYjqk5yQWzQQYFVUOAyXrgRKfYTZOXg3tPJg3q 45GxNyQxnbhacRlbKNK+SVEPHfAl6sF48ApDPIHY39ZOz/BAqJjC1iSuaVSCZmjK4vI2m1Q1Fnj Hmjg17Iuy4bRpHDaB5NPGyOif0Tbth/Cmk7T7VQubPzzCSpZJ/D5HNPwLz486O0U9TO1Cy+i1gI ab6/hfl81aNTltoyUdJHG/T1bFNpAzpMhBNI7wtkpuHf2mQk48F90F7dW2NK0sTLeOFAtCSoMq5 x8bzytMaU47p X-Google-Smtp-Source: AGHT+IHUw1EOy9uXw2F3tSl5ZEB8jzElO8zhRnTU7pDDiluMCU0F0XIr2+IYEmj8l2PjdEPCZf2bww== X-Received: by 2002:a17:903:1c7:b0:215:b75f:a18d with SMTP id d9443c01a7336-21c351bd440mr81038115ad.11.1737190285367; Sat, 18 Jan 2025 00:51:25 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:24 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:50 +0900 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> References: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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 (retroarch-minimal): Update to 1.20.0. Change-Id: I3b4121d2520ee08a9d8454f2666ed30c140ced5b --- gnu/packages/emulators.scm | 334 ++++++++++++++++++------------------- 1 file changed, 166 insertions(+), 168 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 242c1fa03b..0cfce8a924 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2536,181 +2536,179 @@ (define-public libretro-slang-shaders license:unlicense))))) (define-public retroarch-minimal - (let ((commit "48b71d5cf8a070e785e2302d8fe241a7c2180fdd") - (revision "1")) - (package - (name "retroarch-minimal") - (version "1.19.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libretro/RetroArch") - (commit commit))) - (snippet - #~(begin - (use-modules (guix build utils) - (ice-9 ftw) - (srfi srfi-26)) - ;; XXX: 'delete-all-but' is copied from the turbovnc package. - (define (delete-all-but directory . preserve) - (define (directory? x) - (and=> (stat x #f) - (compose (cut eq? 'directory <>) stat:type))) - (with-directory-excursion directory - (let* ((pred - (negate (cut member <> (append '("." "..") preserve)))) - (items (scandir "." pred))) - (for-each (lambda (item) - (if (directory? item) - (delete-file-recursively item) - (delete-file item))) - items)))) - ;; Remove as much bundled sources as possible, shaving off about - ;; 65 MiB. - (delete-all-but "deps" - "feralgamemode" ;used in platform_unix.c - "mbedtls" ;further refined below - "yxml") ;used in rxml.c - ;; This is an old root certificate used in net_socket_ssl_mbed.c, - ;; not actually from mbedtls. - (delete-all-but "deps/mbedtls" "cacert.h"))) - (patches (search-patches "retroarch-improved-search-paths.patch" - "retroarch-unbundle-spirv-cross.patch")) - (file-name (git-file-name name version)) - (sha256 - (base32 "13hgg4pxkpwlcmmyp9npr9k9cb94waqiyjpy2jzs8m9rc7xl2ap9")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ; no tests - #:phases - #~(modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs #:allow-other-keys) - ;; Hard-code some store file names. - (substitute* "gfx/common/vulkan_common.c" - (("libvulkan.so") - (search-input-file inputs "lib/libvulkan.so"))) - (substitute* "gfx/common/wayland/generate_wayland_protos.sh" - (("/usr/local/share/wayland-protocols") - (search-input-directory inputs "share/wayland-protocols"))) + (package + (name "retroarch-minimal") + (version "1.20.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libretro/RetroArch") + (commit (string-append "v" version)))) + (snippet + #~(begin + (use-modules (guix build utils) + (ice-9 ftw) + (srfi srfi-26)) + ;; XXX: 'delete-all-but' is copied from the turbovnc package. + (define (delete-all-but directory . preserve) + (define (directory? x) + (and=> (stat x #f) + (compose (cut eq? 'directory <>) stat:type))) + (with-directory-excursion directory + (let* ((pred + (negate (cut member <> (append '("." "..") preserve)))) + (items (scandir "." pred))) + (for-each (lambda (item) + (if (directory? item) + (delete-file-recursively item) + (delete-file item))) + items)))) + ;; Remove as much bundled sources as possible, shaving off about + ;; 65 MiB. + (delete-all-but "deps" + "feralgamemode" ;used in platform_unix.c + "mbedtls" ;further refined below + "yxml") ;used in rxml.c + ;; This is an old root certificate used in net_socket_ssl_mbed.c, + ;; not actually from mbedtls. + (delete-all-but "deps/mbedtls" "cacert.h"))) + (patches (search-patches "retroarch-improved-search-paths.patch" + "retroarch-unbundle-spirv-cross.patch")) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yc16j3g2g0if64xqd7qr4dza8rw10x0zypwbl92y735825p87qi")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda* (#:key inputs #:allow-other-keys) + ;; Hard-code some store file names. + (substitute* "gfx/common/vulkan_common.c" + (("libvulkan.so") + (search-input-file inputs "lib/libvulkan.so"))) + (substitute* "gfx/common/wayland/generate_wayland_protos.sh" + (("/usr/local/share/wayland-protocols") + (search-input-directory inputs "share/wayland-protocols"))) - ;; Without HLSL, we can still enable GLSLANG and Vulkan support. - (substitute* "qb/config.libs.sh" - (("[$]HAVE_GLSLANG_HLSL") "notcare")) + ;; Without HLSL, we can still enable GLSLANG and Vulkan support. + (substitute* "qb/config.libs.sh" + (("[$]HAVE_GLSLANG_HLSL") "notcare")) - ;; The configure script does not yet accept the extra arguments - ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. - (invoke - "./configure" - #$@(if (string-prefix? "armhf" (or (%current-target-system) - (%current-system))) - '("--enable-neon" "--enable-floathard") - '()) - (string-append "--prefix=" #$output) - ;; D-Bus support is required for 'suspend screensaver' option - ;; to work. - "--enable-dbus" - ;; Non-free software are available through the core updater, - ;; disable it. See . - "--disable-update_cores" - "--disable-update_core_info" - "--disable-online_updater" - ;; The assets are provided via the `retroarch-assets' package. - "--disable-update_assets" - "--disable-builtinmbedtls" - "--disable-builtinbearssl" - "--disable-builtinzlib" - "--disable-builtinflac" - "--disable-builtinglslang" - "--disable-builtinspirv_cross" - ;; These are disabled to avoid requiring the bundled - ;; dependencies. - "--disable-7zip" - "--disable-cheevos" - "--disable-crtswitchres" - "--disable-discord" - "--disable-dr_mp3" - "--disable-ibxm" - "--disable-stb_font" - "--disable-stb_image" - "--disable-stb_vorbis" - "--disable-xdelta")))))) - (native-inputs - (list pkg-config - wayland-protocols - which)) - (inputs - (list alsa-lib - dbus - eudev - ffmpeg - flac - fontconfig - freetype - glslang - libxinerama - libxkbcommon - libxml2 - libxrandr - libxv - mbedtls-lts - mesa - openal - openssl - pulseaudio - python - qtbase-5 - sdl2 - spirv-cross - spirv-headers - spirv-tools - v4l-utils - vulkan-loader - wayland - zlib)) - (native-search-paths - (list (search-path-specification - (variable "LIBRETRO_DIRECTORY") - (separator #f) ;single entry - (files '("lib/libretro"))) - (search-path-specification - (variable "LIBRETRO_ASSETS_DIRECTORY") - (separator #f) ;single entry - (files '("share/libretro/assets"))) - (search-path-specification - (variable "LIBRETRO_AUTOCONFIG_DIRECTORY") - (separator #f) ;single entry - (files '("share/libretro/autoconfig"))) - (search-path-specification - (variable "LIBRETRO_DATABASE_DIRECTORY") - (separator #f) ;single entry + ;; The configure script does not yet accept the extra arguments + ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase. + (invoke + "./configure" + #$@(if (string-prefix? "armhf" (or (%current-target-system) + (%current-system))) + '("--enable-neon" "--enable-floathard") + '()) + (string-append "--prefix=" #$output) + ;; D-Bus support is required for 'suspend screensaver' option + ;; to work. + "--enable-dbus" + ;; Non-free software are available through the core updater, + ;; disable it. See . + "--disable-update_cores" + "--disable-update_core_info" + "--disable-online_updater" + ;; The assets are provided via the `retroarch-assets' package. + "--disable-update_assets" + "--disable-builtinmbedtls" + "--disable-builtinbearssl" + "--disable-builtinzlib" + "--disable-builtinflac" + "--disable-builtinglslang" + "--disable-builtinspirv_cross" + ;; These are disabled to avoid requiring the bundled + ;; dependencies. + "--disable-7zip" + "--disable-cheevos" + "--disable-crtswitchres" + "--disable-discord" + "--disable-dr_mp3" + "--disable-ibxm" + "--disable-stb_font" + "--disable-stb_image" + "--disable-stb_vorbis" + "--disable-xdelta")))))) + (native-inputs + (list pkg-config + wayland-protocols + which)) + (inputs + (list alsa-lib + dbus + eudev + ffmpeg + flac + fontconfig + freetype + glslang + libxinerama + libxkbcommon + libxml2 + libxrandr + libxv + mbedtls-lts + mesa + openal + openssl + pulseaudio + python + qtbase-5 + sdl2 + spirv-cross + spirv-headers + spirv-tools + v4l-utils + vulkan-loader + wayland + zlib)) + (native-search-paths + (list (search-path-specification + (variable "LIBRETRO_DIRECTORY") + (separator #f) ;single entry + (files '("lib/libretro"))) + (search-path-specification + (variable "LIBRETRO_ASSETS_DIRECTORY") + (separator #f) ;single entry + (files '("share/libretro/assets"))) + (search-path-specification + (variable "LIBRETRO_AUTOCONFIG_DIRECTORY") + (separator #f) ;single entry + (files '("share/libretro/autoconfig"))) + (search-path-specification + (variable "LIBRETRO_DATABASE_DIRECTORY") + (separator #f) ;single entry (files '("share/libretro/database/rdb"))) - (search-path-specification - (variable "LIBRETRO_SYSTEM_DIRECTORY") - (separator #f) ;single entry - (files '("share/libretro/system"))) - (search-path-specification - (variable "LIBRETRO_VIDEO_FILTER_DIRECTORY") - (separator #f) ;single entry - (files '("share/libretro/filters/video"))) - (search-path-specification - (variable "LIBRETRO_VIDEO_SHADER_DIRECTORY") - (separator #f) ;single entry - (files '("share/libretro/shaders"))))) - (home-page "https://www.libretro.com/") - (synopsis "Reference frontend for the libretro API") - (description - "Libretro is a simple but powerful development interface that allows for + (search-path-specification + (variable "LIBRETRO_SYSTEM_DIRECTORY") + (separator #f) ;single entry + (files '("share/libretro/system"))) + (search-path-specification + (variable "LIBRETRO_VIDEO_FILTER_DIRECTORY") + (separator #f) ;single entry + (files '("share/libretro/filters/video"))) + (search-path-specification + (variable "LIBRETRO_VIDEO_SHADER_DIRECTORY") + (separator #f) ;single entry + (files '("share/libretro/shaders"))))) + (home-page "https://www.libretro.com/") + (synopsis "Reference frontend for the libretro API") + (description + "Libretro is a simple but powerful development interface that allows for the easy creation of emulators, games and multimedia applications that can plug straight into any libretro-compatible frontend. RetroArch is the official reference frontend for the libretro API, currently used by most as a modular multi-system game/emulator system.") - (license (list license:gpl3+ ;for RetroArch itself - license:asl2.0 ;SPIRV-Cross - license:expat ;yxml - license:bsd-3))))) ;feragamemode + (license (list license:gpl3+ ;for RetroArch itself + license:asl2.0 ;SPIRV-Cross + license:expat ;yxml + license:bsd-3)))) ;feragamemode (define-public retroarch (package From patchwork Sat Jan 18 08:50:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37133 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 1B74327BBEA; Sat, 18 Jan 2025 08:52:31 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 5EB0127BBE9 for ; Sat, 18 Jan 2025 08:52:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Yz-0003RT-SM; Sat, 18 Jan 2025 03:52:17 -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 1tZ4Yo-0003O7-PJ for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:07 -0500 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 1tZ4Yo-0007dX-Gf for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:06 -0500 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=+54T2uh7K3w3LYuIJp440A+jrZnN/mYQIUv6KdtIagg=; b=HBCYMOG0L01t29nij57g4bFat0IOG7Zk24f7e/i8wRrdxovQmi/tyuC9jFsGgJtFbVUCgLAjMlHj1hUWriwN1K1PC9UecoazO/q5++zkmp7qyhkCqKgwPRbxgc9LRLMLvasKP6qbmJVEJujZnXUjxORuMmTYm935rUIbwOlvw+uOJqfYEXsjrqPdDVfmhtik3jlK9TDyM9TOQlhC/ZPscXl3WYjBmBbNAD8VqeNZTSDjp4U0s/m5vul7mmornGWx8Ub8mJfmkPuRy4w/zDFg9bQDkP6g0mBsCylj/aZzvRb8Ew532IyUqUPpZ3hXdio99igIkgajQpknyShU41JZ0g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Yn-00089G-08; Sat, 18 Jan 2025 03:52:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 07/10] gnu: retroarch-core-info: Update to 1.20.0. 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: Sat, 18 Jan 2025 08:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719031231218 (code B ref 75619); Sat, 18 Jan 2025 08:52:04 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:51:52 +0000 Received: from localhost ([127.0.0.1]:40055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4YZ-00087S-H2 for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:51 -0500 Received: from mail-pl1-x62a.google.com ([2607:f8b0:4864:20::62a]:52550) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4YI-00085u-Cd for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:34 -0500 Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-21661be2c2dso56001355ad.1 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190287; x=1737795087; darn=debbugs.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=+54T2uh7K3w3LYuIJp440A+jrZnN/mYQIUv6KdtIagg=; b=SAcfCgrv8jqgH8uUXgpcetEF2dtvjBRz3YkJp+yc1xdEjOvQdgLup5a1fkJCzZm61f qhOUYm7yXvbx2+6JliLs5Fo3dXRM+6AiBRZ/ndZcaSSKp1hvoScTjncIeIwPza8El8xy GLzwpbKBPn7gkKbZk3dD5mTIh8ykYpEcmRRAx1zkQa4Osmtk5ESM18ecNx53GdW2rngz Zz6ZXPc5xFsey4wEZx8lRCJxTWLpqI/REt3LvyqqFDhhHJWihzCTzLC3HraT0Du1Hft8 rLfc/N6weoaeiL+blpUEBD2M9WAWw2rlpMldYeYJVgVxqJtbfDtgIV/UrdSq03BJGDDd fqIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190287; x=1737795087; 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=+54T2uh7K3w3LYuIJp440A+jrZnN/mYQIUv6KdtIagg=; b=K5ZHYm/Fckco7Xad89+tC9fRdCOtUOichN3vsgNwYgoKV7Yk+OMCagTPhE1uI9i9ff UDohfPXy0bBQZMaH9VHHLk1zNtOtnB0XzHV6e7oCqNi+YANz+rWYghQlFnu1b3DtGrfv YV9jt2WuV2Nhv8spe4p3IisMzqcvbPrI4wUsD6VDKy7gH7Gsoc8G9ecF4DECNWrj6ctn Qw+m8/AghUt+ScbtzB5z6s0d9rj/QRdW7xUGmp3AQ8/qxnh8z0TERRWuv1zsCngeYI12 51+efpLIjq8jwlXM9x5JuawL9AoX/BUdzHKaN0GauqbLE0AO0aMXA37u7X8jqdp3sQ94 iSUA== X-Gm-Message-State: AOJu0Yx1zSBggFlyY5oS8DudSlfXGhrHIqtDVWnIWJIMYBISYxMp9Dzd 7NJ/lyHRB8vm+jUVyaei1XZJ6TrPHyuatLr+M8vOvphcK0QBwf2OhdEFR0n6T8k= X-Gm-Gg: ASbGncv9XzZ0Wwn1q4BWinEVnDZBeIPGrplfJmH7057K2CZ2fGuqFmqWVtJ9rNxBsqb /Ixp4Eo82Ua03v82d+JkdbRBP8e3Y18lZjGYiT1GpEUaHgDvGfzB4tFFXeNxa1AGnvgBcMhy1nI hhRxyrbYNaWYxHt4yFzl+H0mdMtaNFMrX3HU6Ihuh0XRQFSS1c1vQAvazCRKEjUI406BA+L0XDh 3XeKM8G1FjGN/TRWv5dc14Z6xh6gJAs1BC/DK9MBPy650IMDppXwBrnS+1rd0MCDgFcXRzgcEzj I9uwxdhzOz6e X-Google-Smtp-Source: AGHT+IGhmgukuos0Yd3/Z/YALl9M6l9qE8vfI6NjedFXf2s6WjNNntZ5r13JkcOd9Pb8UL5EM1HEfg== X-Received: by 2002:a17:902:e80a:b0:216:6769:9ed7 with SMTP id d9443c01a7336-21c355c7dc2mr91654525ad.40.1737190287379; Sat, 18 Jan 2025 00:51:27 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:26 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:51 +0900 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> References: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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 (retroarch-core-info): Update to 1.20.0. Change-Id: I85eec43eedf24df44b5d486a2410652ad87536db --- gnu/packages/emulators.scm | 43 ++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 0cfce8a924..bcc078aa8b 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1779,31 +1779,28 @@ (define-public retroarch-assets (license license:cc-by4.0))) (define-public retroarch-core-info - ;; Use the latest commit, to get recent additions such as bsnes-jg. - (let ((commit "c0e7b76d02504754de67a1318f93089f1e29f15f") - (revision "0")) - (package - (name "retroarch-core-info") - (version (git-version "1.19.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/libretro/libretro-core-info") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11xpy3zhy2smp4a70fc0r1b76mvmjyabkaaipifsxm3j25drki5z")))) - (build-system copy-build-system) - (arguments - (list #:install-plan #~'(("." "lib/libretro/" - #:include-regexp ("\\.info$"))))) - (home-page "https://github.com/libretro/libretro-core-info") - (synopsis "Libretro core info files") - (description "This is a versioned snapshot of the files containing + (package + (name "retroarch-core-info") + (version "1.20.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libretro/libretro-core-info") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rfvp0lkv99jgpfyb9pp6vrh1i1974p3lckh93y1bibdizyxmwjg")))) + (build-system copy-build-system) + (arguments + (list #:install-plan #~'(("." "lib/libretro/" + #:include-regexp ("\\.info$"))))) + (home-page "https://github.com/libretro/libretro-core-info") + (synopsis "Libretro core info files") + (description "This is a versioned snapshot of the files containing metadata about each known libretro core. The snapshot is taken from the @url{https://github.com/libretro/libretro-super, libretro-super} repository.") - (license license:expat)))) + (license license:expat))) (define-public retroarch-joypad-autoconfig (package From patchwork Sat Jan 18 08:50:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37135 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 D14BB27BBEA; Sat, 18 Jan 2025 08:52:40 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 62AD927BBE2 for ; Sat, 18 Jan 2025 08:52:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Yt-0003Pt-OB; Sat, 18 Jan 2025 03:52:11 -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 1tZ4Yo-0003O6-FE for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:07 -0500 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 1tZ4Yo-0007dQ-6h for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:06 -0500 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=Yprgy5bbHjJ7ZFI75QY1xsz95TBZidccJbKk6/aOIuE=; b=bRdquxGCclxuKr7unrV5KeMvh3odoYdy0PXIX5w4/p84ZovC4eZWhVGuw3gTF14DbpNWLjvoGMLMHMrKtBV1rEAmH6tEDzKjijsjR2AilqmuKxft/J/it6noUvHFWBwMqCarMyifTHi2m3757edNlx2OKwH+SOTDNf74kS/52MNp+Q/hT9UgbVJzHgqIPikgpdEq/jLXM3gwsULrBIbB2fA/K9UjgNL9yNtJ3MNvlP/E5V3dgJT9u71lTvn1L+9mmb57Wfy2uOofOq5FceYcOk07qu6LP6kCKH5QebP9F13ImkD8EXLrpP2aUQcjFNC3tWHJFRa4OK8Ll1qAY1cNaA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Yn-00089O-Fs; Sat, 18 Jan 2025 03:52:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 08/10] gnu: retroarch-core-info: Rename to libretro-core-info. 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: Sat, 18 Jan 2025 08:52:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719031231228 (code B ref 75619); Sat, 18 Jan 2025 08:52:05 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:51:52 +0000 Received: from localhost ([127.0.0.1]:40057 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4Ya-00087Z-5g for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:52 -0500 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:42120) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4YK-00085x-Bw for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:36 -0500 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-216395e151bso40407185ad.0 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190289; x=1737795089; darn=debbugs.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=Yprgy5bbHjJ7ZFI75QY1xsz95TBZidccJbKk6/aOIuE=; b=MHwW2IBvSSLWtx1ixmB2rI3N4Tkbmu4Vb8vdn03PzWOZhfyYTGDxRQL69RCmJ1HuEY oGnyBO6JvcR0qHaEMgvvmJeJj+UgNrd+gIj46hcDjGlbiw5ttP/1VGKOtV9FEsXvKfOV qXHIhTg2fpfOnNfcs6Z4BzPFyPw0bBkdPHv7dUs3UuNmcv5If7KiFUKlwdg92lDvLYz0 FKHMMe0Scy8G22OxLzrVEKHdgY25yTnJYcocsnCPEnfYzVjFgztC0cDgIiab/L3GcH5/ EH6ITl3ij8YWk1i7NQuchZQfpieh/hF0ntFKKr79rvG9s2LJei68De1YA5HBrp7xGJUo OSeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190289; x=1737795089; 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=Yprgy5bbHjJ7ZFI75QY1xsz95TBZidccJbKk6/aOIuE=; b=bXVSKGjydVfHzUFtK8j8l4sMnmufQ95ZfJhISh2pnaFVNqiKmRJAcG9KvNE5DHlAGk KTMOJ1APmo0wWaa4zGdsVhmOS7mHvayDbOkxd7YZVgyH+YBxPk8973sZKcJjbsu0yO7d BMsUgxUkQ/FYUKe4dCFAvnUlf8GYSEzjWja0f5j1aucN3LFbZQ3gK1P7TXqprKRAwTNO qMJmVXdh18Hke3ApvLV/aQgAZBE+DIKo4dBTEPJA5x38BcHggU8xd0e6n9uRd6TdG4KA 0AlMUOADIXhqVuh3Y5kRJktG5DYZc45drGludGOxDo4VKA/IsWXqget6VWC0/0tJZjgC jRTg== X-Gm-Message-State: AOJu0YwTu3KtI+Bx1K1wxiYGdBSeFlFJbIl6hQirveOBSkiTvrrJ671m n4Juae2V9CYVHffVP1aIj2E8dACsCV7dzhj1knSP7tB9wRVmT3ZlvcgfcXfL/1g= X-Gm-Gg: ASbGncuYzen65+Sz8hcjzZMxy94+PvmoJNuotUUjUM4Ax1gQGGU1RucnuyXe/LIow+N bdffUAcPQhut86smT2bs2AhJPULQwWWpV8MboL4y8dLnpoNC1fCxz/T8MwZL08TOTFyWAF8CtD7 LrACuPsMYlEORft45LbjYqqt6cxIfjBKcQRwNAQJ2XpxUWNB5q/vrqeS+mBQ5OdBOGYSOoq23Xo BD7+X1rH6wwdK1HeZqhUA9HlXmJgBfvLONEv+rLaXQsYxcYPuJ9fsK4blo+P9CG9kWGn12rhvP9 ao3SYC9yDgNO X-Google-Smtp-Source: AGHT+IE9tfhzSjinWVhqZe8HZlzPlE5AL32LXZaXgJ9skUc4EWIIbhhUzmcwpxSbjyQPuJv5hBDXNw== X-Received: by 2002:a17:903:238e:b0:216:311e:b1c4 with SMTP id d9443c01a7336-21bf029e049mr185200185ad.4.1737190289380; Sat, 18 Jan 2025 00:51:29 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:28 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:52 +0900 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> References: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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 This is to match the upstream name. * gnu/packages/emulators.scm (retroarch-core-info): Rename to... (libretro-core-info): ... this, and mark the previous name as deprecated. (retroarch): Adjust accordingly. Change-Id: I634f4b2ecc6d798b8a5386d9449fd32945453844 --- gnu/packages/emulators.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index bcc078aa8b..d0c52ce2b6 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1778,9 +1778,9 @@ (define-public retroarch-assets generate the various User Experience (UX) environments.") (license license:cc-by4.0))) -(define-public retroarch-core-info +(define-public libretro-core-info (package - (name "retroarch-core-info") + (name "libretro-core-info") (version "1.20.0") (source (origin (method git-fetch) @@ -1802,6 +1802,9 @@ (define-public retroarch-core-info @url{https://github.com/libretro/libretro-super, libretro-super} repository.") (license license:expat))) +(define-public retroarch-core-info + (deprecated-package "retroarch-core-info" libretro-core-info)) + (define-public retroarch-joypad-autoconfig (package (name "retroarch-joypad-autoconfig") @@ -2721,7 +2724,7 @@ (define-public retroarch ;; which is problematic. The environment variables overrides the ;; configuration file values. retroarch-assets - retroarch-core-info + libretro-core-info retroarch-joypad-autoconfig)))) (define-public wasm4 From patchwork Sat Jan 18 08:50:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37140 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 0092127BBEA; Sat, 18 Jan 2025 08:53:00 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 7AE0727BBE2 for ; Sat, 18 Jan 2025 08:53:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Yv-0003Qe-LG; Sat, 18 Jan 2025 03:52:13 -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 1tZ4Yr-0003Oa-4j for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:09 -0500 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 1tZ4Yp-0007e7-V3 for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:08 -0500 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=I7iXN1/x6P9g206gqVRtmcdEl2bUG5FOst+JUKxhQBA=; b=QdBauaf+5xpSCFbVdpcaIwSbi2jcpF8gtz4J/+EAcxG6U/bxwZFgmJPYoD5cpGGAMMek7pnpC9TkUuw/QjO9bQKQYTaK7Pk5rZzP/Ayb0RPpXmXBkr/ncd7jL1d+R8pVDeR1fFEkZw78fYXV1ehBD2IufbTsB4xwDluXbWdI/agz0UOnvR6DHpy2lBhRyyRgw72JDS9O5W81zo4Kbk35CU51CkYCPUcUptVGxLEA+np49ATepTceOVsQiDfQMDhvf7jr0r3rwFBWkTt2km3089xmD4g+kOh8Ozd2t8WywXA1NeIjfV12ZxqNJ3ZtJSNOS6Rh9lQGvhsMiWJ54f1WSg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Yo-00089X-18; Sat, 18 Jan 2025 03:52:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 09/10] gnu: Add libretro-database. 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: Sat, 18 Jan 2025 08:52:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719031331235 (code B ref 75619); Sat, 18 Jan 2025 08:52:05 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:51:53 +0000 Received: from localhost ([127.0.0.1]:40059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4Ya-00087c-HI for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:53 -0500 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:53564) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4YM-00086L-AZ for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:38 -0500 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-21619108a6bso51008445ad.3 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190291; x=1737795091; darn=debbugs.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=I7iXN1/x6P9g206gqVRtmcdEl2bUG5FOst+JUKxhQBA=; b=bvHjoLOzPcaLXiov8iXCCauC4PqNFGhqZ8Id9pYQXOu/WogbTj1WUhcixgCtQK7UXs W6iEt08gZNk9lzA3Sc8TZ8V6WFqq2OFARZ+GFHFzIm1akLerXKmJlRyQXnRMPkqg1eEX Y2uq7RnyUre5KFlN6GbVUiqaIhPwkKlbIArNe0NivHlCdDFjCwsN8BnPORtK9np8R9PG N2RZ5LSvuCvQTPgN1cj+eg3JwYjrp8I+Oh2fbsVE8jtfkGkB6GVrqWUX9e7bXiQ9uDw5 K2fd0wB5IrZrhhZpdTZQcajaLxDKu3g1uvuteFeGzrJ2JQMqWRsvmc/xsQ/a+uRFhkAV F1SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190291; x=1737795091; 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=I7iXN1/x6P9g206gqVRtmcdEl2bUG5FOst+JUKxhQBA=; b=qzpIVyREcizI+bkSztaOGUiBiiDsJ3LUkh+BlGYlnSfAzIqJtww/IKKu/h5CtvqhyB UaugA2WY9imSBkyGl6npiPIP8g32uPbyDPR3bnqWUyfw7KpZk1To/8X+hKr0wHYNVzL+ xBO+AUd9KD3M6rKS6jQH5iNCA0jNazjN0aDKEo08qayh2kI7rMRrnfB4R++yo69O8KKU b3UlH6KAvEB2vumIPsyB4Y2o8qi3Qsw1K2/j92ZJoxgUiebvhGjoWWz9VZstb9BIj4Pv 1025jmjI+legmMbhCFnxk/M5kOUsq/dwu0Ch/jbL1p2Twz5PYRuLf37oRHyfW6abhPnK gQTw== X-Gm-Message-State: AOJu0YxIT3R1Ttd5FEPYZ9vEDxDipPCHfnyAC1qYO0CZiBXUggqlHA1V iiVqYg+ESyuAFQvLbQviY3HHL9uzyPgv+i0gX2KIXTJm4P3eC8gRsIIssrxP8xI= X-Gm-Gg: ASbGncs+dYUaTxofrjpK2FMZCo0DHGxsigc7ShXKO8hO5GhWz5pHr0nMjidM5bTPjfo xsYv8yr41M4sC+ejU+fUWbtL/qCabp8wXiyj0vWuD2niwm/S9TIIA6VhNPXrTtzYiEvERKh41tz WW1xUWUH1hr3SQZZCgOjbgGFuvLjHt4Tc9x3pVqnrSRHRftsn5TkCCi36b2tSQ8m/3p51FRhyEb QDRrj0GAlYV6iqXNbVrsLqWcFQ5nPjCQeI9kjje1HidA6IhKlIAcHyuHjjzzsHBqMMTQZn97zfk fx1oWTJnD4GC X-Google-Smtp-Source: AGHT+IEWLFcZjS9RJpmUU9e5vtccExwtvFCGUky6A62MMTuCGqCH98ep7kXLrd1DvsO8QCtk4YuyQg== X-Received: by 2002:a17:903:1ca:b0:216:282d:c692 with SMTP id d9443c01a7336-21c355a4923mr82171225ad.34.1737190291410; Sat, 18 Jan 2025 00:51:31 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:30 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:53 +0900 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> References: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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 (libretro-database): New variable. Change-Id: I97b10abf9b2984cf2a622517b3c794474e98a3d0 --- gnu/packages/emulators.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index d0c52ce2b6..898eb1c587 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1805,6 +1805,44 @@ (define-public libretro-core-info (define-public retroarch-core-info (deprecated-package "retroarch-core-info" libretro-core-info)) +(define-public libretro-database + (package + (name "libretro-database") + (version "1.20.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libretro/libretro-database") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "086a9grpd1irsdns2zx3hlna72bbrmsfra4r498wi4ia9zf8nb0p")))) + (build-system gnu-build-system) + (arguments (list #:tests? #f + #:make-flags #~(list (string-append "PREFIX=" #$output)))) + (home-page "https://github.com/libretro/libretro-database/") + (synopsis "Cheat codes and content data files for RetroArch") + (description "RetroArch incorporates a ROM scanning system to +automatically produce playlists. Each ROM that is scanned by the playlist +generator is checked against a database of ROMs that are known to be good +copies. The various directories contain: +@table @code +@item cht +Cheat codes for various games +@item cursors +Methods for querying the playlists +@item dat +Customized DAT files, maintained by the libretro team +@item metadat +Different metadata and third-party DATs available to the system +@item rdb +The compiled RetroArch database files +@item scripts +Various scripts that are used to maintain the database files. +@end table") + (license license:cc-by-sa4.0))) + (define-public retroarch-joypad-autoconfig (package (name "retroarch-joypad-autoconfig") From patchwork Sat Jan 18 08:50:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 37139 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 9E7EA27BBEA; Sat, 18 Jan 2025 08:52:57 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 66DE527BBE2 for ; Sat, 18 Jan 2025 08:52:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tZ4Z4-0003SK-K5; Sat, 18 Jan 2025 03:52:23 -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 1tZ4Yp-0003O9-4R for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:07 -0500 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 1tZ4Yo-0007dk-Q3 for guix-patches@gnu.org; Sat, 18 Jan 2025 03:52:06 -0500 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=uvbsxZb8F6HXNJwyqe76QfMnIC5JoA12N8NVa7VwaSU=; b=v1v/r4kYQdUm8p7IpEHvtK8wEE/33hbLCWqzacKfoYbwZgh1cVLoNoXrkMgWOzLUW7P1sSpwqDvGdxqOdjo7TJLdnHNPRhnE0CdVLwmvn9UbcCQLMUizYMMtX5e2ftJFx9DbXoVnKKLoca0jPkkg0TpTmZkZFRckDPNK5O+bdgvR1vgow30wei9QPtwg4iPsy/FUyHGYTZHYvWla6Qi7u1UHvphj0fPOPvojMUhy/d+M9DN64lh0xfBFktys9aVkiT84lSc69leW7DJ6RqERV74uyvib10FA2YcBU0yysNIqxKr4m2jrzkO2DAuBOq/JAdeZey3asa9md2ROi+X48Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tZ4Yo-00089l-Ld; Sat, 18 Jan 2025 03:52:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75619] [PATCH v2 10/10] gnu: retroarch: Propagate libretro-database. 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: Sat, 18 Jan 2025 08:52:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75619@debbugs.gnu.org Cc: Maxim Cournoyer , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 75619-submit@debbugs.gnu.org id=B75619.173719032331297 (code B ref 75619); Sat, 18 Jan 2025 08:52:06 +0000 Received: (at 75619) by debbugs.gnu.org; 18 Jan 2025 08:52:03 +0000 Received: from localhost ([127.0.0.1]:40063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tZ4Yl-00088W-Aq for submit@debbugs.gnu.org; Sat, 18 Jan 2025 03:52:03 -0500 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:53500) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tZ4YO-00086c-Cy for 75619@debbugs.gnu.org; Sat, 18 Jan 2025 03:51:40 -0500 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-215770613dbso39210535ad.2 for <75619@debbugs.gnu.org>; Sat, 18 Jan 2025 00:51:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737190293; x=1737795093; darn=debbugs.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=uvbsxZb8F6HXNJwyqe76QfMnIC5JoA12N8NVa7VwaSU=; b=RQQCkuNcEFIetU+2rovx3l7/P+5Fzn0HlXwkqayqhQ0J1MwEHle7kGVwMagGGaPj3g MyVixleA1MleMbkdvqYaMhoV6Y6CjXMfd1BMazVws9MC0tXy8YeQMBbuixJN6eBvqE/k 3DV7XQ1UMA37DcEWFn/YcZ7k8KdMgbgpjcJbcqg0etfQk15UpphWMSHygORr1cq2JtSB 3/aI8xZfPFJ+NRGyPIztc/7s02dyfL3PEYqkYZLwlLLIbTinHPd5xq45TZA8vLoAx+2p UPFJc9DuEW+BdAJD6laXHA7Y6JcJLHN/HEXk0zDYI8y80Y/XmQtyavoB0ZT/1hQPqYa6 ZiPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737190293; x=1737795093; 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=uvbsxZb8F6HXNJwyqe76QfMnIC5JoA12N8NVa7VwaSU=; b=KWmQFpXiIB2EoZh+3DwbZp4Kbc9gmCl1F5QorajAZoS/owirbQDYUPgrmN0REGg9Qu lVrVN60jXDxt+kkJbo/Dvi92kAyU9WcZwRVHpNPSHpHsK/G9atxK+Fz5iHFxU2hSnkgp vtg35W1cCQ16EEq6XQqnivkdxESLV4j8e5ZE6weyy2wT58UGJZxKuzSK7i6T6PXFks83 R7eC+DD72kbe2ZmzUsxkxRipl/XNVXbPf2CDyNCR7Btfk7RaEl2qidC89Prj4x/UrRhl wBvKr3B+S33DuilGQ65+AVk0HC/JCkI1OemGquoQ6cyqkmyQd1xkCNYw2joOVbY7Xjw1 IzRg== X-Gm-Message-State: AOJu0YwKdiM72obbFQAyiogiyc3Sh4WkIkumeJi5xvXbC8aaXSwD82s4 yOD4hDZc6z7UkPcsK5Ys+ZbX7A9oocV6+9Bq3EiXiQssnG/dMx+AFEUQtRj9c0s= X-Gm-Gg: ASbGncucMXmrRQlhlSTvbTGRxVlo3KJZvC2NABNgSmDNIeXdUZGMiRionMtL8E2UMzb LKrZgH9sdYLnlAuuvlgDjbjWW+OiEea/NhqnU16FsXZHAKIjUmaT2KJAcbTPmQyTeJ1qcFajOfz pNlIVgTTlgoJgurirEyfJYv2SfkdiIqh7Qql55KRG6JAG7lRhuJAVya4QqLp1Sn99R7CMCc4Y/k sCc2Urvj3Uvaf9cyyk8kNHHiI7cmoCamoiY/ZNwl1ZqW8j4QIj9mCW77hnxiyxbhkh9iC+mc0rm GKx2pGNWsuny X-Google-Smtp-Source: AGHT+IHVpE8SAj/tCjXhvxMtYmEiIfsWyeqyZ/7AnYuyETykDvKAQQLqQMpIWHppFsOV/a8CSQ9dEw== X-Received: by 2002:a17:902:cec9:b0:216:5e6b:e23 with SMTP id d9443c01a7336-21c355644d3mr63145355ad.30.1737190293497; Sat, 18 Jan 2025 00:51:33 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2d401344sm27610225ad.205.2025.01.18.00.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Jan 2025 00:51:32 -0800 (PST) From: Maxim Cournoyer Date: Sat, 18 Jan 2025 17:50:54 +0900 Message-ID: <93aef7672edabd2cfd32275495d892511cf43f24.1737190254.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> References: <035ad50ab4e122c87225bd43e423fb17c75578e1.1737190254.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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: , 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 Otherwise, the search functionality of RetroArch would not work out of the box. * gnu/packages/emulators.scm (retroarch) [propagated-inputs]: Add libretro-database. Change-Id: I63edad8d3e886a2be2a2f4f48f59fb5cbbf239f8 --- gnu/packages/emulators.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 898eb1c587..210800363a 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2763,6 +2763,7 @@ (define-public retroarch ;; configuration file values. retroarch-assets libretro-core-info + libretro-database retroarch-joypad-autoconfig)))) (define-public wasm4