From patchwork Thu Sep 26 03:09:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 31463 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 1297927BBEA; Thu, 26 Sep 2024 04:18:09 +0100 (BST) 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_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 9189227BBE2 for ; Thu, 26 Sep 2024 04:18:08 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stf0c-00047a-Sp; Wed, 25 Sep 2024 23:17:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1stf0a-00046S-Oa for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:36 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stf0a-00080K-F3 for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=7zgr3H5f4cbqzp4urXoPT7CzwTwCVn41R8wYA8dHPNo=; b=tDEg7pU6TipxuCV74VGcemDFpR2nup+cNs9ZZNq4e4U8zjDEtRhzB2Dj1xd+keeVYr4IVg92Y9dT+9GDs2vZyKVYFHIK1uVa6Cp+oglzFEr0SOY7EOE2mXys/U0lxIBrCfkoSeBOj+dTzVt0JehWkhuPIFhGxibpiV9g2voZne6fhQ82udOafzqxhO112Xb0zlIQEDGhTNXC1Vm03jEsDkvGVjYtxumtJ+kALPGMLbbHLRMQktoeuKYeRg3zQOgigjFY68XVgYCraWKDunJNdM7PbPqsXpOpoMsghyCTMlQqnweKqIiPyL/MnICLX9lBHXp2ez66vWChTaxgcQOjYA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stf0z-0001Hf-V6 for guix-patches@gnu.org; Wed, 25 Sep 2024 23:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73488] [PATCH 1/7] gnu: bsnes: Remove input labels and use gexps. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Sep 2024 03:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73488@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 73488-submit@debbugs.gnu.org id=B73488.17273206284784 (code B ref 73488); Thu, 26 Sep 2024 03:18:01 +0000 Received: (at 73488) by debbugs.gnu.org; 26 Sep 2024 03:17:08 +0000 Received: from localhost ([127.0.0.1]:41849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf08-0001F5-8v for submit@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:08 -0400 Received: from mail-pl1-f173.google.com ([209.85.214.173]:61703) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf05-0001EI-KU for 73488@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:06 -0400 Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-20696938f86so3518915ad.3 for <73488@debbugs.gnu.org>; Wed, 25 Sep 2024 20:16:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727320532; x=1727925332; 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=7zgr3H5f4cbqzp4urXoPT7CzwTwCVn41R8wYA8dHPNo=; b=Qm6nmrWWcA1kWPR/nq8qj4ZBB6zSW1IM4U+ZhZtXgK2KfdCw8NKTSf62uIQNopI6rF XlyFWImV9YL+LMCpdfBnMZFHTcfKhOBfr/hKFKk/Y+EE+nOTbzZG0aBg0OL3Y/lU8Yyc 7lWH7lyfB9IuaDPQGvBX0BhQm8E+Gqg8/Kwh531E4OjM1qHo7689FKJHk4ki7z0uejrL 4ZBVpypsXujeslJRlznLIpk1j7gsCl++JMT1P1Rrtm/IUkXBO1SYig4cKhbqM9CySEDt I+RykOevFDOJLw9AOHDL2CDpT3R4xbZFiqwp9U9RtBe7MFCT6Lky6wTb1hqgOcsQODQE NEmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727320532; x=1727925332; 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=7zgr3H5f4cbqzp4urXoPT7CzwTwCVn41R8wYA8dHPNo=; b=NqIzQvoVm10WSTqBSjPZoJ2mmJRLBM4YDkKF0mVkRd7A9poujqoHR2oO7yrRm+0urq V0F30AHE5dxeBOLZ3pdu46V0o5yEkuP/Vv6wnxyxQUC25fEDKcjPAwzIG9k3AQPHdC07 sQEIRl/K1Ct5hq6sNgNL/QUMQzK2J/91XB+lqOG8M66WcQ9VqyX3+NSZsP1oRJjuUAds h9XItQK2A4X24jydXQ+WqS6eRKebokOzIMZ4mXep5gxriA3OafqG8pYXHAJH2Ewizb2D jJa7J1DHovedHyOiFdl5A+lHN+ZbfkRmAC6bAwIkGjyq9V8p7q1u8m885JlY+ewwyzUw hyLw== X-Gm-Message-State: AOJu0YzZLEGaPhvT6VDXZGKzyMFqYEtSMBNDOkVR1SPfi+ijCWS/zj04 aYpy4MjcnEf5pJwd5WSIKqGiXUKlKMFAOoGc5w80OFtr8Z9Rr4RJCvN9Ew== X-Google-Smtp-Source: AGHT+IFTgzx3TdS7AUgdoRq8NwDMWNyvZAZixIrzI5mHMg9dKTts0tAvgXF8SkIxiHRHPDZeposMyQ== X-Received: by 2002:a17:903:188:b0:206:b960:2e97 with SMTP id d9443c01a7336-20afc5e2c5amr55466585ad.45.1727320531648; Wed, 25 Sep 2024 20:15:31 -0700 (PDT) Received: from hurd.lan ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af17e0301sm29895875ad.156.2024.09.25.20.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 20:15:31 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 26 Sep 2024 12:09:55 +0900 Message-ID: <66b417534680e8e5a3c5587c40bd4d4f43fb8778.1727320201.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 (bsnes) [arguments]: Use gexps. [inputs]: Remove labels. [home-page]: Update URL. Change-Id: I69046d977c4647f46c1359d62b762149b8f70160 --- gnu/packages/emulators.scm | 43 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 4dc61bdbff..50a7b67121 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2230,31 +2230,30 @@ (define-public bsnes (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "0j054x38fwai61vj36sc04r3zkzay5acq2cgd9zqv5hs51s36g5b")))) + (base32 "0j054x38fwai61vj36sc04r3zkzay5acq2cgd9zqv5hs51s36g5b")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list "-C" "bsnes" - ;; Remove march=native - "local=false" - (string-append "prefix=" (assoc-ref %outputs "out"))) - #:tests? #f ; No tests. - #:phases (modify-phases %standard-phases - (delete 'configure)))) - (native-inputs - (list pkg-config)) + (list + #:make-flags #~(list "-C" "bsnes" + ;; Remove march=native + "local=false" + (string-append "prefix=" #$output)) + #:tests? #f ;No tests. + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) + (native-inputs (list pkg-config)) (inputs - `(("alsa-lib" ,alsa-lib) - ("ao" ,ao) - ("cairo" ,cairo) - ("eudev" ,eudev) - ("gtksourceview-2" ,gtksourceview-2) - ("libxrandr" ,libxrandr) - ("libxv" ,libxv) - ("openal" ,openal) - ("pulseaudio" ,pulseaudio) - ("sdl2" ,sdl2))) - (home-page "https://bsnes.dev/") + (list alsa-lib + ao + cairo + eudev + gtksourceview-2 + libxrandr + libxv + openal + pulseaudio + sdl2)) + (home-page "https://github.com/bsnes-emu/bsnes") (synopsis "Emulator for the Super Nintendo / Super Famicom systems") (description "bsnes is a Super Nintendo / Super Famicom emulator that focuses on From patchwork Thu Sep 26 03:09:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 31465 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 2567227BBEA; Thu, 26 Sep 2024 04:18:21 +0100 (BST) 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_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 D9E7327BBE2 for ; Thu, 26 Sep 2024 04:18:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stf0d-00047r-MV; Wed, 25 Sep 2024 23:17:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1stf0b-00046i-8D for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:37 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stf0a-00080S-Vt for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=BbdEXTmNNTsq8jI7l08vXW885mZlR9xZVTK0jDzrhFs=; b=GXkZxwX4LPCWXpgm67Wfoll3SZgqUQWGIq1h80PbeyJ0Qd0YcKKpxmXJwlT74xw76RihPlsRr4G3NQKWO6cqLAG7ey/2c7+a3nmNi2xukyOAN5WCItG9zDMOHgJQW06C8hQtk6fXhPl2ytcyPpcYHY6lN+SbupqM6vqzTbtJTi0w4kamQfoxHBC2+cNAv32+8b+sQ6kV/dEcj16Q+yygjhIUSuZBlxv5YM7+b9If5QLDOwerro4U4s9kMUkqOBRawpauJWGTmWuZ63XvEKFc+e7LxJuR8UNxVQ9wG2uI5GSU4JcabMj+kIXyf+AW8QbgDKDgziQgH1/o1L5RKslcVA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stf10-0001Hn-Gd for guix-patches@gnu.org; Wed, 25 Sep 2024 23:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73488] [PATCH 2/7] gnu: Add jg-api. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Sep 2024 03:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73488@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 73488-submit@debbugs.gnu.org id=B73488.17273206334817 (code B ref 73488); Thu, 26 Sep 2024 03:18:02 +0000 Received: (at 73488) by debbugs.gnu.org; 26 Sep 2024 03:17:13 +0000 Received: from localhost ([127.0.0.1]:41854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf0C-0001FX-O2 for submit@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:13 -0400 Received: from mail-pl1-f180.google.com ([209.85.214.180]:49644) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf06-0001ET-Qo for 73488@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:07 -0400 Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2057835395aso4961645ad.3 for <73488@debbugs.gnu.org>; Wed, 25 Sep 2024 20:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727320533; x=1727925333; 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=BbdEXTmNNTsq8jI7l08vXW885mZlR9xZVTK0jDzrhFs=; b=aqrEvGmPzp3JJ0oieVbidnp5sOE09AAIRjdo57s7ycJKf/Y4ozsVgP2RkfLKD+1yNq fJ9oSP3U6bQvluws+oibGm5OsVNAHFODs90abNIHqhE6EHEJBiD3+XvWxfpR8TPAXS7j Xnm72mQ32XRokkeAO8bsJwHldKLlHCvqb1qSfHvyIlE9CgGZUGHo0auVaf9DoiXnGqos WYcWZ3sY4mn8obwqxeKWQALwPds8G/1X7AhzbSa6uKFyDDxrPkaszWE4mJZ/351bV5iA /nUXp99dK6miJm5vH2JvEGX8Plil3QnJ2JTfyb8PjMEzmgkhru72+NBH2c/d36h4JcLO YZ2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727320533; x=1727925333; 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=BbdEXTmNNTsq8jI7l08vXW885mZlR9xZVTK0jDzrhFs=; b=h8RpKo4G4h6KshtI5gFA4skLNTXexKeB6XjB6TprTaIEAbuFhmdUBDJKdCR1HsKVdz k4hIEyu82Ya+2fL3/d0gJJz/hXowXHYB7UezP7loVZg2H8HN6lHGu/oQWoyl/yMWjDPg CSTAxBus1BNig0xE5yJsp/6fv+ZYruf+mErJHfJXs+TOPd3VEVQ4K/6oFpW+XxT4MiIF E0UgxV3mX8k3A1qLSOig4XnceFacVFQH16EFZz293d0gqHh0mrFYE2BJi4kb92c1K2cl HbyVOWk0sZMvqX9bMr5x+338Qt3zFgg9vDH5gbSMqtZyUiKek0aNXWQvy4KiF7Kb7lqJ rgQw== X-Gm-Message-State: AOJu0Yxt4tiQL/I1P7Gb4C7sSbUweTupDBsKXDW/sKuV4tiLHHK+/lWT ah/ZrJi6xbc6ndy/BblINVjnUzNoR3rqAnPlbrb7Pt4tE30o3yCpcUPa5w== X-Google-Smtp-Source: AGHT+IFLd9J3ENwwokeCsPHxh+wIDgWqAFiaBYfGvmSphVhbkbpA8QBzeqDVo9IDZ+Lqtl6irHkV+Q== X-Received: by 2002:a17:902:da82:b0:205:937f:3ae3 with SMTP id d9443c01a7336-20afc4a15ccmr78119955ad.44.1727320533449; Wed, 25 Sep 2024 20:15:33 -0700 (PDT) Received: from hurd.lan ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af17e0301sm29895875ad.156.2024.09.25.20.15.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 20:15:33 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 26 Sep 2024 12:09:56 +0900 Message-ID: <260db15387afca04f16aa6137098718c3ef0a55d.1727320201.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 (jg-api): New variable. Change-Id: I2cd2086560f8353f8260209c4ee0f117c3615917 --- gnu/packages/emulators.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 50a7b67121..09e722b4f4 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2260,6 +2260,32 @@ (define-public bsnes performance, features, and ease of use.") (license license:gpl3))) +(define-public jg-api + (package + (name "jg-api") + (version "1.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jgemu/jg") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0117cvfvzhrm9fxnryhbnf9r0f8ij4ahhfqiqp5yv11bz2wcyhqh")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f + #:make-flags #~(list (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) ;no configure phase + (home-page "https://gitlab.com/jgemu/jg") + (synopsis "Emulators Plugin API") + (description "This package provides the Jolly Good API C and C++ headers. +The Jolly Good API is a shared object or plugin @acronym{API, Application +Programming Interface} for emulators.") + (license license:zlib))) + (define-public zsnes (package (name "zsnes") From patchwork Thu Sep 26 03:09:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 31460 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 F343027BBE9; Thu, 26 Sep 2024 04:18:02 +0100 (BST) 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_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 5389527BBEA for ; Thu, 26 Sep 2024 04:18:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stf0c-00046y-1o; Wed, 25 Sep 2024 23:17:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1stf0a-00046R-Oa for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:36 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stf0a-00080U-FD for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=hp+/fgVjgr5zdNGZ+xU868wP0n8MTcbkZ0XBvamtEMg=; b=pxk3AtTPqDKvxKe+XgYT/4LOPdmSsfJJ0DO4JZTvFYU6I3DC0JyLOUXI45ev+ahiFzYURxl4UtVnQVAiUltO5Zt1SD8Nbmu+XlYX1ILCXAoI6XcpBFQkBRjvFBYa3Ure1vjHfCA+9f5DfMYsLgqp6LHEGBg1bOp78FKemZpPSfTEe8IFsNOUEqiGdCFPGQinOpBqvwoeXgi10BYoYbYOm7JX0di30v90y5+P+x6kYph9Oyy2i4L2oEyYzADsL//rQIJUUnSqb17iX33U3L7mhU3xzg8auEKhhf4tN/1ze6hE3f2PNdCiTBrgLgNcCZdKo2Di5eI5T++xzuuUClLfkA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stf11-0001Hu-0F for guix-patches@gnu.org; Wed, 25 Sep 2024 23:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73488] [PATCH 3/7] gnu: Add jgrf. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Sep 2024 03:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73488@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 73488-submit@debbugs.gnu.org id=B73488.17273206334825 (code B ref 73488); Thu, 26 Sep 2024 03:18:02 +0000 Received: (at 73488) by debbugs.gnu.org; 26 Sep 2024 03:17:13 +0000 Received: from localhost ([127.0.0.1]:41856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf0D-0001Fe-3G for submit@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:13 -0400 Received: from mail-pl1-f174.google.com ([209.85.214.174]:55568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf08-0001Ej-GD for 73488@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:09 -0400 Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-20792913262so4632465ad.3 for <73488@debbugs.gnu.org>; Wed, 25 Sep 2024 20:16:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727320536; x=1727925336; 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=hp+/fgVjgr5zdNGZ+xU868wP0n8MTcbkZ0XBvamtEMg=; b=UvABy+X7+0Hj+8pI0pJpXI0r4HCwPtwpp1bMI+SaEzH8oC0DwMJqEsHsvcYpDTT3/e 4bSjOgWVNgV16HD3UKmYExFCwKksmB2Qd8v2ttyhtQ1/GfPdboXthRj4nOjFL7ymEASS e0W5uUGtczhRin754O2g0/Vix+HoihVPbpA9VoSQ3tl0g1KhJaNZcmXlsojMB6hW0HbV VkQ4duqKvBHwCDlDkRJWFfDn2Mw4QiBUkSgy0UraER9XCG7b5RvzZS4yYXzi+0Tojrj5 e8bBeNCNtNHAVckFW/3UYc5f1wyqbqlPX3/GnJhGQUB2yd/MmI6mUWDfdlhEwBE+XEWW e0jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727320536; x=1727925336; 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=hp+/fgVjgr5zdNGZ+xU868wP0n8MTcbkZ0XBvamtEMg=; b=d3nFMDKzDGa3NxoumetiIeoSOlIBsrBWijQHhLZTJafJBZ6BX1j5Avnwfh3gIKXB/M aLsHdQ/kTCyQrWQ+o6Yp+Nsb020xJL3QdKgcFBKkVDkxaIa6e4cJ9tFUe3fy0H0HiPLf tk8lf9/QqswMC+1NSWiU/e2hoN7j78BzGWC6sahF+73sK0hRPt2CVeHs0w1E8tlDoFGl d6dzrRKIJ5V5uMLfyFwQnyDtHmKjWMeF+3o8jPIQFjPvXtojpMYA5JoNcuergbC+WJiB XITD5bbUGRoFo6KGrlkhy8amh59WAxdxg8Yjkw8tEHaTc/2zNX8g9u66JzgGm68mB3JF h8WQ== X-Gm-Message-State: AOJu0YwhAubCZ/l/jepdyk/lwMVOoawlTThtc69bqXCK6NX9lKsnl0b6 IRM1dBlAcHMZsTTX9vyKwLdtECpDgFA+ST0IemfCr3pUlCqUt0JWvwxiNw== X-Google-Smtp-Source: AGHT+IEmau0NWrneihH9c+X6fnQPV1JKQyHado/MzZSkTRmyrIlgBvq0oWToPN9GLCCmG+c7JuCfjQ== X-Received: by 2002:a17:903:41c4:b0:20b:df7:3bed with SMTP id d9443c01a7336-20b0df73ee3mr41345855ad.0.1727320535545; Wed, 25 Sep 2024 20:15:35 -0700 (PDT) Received: from hurd.lan ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af17e0301sm29895875ad.156.2024.09.25.20.15.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 20:15:34 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 26 Sep 2024 12:09:57 +0900 Message-ID: <200f974ddce1a4f44b1940ee94997e6a761dbc45.1727320201.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 (jgrf): New variable. Change-Id: I0cf706e66977ceb96902dcd54f9175031e129445 --- gnu/packages/emulators.scm | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 09e722b4f4..6a5ff6cc19 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2286,6 +2286,65 @@ (define-public jg-api Programming Interface} for emulators.") (license license:zlib))) +(define-public jgrf + (package + (name "jgrf") + (version "1.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jgemu/jgrf") + (commit version))) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet '(begin + ;; TODO: Package md5.h and md5.c from + ;; http://openwall.info/wiki/people/solar/software + ;; /public-domain-source-code/md5, + ;; remove these bundled files and set the + ;; USE_EXTERNAL_MD5 Make flag to 1. + ;; (delete-file "deps/md5.h") + ;; (delete-file "deps/md5.c") + (delete-file-recursively "deps/miniz"))) + (sha256 + (base32 + "19n6h8l3vy5g2bqvxhxwqxlg070hjz22384yisadzwl3gjkkgpxk")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;no test suite + #:make-flags + #~(list (string-append "AR=" #$(ar-for-target)) + (string-append "CC=" #$(cc-for-target)) + (string-append "CXX=" #$(cxx-for-target)) + (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) + (native-inputs (list jg-api pkg-config)) + (inputs + (list libepoxy + libsamplerate + miniz + soxr + speexdsp + flac + lzo + sdl2 + zlib + `(,zstd "lib"))) + (home-page "https://gitlab.com/jgemu/jgrf") + (synopsis "Jolly Good Reference Frontend") + (description "The Jolly Good Reference Frontend (accessible via the +@command{jollygood} command) is the simplest possible frontend to The Jolly +Good API. It may be used to run emulators built as shared objects, or as a +\"white-label\" frontend for statically linked standalone emulators.") + ;; The main license is BSD-3; the bundled source licenses are also listed + ;; below. + (license (list license:bsd-3 ;this software, gltext.h, lodepng.c, lodepng.h + license:expat ;ezmenu.h source, musl_memmem.c, + ;parson.h, parson.c, tconfig.h, tconfig.c + license:public-domain ;md5.h, md5.c, parg.h, parg.c + license:cc0)))) + (define-public zsnes (package (name "zsnes") From patchwork Thu Sep 26 03:09:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 31466 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 C255627BBEA; Thu, 26 Sep 2024 04:18:24 +0100 (BST) 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_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 B5AAA27BBE2 for ; Thu, 26 Sep 2024 04:18:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stf0d-00047p-Ft; Wed, 25 Sep 2024 23:17:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1stf0b-00046h-8D for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:37 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stf0a-00080h-V9 for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=RHqZ9HrRDSt2Z64DKAPNwvkMSMWOZswUfB6hIKzvUMY=; b=T6jC8wPDE2H8Xm/E6pQx4fQfWC198wB8BzhwGVs0gEC5Z2TTOc0tT13+5l9GA95WoqSjWny4dA7UbfuGFBZu01U7+qWA+sjVbz2pqjox6Jqj4OIf/nrMEn0t43rL7saWfuIIk8syTRe3yhrfljWX1O2XnG6UI7fA3z9goQ1Cb8W4P6pg7fi7q6eyECxJoXPv8YlMMmLiTREIQAHc2zY9VV5C56Dl6RBLxd8uTIPp5HGlJ1hfzyBxKjXyXzU+RoGvyVx66OpoXHSP5X0FQ3eYUGsp7nMljfNMpuzPOuoQHGVkvLLgoohm0VzsRbbJSOvRYjtnINPVsg58ZJbN2w/CmQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stf11-0001I2-G5 for guix-patches@gnu.org; Wed, 25 Sep 2024 23:18:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73488] [PATCH 4/7] gnu: jgrf: Add search path mechanism. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Sep 2024 03:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73488@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 73488-submit@debbugs.gnu.org id=B73488.17273206344832 (code B ref 73488); Thu, 26 Sep 2024 03:18:03 +0000 Received: (at 73488) by debbugs.gnu.org; 26 Sep 2024 03:17:14 +0000 Received: from localhost ([127.0.0.1]:41858 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf0D-0001Fm-Jp for submit@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:14 -0400 Received: from mail-pl1-f181.google.com ([209.85.214.181]:44346) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf0A-0001En-F0 for 73488@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:11 -0400 Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-206e614953aso5355925ad.1 for <73488@debbugs.gnu.org>; Wed, 25 Sep 2024 20:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727320538; x=1727925338; 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=RHqZ9HrRDSt2Z64DKAPNwvkMSMWOZswUfB6hIKzvUMY=; b=Bph/NEtar3f5dF/k/XAZPxgDglwfmVUi8qEo067T9yfO2LCa7AlEazJpbkLvaQoIPG I549j/JW2J6/59lykBwVt8/lbFse+UbuoPJQYaMKegneTuL8reNFXvUJGtZ1pyC1CQtr iK3ytyssih6/hrShVB5l5qY9yljjpa+0+uJVN1EluEDVhCeEBRsmCVoV9vsqanvtgfI2 9E80y8yV+48iwP+KzzxoEn2jBgxrBWEtyQePOELYL5hgmIw92yiLiARM4r+bZ3cUHxKg ycd8ccuQMZ1mSAXqBqq25ZoC1CNkhvChMFz8Rv+T7vUl1mD3o6Tq02qShLR0y/uKVmI0 JCqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727320538; x=1727925338; 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=RHqZ9HrRDSt2Z64DKAPNwvkMSMWOZswUfB6hIKzvUMY=; b=mM0uZa5gFT2MZzjJIm2gTBJgIzncfmz/1yE8REqMGkGIpBD7bCJGf3WZ0wJM/ba5AB O71RM5eHEihqGzdqly8PtDfMIr9U60R+H2SLxMSj5MBlQ0uUCZoB4v6HGZBLCxdXLjpp Jcjh5xK/EZcIXyquXmNOoGJqPLZ6Gj3F65o8N6L0d+dlMlZ5cEyv2o5TIRFEPWLxrZ8i 6a8VbiL/2KqcZA3mmgFH4LSKnHmODXp7BGLe9LomaQESY7YuWJ0b/2F4ZXN4udHXMnbe hqqDTszNzgERfmBSxF0wp6c3nLrCh0n85aMnJ6QFwzQR7+889I+eqYuvG2VBJ7YR6TJX anrA== X-Gm-Message-State: AOJu0YzqsvGGQOxRcrJVSpaw9ZLPi8nElW4c5ajExUrv2nMXmVTF3WeX yb+oIBDs+c+9kOheCJe3vDFktKkiGCIBso1ePPR30ogDemHMGqZgCV3Wug== X-Google-Smtp-Source: AGHT+IE2I4/EdM33S70g8syeUS4x9+5EIUc5AHYjL7REZG0Lf/CZO4BMiNWYozTczeSrWGFRvn/stg== X-Received: by 2002:a17:903:234f:b0:206:90ac:4412 with SMTP id d9443c01a7336-20afc45fa82mr53350755ad.2.1727320537364; Wed, 25 Sep 2024 20:15:37 -0700 (PDT) Received: from hurd.lan ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af17e0301sm29895875ad.156.2024.09.25.20.15.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 20:15:36 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 26 Sep 2024 12:09:58 +0900 Message-ID: <5376e48139307a045a3482aa4d4508e8f368f6e3.1727320201.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 automatically find core files in a profile. * gnu/packages/patches/jgrf-implement-search-paths.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/emulators.scm (jgrf) [source]: Apply patch. [native-search-paths]: New field. Change-Id: Ibd78d44dcdf23f4310b2f838d73b8e57d7f31b2a --- gnu/local.mk | 1 + gnu/packages/emulators.scm | 10 +- .../patches/jgrf-implement-search-paths.patch | 302 ++++++++++++++++++ 3 files changed, 312 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/jgrf-implement-search-paths.patch diff --git a/gnu/local.mk b/gnu/local.mk index 507cbfebca..1e85ab5352 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1589,6 +1589,7 @@ dist_patch_DATA = \ %D%/packages/patches/jfsutils-add-sysmacros.patch \ %D%/packages/patches/jfsutils-gcc-compat.patch \ %D%/packages/patches/jfsutils-include-systypes.patch \ + %D%/packages/patches/jgrf-implement-search-paths.patch \ %D%/packages/patches/john-the-ripper-jumbo-with-gcc-11.patch \ %D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 6a5ff6cc19..49208f302d 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2308,7 +2308,8 @@ (define-public jgrf (delete-file-recursively "deps/miniz"))) (sha256 (base32 - "19n6h8l3vy5g2bqvxhxwqxlg070hjz22384yisadzwl3gjkkgpxk")))) + "19n6h8l3vy5g2bqvxhxwqxlg070hjz22384yisadzwl3gjkkgpxk")) + (patches (search-patches "jgrf-implement-search-paths.patch")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;no test suite @@ -2331,6 +2332,13 @@ (define-public jgrf sdl2 zlib `(,zstd "lib"))) + (native-search-paths + (list (search-path-specification + (variable "JOLLYGOOD_CORE_DIRS") + (files '("lib/jollygood"))) + (search-path-specification + (variable "JOLLYGOOD_ASSETS_DIRS") + (files '("share/jollygood"))))) (home-page "https://gitlab.com/jgemu/jgrf") (synopsis "Jolly Good Reference Frontend") (description "The Jolly Good Reference Frontend (accessible via the diff --git a/gnu/packages/patches/jgrf-implement-search-paths.patch b/gnu/packages/patches/jgrf-implement-search-paths.patch new file mode 100644 index 0000000000..f4c6f20568 --- /dev/null +++ b/gnu/packages/patches/jgrf-implement-search-paths.patch @@ -0,0 +1,302 @@ +Upstream status: https://gitlab.com/jgemu/jgrf/-/merge_requests/61 + +Add support for searching core files and core files assets via the +JOLLYGOOD_CORE_DIRS and JOLLYGOOD_ASSETS_DIRS environment variables. + +diff --git a/Makefile b/Makefile +index ed6eb1c..fb0709c 100644 +--- a/Makefile ++++ b/Makefile +@@ -20,7 +20,9 @@ INCLUDES = -I$(DEPDIR) $(CFLAGS_JG) $(CFLAGS_EPOXY) $(CFLAGS_MINIZ) \ + + LIBS = -lm + +-DEFINES := ++# Define the '_GNU_SOURCE' macro to make the `strdup' function ++# available on GNU systems. ++DEFINES := -D_GNU_SOURCE + + # Conditions for DEFINES + ifneq ($(OS), Windows_NT) +diff --git a/deps/ezmenu.h b/deps/ezmenu.h +index 8400a02..6c8e14b 100644 +--- a/deps/ezmenu.h ++++ b/deps/ezmenu.h +@@ -66,10 +66,10 @@ enum ezmenu_input { + + static void ezmenu_init(struct ezmenu *m, int hres, int vres, + int fontw, int fonth) { +- memset(m, 0, sizeof *m); ++ memset(m, 0, sizeof(*m)); + m->w = hres/fontw; + m->h = vres/fonth; +- m->vislines = calloc(sizeof(char*), m->h); ++ m->vislines = calloc(m->h, sizeof(char*)); + } + + static void ezmenu_setlines(struct ezmenu *m, char**lines, unsigned linecount) { +diff --git a/jollygood.6 b/jollygood.6 +index 9f36407..17fef9c 100644 +--- a/jollygood.6 ++++ b/jollygood.6 +@@ -336,6 +336,14 @@ The directory for user-specific data files. + This path is used to find data files used by the cores. + Set by default to + .Pa $HOME/.local/share/jollygood/ . ++.It JOLLYGOOD_CORE_DIRS ++Colon-separated (or semicolon, on Windows) directories containing core ++files. If set, these core files directories take precedence over the ++default ones. ++.It JOLLYGOOD_ASSETS_DIRS ++Colon-separated (or semicolon, on Windows) directories containing core ++assets files. If set, these core assets directories take precedence ++over the default ones. + .El + .Sh EXAMPLES + .Bl -tag -width indent +diff --git a/src/jgrf.c b/src/jgrf.c +index 3a40d2d..12eede3 100644 +--- a/src/jgrf.c ++++ b/src/jgrf.c +@@ -161,6 +161,12 @@ static void mkdirr(const char *dir) { + #endif + } + ++#if defined(__MINGW32__) || defined(__MINGW64__) ++// Avoid a deprecation warning on Windows, where strdup exists but is ++// deprecated in favor of _strdup. ++#define strdup _strdup ++#endif ++ + // Create user directories + static void jgrf_mkdirs(void) { + mkdirr(gdata.configpath); +@@ -1096,6 +1102,88 @@ void jgrf_frametime(double frametime) { + corefps = frametime + 0.5; + } + ++// Wrapper that logs and errors in case of realloc problems. ++static void* jgrf_realloc(void* array, const size_t size) { ++ void* new_array; ++ if (size > 0 && !(new_array = realloc(array, size))) ++ jgrf_log(JG_LOG_ERR, "Realloc failure\n"); ++ return new_array; ++} ++ ++static void jgrf_strip_trailing_sep(char* word) { ++ int end = strlen(word) - 1; ++ while (word[end] == SEP) { ++ word[end] = '\0'; ++ end -= 1; ++ } ++} ++ ++// Tokenize PATH based on the platform path separator and return an ++// array of strings, or NULL if there nothing could be tokenized. The ++// count of the number of items is written at the location pointed by ++// the COUNT pointer. The returned array is dynamically allocated and ++// should be freed when no longer needed, along its inner strings. ++// `transform' can be provided to manipulate the recovered path items; ++// it must be the pointer of a procedure accepting a single string ++// (char*) path item as argument or NULL. ++static char** tokenize_path(int* count, const char* path, ++ void (*transform) (char*)) { ++ int length = 10; ++ int index = 0; ++ char* save_ptr; ++ char** items = jgrf_realloc(NULL, sizeof(char*) * length); ++ char* item; ++ char pathsep_str[2] = {PATHSEP, '\0'}; ++ char* wr_path = strdup(path); ++ if (!wr_path) ++ jgrf_log(JG_LOG_ERR, "strdup memory allocation failure\n"); ++ ++ item = strtok_r(wr_path, pathsep_str, &save_ptr); ++ while (item) { ++ if (transform) ++ transform(item); ++ ++ // Resize the array if needed. ++ if (index >= length) { ++ length += 10; ++ items = jgrf_realloc(items, sizeof(char*) * length); ++ } ++ ++ // Assign the component. ++ items[index] = strdup(item); ++ if (!items[index]) ++ jgrf_log(JG_LOG_ERR, "stdup memory allocation failure\n"); ++ ++ index += 1; ++ item = strtok_r(NULL, pathsep_str, &save_ptr); ++ } ++ free(wr_path); ++ jgrf_realloc(items, sizeof(char*) * index); ++ ++ *count = index; ++ return items; ++} ++ ++// Look if a core named NAME exists under the directory CORE_DIR. Set ++// CORE_FILE as a side-effect. Return 1 if found, 0 otherwise. ++static int search_core_file(char* core_file, size_t max_length, ++ const char* core_dir, const char* name) { ++ struct stat fbuf; ++ snprintf(core_file, max_length, "%s%c%s.%s", ++ core_dir, SEP, name, SOEXT); ++ return !stat(core_file, &fbuf); ++} ++ ++// Look if an core assets directory for core named NAME exists under ++// the directory ASSETS_DIR. Set CORE_ASSETS as a side-effect. Return ++// 1 if found, 0 otherwise. ++static int search_core_assets(char* core_assets, size_t max_length, ++ const char* assets_dir, const char* name) { ++ struct stat fbuf; ++ snprintf(core_assets, max_length, "%s%c%s", assets_dir, SEP, name); ++ return !stat(core_assets, &fbuf); ++} ++ + int main(int argc, char *argv[]) { + if (argc < 2) { + jgrf_cli_usage(argv[0]); +@@ -1188,7 +1276,7 @@ int main(int argc, char *argv[]) { + jg_get_coreinfo("")->name); + + #if defined(LIBDIR) && defined(DATADIR) // Check for core assets system-wide +- char coreassets[256]; ++ char coreassets[384]; + snprintf(coreassets, sizeof(coreassets), + "%s%cjollygood%c%s", DATADIR, SEP, SEP, gdata.corename); + +@@ -1204,7 +1292,7 @@ int main(int argc, char *argv[]) { + } + else if (!jgrf_core_default()) + jgrf_log(JG_LOG_ERR, +- "Cannot detect default core, or invalid file. Exiting...\n"); ++ "Cannot detect default core, or invalid file. Exiting...\n"); + + // Set the core path to the local core path + char corepath[384]; +@@ -1222,20 +1310,85 @@ int main(int argc, char *argv[]) { + } + #if defined(LIBDIR) && defined(DATADIR) // Check for the core system-wide + else { +- snprintf(corepath, sizeof(corepath), "%s%cjollygood%c%s.%s", +- LIBDIR, SEP, SEP, gdata.corename, SOEXT); +- +- // If it was found, set the core assets path +- if (stat(corepath, &fbuf) == 0) { +- snprintf(gdata.coreassets, sizeof(gdata.coreassets), +- "%s%cjollygood%c%s", DATADIR, SEP, SEP, gdata.corename); +- corefound = 1; ++ int core_assets_found = 0; ++ int count = 0; ++ ++ // Look for the core file in the JOLLYGOOD_CORE_DIRS search ++ // path. ++ const char* core_dirs_env = getenv("JOLLYGOOD_CORE_DIRS"); ++ if (core_dirs_env) { ++ char** core_dirs = tokenize_path(&count, core_dirs_env, ++ jgrf_strip_trailing_sep); ++ for (int i=0; i < count; ++i) { ++ const char* dir = core_dirs[i]; ++ if (search_core_file(corepath, sizeof corepath, ++ dir, gdata.corename)) { ++ corefound = 1; ++ break; ++ } ++ } ++ // Free all the allocated strings. ++ for (int i=0; i < count; ++i) ++ free(core_dirs[i]); ++ free(core_dirs); ++ } ++ ++ // Look in the configured LIBDIR as a fallback. ++ if (!corefound) { ++ char internal_core_dir[256]; ++ snprintf(internal_core_dir, sizeof internal_core_dir, "%s%c%s", ++ LIBDIR, SEP, "jollygood"); ++ if (search_core_file(corepath, sizeof corepath, ++ internal_core_dir, gdata.corename)) { ++ corefound = 1; ++ } else { ++ jgrf_log(JG_LOG_ERR, ++ "Could not locate core file. Exiting...\n"); ++ } + } +- } + +- // If no core was found, there is no reason to keep the program running +- if (!corefound) +- jgrf_log(JG_LOG_ERR, "Failed to locate core. Exiting...\n"); ++ // If it was found, set the core assets path. First consider ++ // the JOLLYGOOD_ASSETS_DIRS search path. ++ if (corefound) { ++ const char* assets_dirs_env = getenv("JOLLYGOOD_ASSETS_DIRS"); ++ if (assets_dirs_env) { ++ char** assets_dirs = tokenize_path(&count, assets_dirs_env, ++ jgrf_strip_trailing_sep); ++ for (int i=0; i < count; ++i) { ++ const char* dir = assets_dirs[i]; ++ if (search_core_assets(gdata.coreassets, ++ sizeof gdata.coreassets, ++ dir, gdata.corename)) { ++ core_assets_found = 1; ++ break; ++ } ++ } ++ for (int i=0; i < count; ++i) ++ free(assets_dirs[i]); ++ free(assets_dirs); ++ } ++ ++ // Look in the configured DATADIR as a fallback. ++ if (!core_assets_found) { ++ char internal_core_assets_dir[256]; ++ snprintf(internal_core_assets_dir, ++ sizeof internal_core_assets_dir, ++ "%s%c%s", DATADIR, SEP, "jollygood"); ++ if (search_core_assets(gdata.coreassets, ++ sizeof gdata.coreassets, ++ internal_core_assets_dir, ++ gdata.corename)) { ++ core_assets_found = 1; ++ } else { ++ // Not all emulators have core assets, ++ // e.g. 'cega', so this is not a critical ++ // condition. ++ jgrf_log(JG_LOG_INF, "No assets directory for core %s\n", ++ gdata.corename); ++ } ++ } ++ } ++ } + #endif // defined(LIBDIR) && defined(DATADIR) + + #endif // JGRF_STATIC +diff --git a/src/jgrf.h b/src/jgrf.h +index b3f4627..57bba0e 100644 +--- a/src/jgrf.h ++++ b/src/jgrf.h +@@ -45,8 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + #if defined(_WIN32) || defined(__MINGW32__) || defined(__MINGW64__) + #define SEP '\\' ++ #define PATHSEP ';' + #else + #define SEP '/' ++ #define PATHSEP ':' + #endif + + typedef struct jgrf_gdata_t { // Global Data +@@ -59,7 +61,7 @@ typedef struct jgrf_gdata_t { // Global Data + char coreversion[32]; // Core Version + char gamename[128]; // Internally used game name + char gamefname[128]; // Internally used game name with extension +- char coreassets[256]; // Core asset path ++ char coreassets[384]; // Core asset path + char userassets[128]; // User asset path + char biospath[128]; // BIOS path + char cheatpath[128]; // Cheat path From patchwork Thu Sep 26 03:09:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 31464 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 6DC7627BBEA; Thu, 26 Sep 2024 04:18:14 +0100 (BST) 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_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 D822A27BBE2 for ; Thu, 26 Sep 2024 04:18:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stf0e-00048b-B8; Wed, 25 Sep 2024 23:17:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1stf0b-00046w-Pl for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:37 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stf0b-00080s-FP for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=fIXKs0sgQWj7EYDiiAh+D23WyRzixWK7TjjaW+6pNzs=; b=CNOGjUQI5cbvWz8ycI9u2xYpZXU1BpdDU+9mwE1grWsdbd7mZYKkGw4LKbmZZc3godzv2gRhN4G0DL4eiuOqoN7wAQItliVwhXGHqXNs3H/cNSMipagVHmUEbvlayZBUnDiSmlTAid3U211AGY196ilO2m4i8/e//GhTdOnx+nZStuz2e+afos1bxU3j25ox3MlwW3NEIevOMHpsaiQDW7ULZHOZF4Z5yiIGOw4tZQESrIcylh0GnIhUu9rC+K4ALNOgd2ctVwTB5ep6tnb09rIK5VJp4/x+rdy2kARvJDVJNLlTVsCAKxMsRw3R2x9kGIMXkxQOn1zWoHFUZmMRJQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stf12-0001I9-08 for guix-patches@gnu.org; Wed, 25 Sep 2024 23:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73488] [PATCH 5/7] gnu: Add jg-bsnes. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Sep 2024 03:18:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73488@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 73488-submit@debbugs.gnu.org id=B73488.17273206434862 (code B ref 73488); Thu, 26 Sep 2024 03:18:03 +0000 Received: (at 73488) by debbugs.gnu.org; 26 Sep 2024 03:17:23 +0000 Received: from localhost ([127.0.0.1]:41862 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf0M-0001GL-IW for submit@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:22 -0400 Received: from mail-pl1-f172.google.com ([209.85.214.172]:49253) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf0C-0001Ew-1v for 73488@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:12 -0400 Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-205909afad3so4750345ad.2 for <73488@debbugs.gnu.org>; Wed, 25 Sep 2024 20:16:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727320539; x=1727925339; 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=fIXKs0sgQWj7EYDiiAh+D23WyRzixWK7TjjaW+6pNzs=; b=R+EN2mmbr40lfSFK88dq03p1SDJUZR2nji53SSeiGfCqkAYoPvP/wyAe0OV7zCBPyZ 16aF/byOS4iL3ecnd2ek9ZBDpNeCzKBUg3UTY7CZ6g8cUQwkrdm/LkocR1dhc7H69LlY 7MtOU145BTpQB0LKDb/QpHC1D4Eyjp9pjNZFtXUzdevTNbjA2LRrUzBRVTB57Jlkolds c/NrowpkCTLaiaFXzmnSs9gXynlh8YOsOJijqemBpPM7znGKwZ0lk6ZI1g3FiLDAXiA+ v0rNy3WNbhZYz1gzwjqe+DrdqT8FOKJe2fZmYkbufGQlANtZ82VF13bg1djGnGAoLX1a Tr4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727320539; x=1727925339; 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=fIXKs0sgQWj7EYDiiAh+D23WyRzixWK7TjjaW+6pNzs=; b=K0I9bRQRbUwvhtrovOz3SOncbqUwMCeKLQBc4rx8ErCpiugxULkvUOCTAkXeZDmBjT KLhU7sz7If481i2jbWxCbHp5w0C25k00MX3mpHZ6SL07e45RksBRu6ohLkzVVY3TEz/f Lw6LG20JbSFusbUEKDJVD1qlaZqhOdy3KAx32fAW6W2iwcVB7iTBkFaeOqjeB+kuuSeQ I116irKvu5ly0HpIoVDxyVzT887CibO4YlUfsuYI+AT6IUwTnSx+iQ5QIgEsx28emMNE I/qya0HBeTciPH6zN9zZtZUGo6mNGCOgvLUyhaxRIrbgzNf1K4LnciB/R34K3PFHfrHJ KV9A== X-Gm-Message-State: AOJu0Yww4EGuWOdtA/mie2QPTktiBcI1VVYjvTYGe12F+Hkc8VHdimg+ 1ZMHrwi+0NNUXKvKxhcWoP0RSXhRB9B5SAaKqnkTgezqcX4YgVEYb3oz+w== X-Google-Smtp-Source: AGHT+IGvIDWD/saEpWJIuEajvipqf+hbZTP0EGdshAk5MJL6YylB6ASzUBISPgPV4igGzDvTnhXRug== X-Received: by 2002:a17:902:f543:b0:206:9640:e751 with SMTP id d9443c01a7336-20afc3f8c51mr75999345ad.3.1727320539144; Wed, 25 Sep 2024 20:15:39 -0700 (PDT) Received: from hurd.lan ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af17e0301sm29895875ad.156.2024.09.25.20.15.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 20:15:38 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 26 Sep 2024 12:09:59 +0900 Message-ID: <1e4efc1fa7553f761a9f2c9bfa5387f98f99297f.1727320201.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 (jg-bsnes): New variable. Change-Id: If88a7bea0c87c8af8fce051f8bec891ff249449f --- gnu/packages/emulators.scm | 72 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 49208f302d..068349867f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2353,6 +2353,78 @@ (define-public jgrf license:public-domain ;md5.h, md5.c, parg.h, parg.c license:cc0)))) +(define-public jg-bsnes + (package + (name "jg-bsnes") + (version "2.0.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jgemu/bsnes") + (commit version))) + (file-name (git-file-name name version)) + ;; XXX: Some source dependencies are bundled and are not easy to + ;; unbundle due to the build system building an object combining + ;; their sources directly: + ;; - byuuML + ;; - gb + ;; - libcoco + ;; - snes_spc + (modules '((guix build utils))) + (snippet '(delete-file-recursively "deps/libsamplerate")) + (sha256 + (base32 + "0z1ka4si8vcb0j6ih087cni18vpgfd3qnaw24awycxz23xc0jkdv")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;no test suite + #:make-flags + #~(list (string-append "AR=" #$(ar-for-target)) + (string-append "CC=" #$(cc-for-target)) + (string-append "CXX=" #$(cxx-for-target)) + (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) ;no configure script + (native-inputs (list jg-api pkg-config)) + (inputs (list libsamplerate)) + (home-page "https://gitlab.com/jgemu/bsnes") + (synopsis "Jolly Good Fork of bsnes") + (description "@code{bsnes-jg} is a cycle accurate emulator for the Super +Famicom/Super Nintendo Entertainment System, including support for the Super +Game Boy, BS-X Satellaview, and Sufami Turbo. @code{bsnes-jg} is a fork of +@code{bsnes} v115, Many changes have been made post-fork: +@itemize +@item Higher quality resampler with settings +@item Improved performance without loss of accuracy +@item Portability improvements +@item Removal of accuracy-reducing hacks and unnecessary code +@item Significant increase in standards compliance +@item Translation to the C++ Standard Library (ISO C++11) +@end itemize + +In particular, it uses much less @acronym{CPU, Central Processing Unit} +compared to the original @code{bsnes} (though not as little as @code{zsnes}). + +The supported file formats are: +@itemize @file +@item .sfc +@item .smc +@item .bs +@item .st +@item .fig +@item .swc +@end itemize + +This is intended to be used with the Jolly Good Reference Frontend +@command{jollygood} command from the @code{jgrf} package.") + ;; The project license is GPL3+. The bundled source licenses are also + ;; listed below. + (license (list license:gpl3+ + license:bsd-3 ;byuuML + license:expat ;gb + license:isc ;libco + license:lgpl2.1+)))) + (define-public zsnes (package (name "zsnes") From patchwork Thu Sep 26 03:10:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 31461 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 6266227BBE9; Thu, 26 Sep 2024 04:18:03 +0100 (BST) 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_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 5DA6227BBEC for ; Thu, 26 Sep 2024 04:18:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stf0e-00048i-JD; Wed, 25 Sep 2024 23:17:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1stf0c-000479-9s for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:38 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stf0c-000810-0a for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=8kGR5dnlVqM5IXsjcXzC1PHZ4F0Z8uJiotcsOcEiu5s=; b=ibwxAkag0l38Bl1bMhwhffC9rxIlUlef0JvVqEnzZ3yXxdB3EoOONB03AZJ77gY7rNjEcn/HzUAdmgf6C4xiPjGMXDa3LOQ111vl54lkz4Ev0fiiPtuyu96CVi6KqBsXHOARgSvV3S9WJ9AkH4Pn/9oUelaZsGTdwubMKXzo8Ew1POdUs7qUv5wfajelSN+VJ82ITrA+deSVpK6fzMF9PxQUyI9cUSu3IdEkLyX+gaA7rlb8BiudpjJRBOKS+iplAW/RptbxmquBbzOgXZh6AdDsrzcArCvM7wN6fttY7n1SqVNZcbkZTfICwhuPRunSRPA9iIqBITfnsXnpVyZE3A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stf12-0001IH-Hn for guix-patches@gnu.org; Wed, 25 Sep 2024 23:18:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73488] [PATCH 6/7] gnu: Add jg-nestopia. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Sep 2024 03:18:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73488@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 73488-submit@debbugs.gnu.org id=B73488.17273206434870 (code B ref 73488); Thu, 26 Sep 2024 03:18:04 +0000 Received: (at 73488) by debbugs.gnu.org; 26 Sep 2024 03:17:23 +0000 Received: from localhost ([127.0.0.1]:41864 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf0N-0001GN-1x for submit@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:23 -0400 Received: from mail-pl1-f176.google.com ([209.85.214.176]:61709) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf0E-0001FE-Cm for 73488@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:14 -0400 Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-20696938f86so3519675ad.3 for <73488@debbugs.gnu.org>; Wed, 25 Sep 2024 20:16:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727320541; x=1727925341; 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=8kGR5dnlVqM5IXsjcXzC1PHZ4F0Z8uJiotcsOcEiu5s=; b=TxAX8uFgz2gvqlAu0e4MqP0VCBI2K5bgUE7JJXTz/+kzHXCqm02Zzt/METd2R0jZSB ZiWiCJ+mfZycucoa+kqDElfY8O8PaVCd3Xl583MziTrCOtgqHAFOXyt8FNGUfrlxyNTC QilcT9IVSwlSjWrne0cLw1cN8mHzF7XgjPHPdOuVdqhY0KJMVt4kFaWYFoAVPmDGuM7N rjkuPR1sbJSv0Yko0O44bUjfu47+sE/Kj86E/QtbyYiXcIlw7MWVoNjPOWUtMpqkCjNP Qf/wtsMFEjGJmFbS4b7Ij3nmUpvlp3aIO6IsUKMBtq2kKYuT758GLtYWj8slnNmLrLsi cosw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727320541; x=1727925341; 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=8kGR5dnlVqM5IXsjcXzC1PHZ4F0Z8uJiotcsOcEiu5s=; b=SNFvorkFm4pkJD1uO+Lp1+QEqChVdAuX0qBQrZIqjTE80+VWkxSUczbILjyBQhBhlT ez7sOa1OXx6l0Mrujf5Fd6dzHRS/MFSpr1tXB1paJS25xihyy3pLpIcCm3cDbO/9QvfA keT4lyCjcVKKjILrjGxlZjnqDYL8aiTj+Nxc+mBDX8fbwlAM40smQpZvHTmmAeV1o8yt pc4K5OeGAt7b7pblSlbAQ41bNX7aI8/2/RKoGdgm6/IxJHN9yRxQt+OoJH4ia6+AmaWx MPKBKpIav5NrLSleROsCYGNXTw8JFCFORXmN8wRBL1uCTR5/lEzdBzf0dK5in0fPlUjf sgxA== X-Gm-Message-State: AOJu0YwsTZayfJO4YNwFxBEox5UwEEKfr8XyczwZaVpfrvb892a4O4DZ moB15oD1d77Wkx4uSM8IsSEfRRXlLK1cDAPePdPAhF89mSQnn8i2R4d1Gg== X-Google-Smtp-Source: AGHT+IGRu/ziBXPd2rpAdaZNqhBdG9TqkVLHlx8t+58Fgwv5AoV0DzBpjseo79mry/jVJOWcvBBnAA== X-Received: by 2002:a17:902:ea01:b0:206:a913:9697 with SMTP id d9443c01a7336-20afc5dd0a5mr68699945ad.43.1727320540893; Wed, 25 Sep 2024 20:15:40 -0700 (PDT) Received: from hurd.lan ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af17e0301sm29895875ad.156.2024.09.25.20.15.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 20:15:40 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 26 Sep 2024 12:10:00 +0900 Message-ID: <669e309ca76f20e2c8bb088f1be366727010c545.1727320201.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 (jg-nestopia): New variable. Change-Id: I2f686f43a8339a124b9ef9640638ab182ecf7079 --- gnu/packages/emulators.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 068349867f..909602acb3 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2425,6 +2425,39 @@ (define-public jg-bsnes license:isc ;libco license:lgpl2.1+)))) +(define-public jg-nestopia + (package + (name "jg-nestopia") + (version "1.52.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jgemu/nestopia") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19qg9hgh25aaym7b81v5g7165v4fyymas6dmzc4z867mzaphbn6s")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;no test suite + #:make-flags + #~(list (string-append "AR=" #$(ar-for-target)) + (string-append "CC=" #$(cc-for-target)) + (string-append "CXX=" #$(cxx-for-target)) + (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) ;no configure script + (native-inputs (list jg-api pkg-config)) + (home-page "https://gitlab.com/jgemu/nestopia") + (synopsis "Jolly Good Fork of Nestopia") + (description "Nestopia JG is an emulator for the Nintendo Entertainment +System/Famicom, including support for the Famicom Disk System and VS. System. +Though originally a fork, Nestopia JG has become the de facto upstream branch +of the Nestopia emulator.") + (license (list license:gpl2+ ;this project + license:lgpl2.1+)))) ;nes_ntsc source files + (define-public zsnes (package (name "zsnes") From patchwork Thu Sep 26 03:10:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 31462 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 7DF5027BBEB; Thu, 26 Sep 2024 04:18:03 +0100 (BST) 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_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 3A07427BBE2 for ; Thu, 26 Sep 2024 04:18:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1stf0g-00049F-4R; Wed, 25 Sep 2024 23:17:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1stf0c-00047b-Sj for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:38 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1stf0c-000818-Iq for guix-patches@gnu.org; Wed, 25 Sep 2024 23:17:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=en9psBNMStwKodn93aMSK2Fyu/+fQVnNlkSS63qwBq8=; b=nIfAiVT36MJCM5TZFq6kjRb4r/K28Fq7P+jH70vMKSQq9WywKinOydZJjis5nHftJzEVtIwy1n5c6oc3MaDJ2IX9de9Xt8tY45ZHZ7DjpmjgHXrbhMfb0Lcurt0IO/UIfyNa9vM/Jkyiz1qNwZN7ZnxImQhXtlWIBIn2fUArQ9DdwDTd6xtEeZomeoNsxmAqDHeBro6jJOrd3jIXYr5575rcz7tr/BiTKxktebg+mgUUQ+605vadpXjRIk9L6P3V4vAkTvtEPFs8Zt5rvIiKXUkaetNjMkyOfUi41mY0SHXoYLwNzm6WPfTGYFGt7FwUkbNHH4XLY/Sno30QtMctBg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1stf13-0001IO-3b for guix-patches@gnu.org; Wed, 25 Sep 2024 23:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73488] [PATCH 7/7] gnu: Add jg-cega. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Sep 2024 03:18:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73488 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73488@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 73488-submit@debbugs.gnu.org id=B73488.17273206434876 (code B ref 73488); Thu, 26 Sep 2024 03:18:05 +0000 Received: (at 73488) by debbugs.gnu.org; 26 Sep 2024 03:17:23 +0000 Received: from localhost ([127.0.0.1]:41866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf0N-0001GV-E9 for submit@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:23 -0400 Received: from mail-pl1-f177.google.com ([209.85.214.177]:52631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1stf0F-0001FL-Oz for 73488@debbugs.gnu.org; Wed, 25 Sep 2024 23:17:16 -0400 Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-20aff65aa37so4181105ad.1 for <73488@debbugs.gnu.org>; Wed, 25 Sep 2024 20:16:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727320543; x=1727925343; 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=en9psBNMStwKodn93aMSK2Fyu/+fQVnNlkSS63qwBq8=; b=SP3OI6oxifTYfVfg6ZJiD93YOQMzJlx1eONO+VTTZgoeaJ9hSaSM+ijS1ePjqJ0hZv qaOPdRhp2m9pq2xtaMZEZMKqXoCH7/D9/iqVOg60oJgw1+ecZeKToXKAcvJ9+gQ3ZI0R 6FLiLZWqKfgNaI2/eZW+GlzSos+3gDzDxnYcJBeqU6B6KZrrDC9Bkk3+EddNF7pTXXaS fGfWxY8e6DRFTxQTCbQDcE0NIejIeDgdN3nQadShOQ1GlUaaa19n2ok/g7g3kWxhYUbC sy5AbaZ+/O4sdsicGUaBOhIcJ21p8rFA2qnKDGQssIx5jwQ+1VnOYgtcAMsdU3jdf9vV D4nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727320543; x=1727925343; 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=en9psBNMStwKodn93aMSK2Fyu/+fQVnNlkSS63qwBq8=; b=C3pHaAIw8T8j1d5GwNOTkDCPVA/0JAOI5yIglOqrrg0+xneqk27DVf36HWDOrbNKmA UkEDytyHF9LgR7gpoQBvFwc5Dn6rbZ86JyG/o84NiAmbc4BUII2R7idC5ciWrM51AS65 CLYLbP/Pi3ZjDsrIjvs4+edv+iZHe4O2Dx3vJ1CmLqy5BLiVoAWeCTh1P1N4gJgyNrNk +/BymVe6qTsPrP5jSVDoqx6GlptaROshUkRH01d7gny3wfror3TYsfyfV2JZv+7IUCrf TRygjfTdQ4NY2FYG3UWPNjtw3QLEA8HPyGfP5odfxMMqLhqb9cGw1LaVElEUxgA+Ny2q ylEg== X-Gm-Message-State: AOJu0Yx0sT+sM1ivdhyCgu7mSGs8bD4oMf0rmpHwlX5sff2wsm7KwNYv eWBnhr0BXCHzz4nK11VAbLKwWU11VEr6iN6pHcvChCk+nHUewjN1NsOLnA== X-Google-Smtp-Source: AGHT+IHggZguc8CiqNXruuHi0XMGr8WXaACMQ1iAuvmkXQrIgqwTKJOyoqmtNsAbUkHMadSwvmcXcA== X-Received: by 2002:a17:903:1cd:b0:205:4613:30bf with SMTP id d9443c01a7336-20afc62d01dmr64507735ad.55.1727320542951; Wed, 25 Sep 2024 20:15:42 -0700 (PDT) Received: from hurd.lan ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20af17e0301sm29895875ad.156.2024.09.25.20.15.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Sep 2024 20:15:42 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 26 Sep 2024 12:10:01 +0900 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: 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 (jg-cega): New variable. Change-Id: Ice3799d9aa4600006ac386fa40e80fb97b3018c8 --- gnu/packages/emulators.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 909602acb3..9e05d59f5c 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2458,6 +2458,42 @@ (define-public jg-nestopia (license (list license:gpl2+ ;this project license:lgpl2.1+)))) ;nes_ntsc source files +(define-public jg-cega + (package + (name "jg-cega") + (version "0.6.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jgemu/cega") + (commit version))) + (modules '((guix build utils))) + (snippet '(delete-file-recursively "deps/")) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10qxfch08850zivxf4s1mhh0clx4h1cfn440acm6d7glb6wbv822")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ;no test suite + #:make-flags + #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases #~(modify-phases %standard-phases + (delete 'configure)))) + (native-inputs (list jg-api pkg-config)) + (inputs (list speexdsp)) + (home-page "https://gitlab.com/jgemu/cega") + (synopsis "Jolly Good SG-1000, SMS, Game Gear, and Mega Drive/Genesis \ +emulator") + (description "Cega is a cycle accurate emulator for the Sega SG-1000, +Master System, and Game Gear written specifically for The Jolly Good API. +Mega Drive emulation is in an experimental state.") + (license (list license:mpl2.0 + license:expat ;src/emu2413, src/m68k + license:bsd-3 ;src/ymfm + license:zlib)))) ;src/z80.h + (define-public zsnes (package (name "zsnes")