Received: (at 76545) by debbugs.gnu.org; 14 Mar 2025 05:54:04 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Mar 14 01:54:04 2025
Received: from localhost ([127.0.0.1]:59585 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tsxzg-0001ho-F4
for submit <at> debbugs.gnu.org; Fri, 14 Mar 2025 01:54:04 -0400
Received: from mail.envs.net ([5.199.136.28]:50586)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <iyzsong@HIDDEN>) id 1tsxzd-0001hJ-RV
for 76545 <at> debbugs.gnu.org; Fri, 14 Mar 2025 01:54:02 -0400
Received: from localhost (mail.envs.net [127.0.0.1])
by mail.envs.net (Postfix) with ESMTP id 0544838A3FF8;
Fri, 14 Mar 2025 05:53:59 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa;
t=1741931639; bh=zyioI/u9bKl7ksmaWS+IVfj0Nz/Y2rb2a4zGlSceEwI=;
h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
b=ZRr6rR2uqflzocXy+blZxhYzCNvHpSEwb36rgey2NhvkNujQsf0MaaNkjZ4AWh1bs
SIcrT5uy31qfieeyyrhH9yMm9poFjfj8mLL294tOM4xJBmRlsjsMgxjHhF4owtwRN/
h9fdOZ8WiHC4mdECucV7nsx2vJA2GK0n9gJGLDW7fbThM7JbKizdj+j3y2sBeQTFUe
BEkrXyMdEO6fs5YCj8DEEEU6ireC79eULZHrHSlaHbDFWfhn7SG19kUl4oW4G7t25R
+2DqwFPirkFCNlQQmD4912LMUhCtErIknWA3kr38cLH9yzOJv1AmedjB1liEWZSmCu
LAKGwyuiE7WVdkvRI40F8pNt2wXfbaWo/jihqtP0QPOGAZqkwE7h1KnhvOZrAQTrbN
xBbt6SsewNbSk1+Zp/6jNx9U/ddJC5ct/yYXPxZ/8sNWXYyYIwXDTrI1OqyurmBESJ
Wa1yA66I0E9QzcNNiMTHtJf85Api4IGTkUFa6PCpQeRcmiQAnnuMYGlJxbEgM/kHxR
kkauM1I5qGZUQYL9eLZiUChJwrck122h+4lMeOhwrM8eanfQvvcyWvIrrbj+Pc7xvZ
bgNm1/h5Z+2GXGEhcV5tLIH+eFuFV7qTDpdleA5nWaigHyyhG5fUiBQDo+MKhKBfIE
6HMaiprrgr1jbItaEmY8VAks=
X-Virus-Scanned: Debian amavisd-new at mail.envs.net
Received: from mail.envs.net ([127.0.0.1])
by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026)
with ESMTP id wfYWiW21bJet; Fri, 14 Mar 2025 05:53:52 +0000 (UTC)
Received: from localhost (unknown [112.44.101.240])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest
SHA256) (No client certificate requested)
by mail.envs.net (Postfix) with ESMTPSA;
Fri, 14 Mar 2025 05:53:52 +0000 (UTC)
Received: from localhost (localhost [local])
by localhost (OpenSMTPD) with ESMTPA id 4fa61a14;
Fri, 14 Mar 2025 05:58:03 +0000 (UTC)
From: =?utf-8?B?5a6L5paH5q2m?= <iyzsong@HIDDEN>
To: Nicolas Goaziou <mail@HIDDEN>
Subject: Re: [bug#76545] [PATCH v2] gnu: mame: Update to 0.275.
In-Reply-To: <5179ae334bbc5b51d217a8cd310758add6a1e5d5.1741823527.git.mail@HIDDEN>
(Nicolas Goaziou's message of "Thu, 13 Mar 2025 16:53:58 +0100")
References: <76983e8b7129b0420e0e2e51e6785a2bebb6bdaf.1740479118.git.mail@HIDDEN>
<5179ae334bbc5b51d217a8cd310758add6a1e5d5.1741823527.git.mail@HIDDEN>
Date: Fri, 14 Mar 2025 13:58:03 +0800
Message-ID: <87sengrw5w.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 76545
Cc: 76545 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler@HIDDEN>,
Adam Faiz <adam.faiz@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Hello,
Nicolas Goaziou <mail@HIDDEN> writes:
> * gnu/packages/emulators.scm (mame): Update to 0.275.
> [source]: Add modules for cut and scandir. Preserve the minimum set of
> third-party libraries.
> [arguments]<#:make-flags>: Remove unnecessary flags.
> <#:phases>: Add a phase to use all possible system libraries instead of
> listing them piece wise.
> [native-inputs]: Add nasm.
> [inputs]: Replace lua with lua-5.4. Add zstd:lib.
> [...]
> #~(modify-phases %standard-phases
> + ;; (add-after 'unpack 'fix-sol2-build-error
> + ;; ;; Fix "error: operator '!=' has no left operand" because
> + ;; ;; LUA_COMPAT_BITLIB is empty.
> + ;; (lambda _
> + ;; (substitute* "3rdparty/sol2/sol/sol.hpp"
> + ;; (("&& \\(LUA_COMPAT_BITLIB != 0\\)") ""))))
Does this commented phase useful? Maybe just remove it.
Otherwise looks good to me, thanks.
guix-patches@HIDDEN:bug#76545; Package guix-patches.
Full text available.
Received: (at 76545) by debbugs.gnu.org; 13 Mar 2025 15:55:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Mar 13 11:55:12 2025
Received: from localhost ([127.0.0.1]:57757 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tskts-0007ZQ-2d
for submit <at> debbugs.gnu.org; Thu, 13 Mar 2025 11:55:12 -0400
Received: from msg-3.mailo.com ([213.182.54.8]:57652 helo=mailo.com)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <mail@HIDDEN>)
id 1tsktn-0007T1-DP
for 76545 <at> debbugs.gnu.org; Thu, 13 Mar 2025 11:55:09 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=nicolasgoaziou.fr;
s=mailo; t=1741881299;
bh=E7FOHO2POz5bxA/wOJsoVCqplOyySyaBBiNzB4Q1gVw=;
h=X-EA-Auth:From:To:Cc:Subject:Date:Message-ID:X-Mailer:
MIME-Version:Content-Type:Content-Transfer-Encoding;
b=SVVcOxbXI6ke+MGV5b8OINKCKu36p6Tty6QJo3+4FeH2VpeL/0Hw4Mr80O9auZA7p
K64oOQ0uKI2+72gSC86du1zB2QeSvFzgBqH113JltJJNAPE3L4EONP9g0xotsSWpFq
1dFn636hJAg9VpLD+WPlHUP6lgDI9JEeqMVcetXE=
Received: by b221-4.in.mailobj.net [192.168.90.24] with ESMTP
via ip-20.mailobj.net [213.182.54.20]
Thu, 13 Mar 2025 16:54:56 +0100 (CET)
X-EA-Auth: 5QC7NzidMishOKsqS6NKeLC4eO2tdWLNvF3Gv+7ywf5jnNNP9ke3Kg3pc7yneXsbJ8Z1/ATjKs+7mgO8htVCnwl0XRmbzNAGpaEz0nPur2A=
From: Nicolas Goaziou <mail@HIDDEN>
To: 76545 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: mame: Update to 0.275.
Date: Thu, 13 Mar 2025 16:53:58 +0100
Message-ID: <5179ae334bbc5b51d217a8cd310758add6a1e5d5.1741823527.git.mail@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
X-Debbugs-Cc: Nicolas Goaziou <mail@HIDDEN>, Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 76545
Cc: Nicolas Goaziou <mail@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
* gnu/packages/emulators.scm (mame): Update to 0.275.
[source]: Add modules for cut and scandir. Preserve the minimum set of
third-party libraries.
[arguments]<#:make-flags>: Remove unnecessary flags.
<#:phases>: Add a phase to use all possible system libraries instead of
listing them piece wise.
[native-inputs]: Add nasm.
[inputs]: Replace lua with lua-5.4. Add zstd:lib.
Change-Id: I650a008461d69e5a39ba6a12e7140aa785dc0298
---
- v2: Update to 0.275. Add zstd:lib as an input.
gnu/packages/emulators.scm | 74 +++++++++++++++++++++++++++-----------
1 file changed, 54 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 2bed105653..b7dd141120 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2015, 2018, 2023 David Thompson <dthompson2@HIDDEN>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@HIDDEN>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@HIDDEN>
-;;; Copyright © 2017-2024 Nicolas Goaziou <mail@HIDDEN>
+;;; Copyright © 2017-2025 Nicolas Goaziou <mail@HIDDEN>
;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@HIDDEN>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@HIDDEN>
;;; Copyright © 2019 Pierre Neidhardt <mail@HIDDEN>
@@ -3025,7 +3025,7 @@ (define-public libticalcs2
(define-public mame
(package
(name "mame")
- (version "0.252")
+ (version "0.275")
(source
(origin
(method git-fetch)
@@ -3034,33 +3034,65 @@ (define-public mame
(commit (apply string-append "mame" (string-split version #\.)))))
(file-name (git-file-name name version))
(sha256
- (base32 "07qhcm1v47sy2wj30nx3cbhvcbgki0cl83gabr0miiw60fhgyn6j"))
- (modules '((guix build utils)))
+ (base32 "178wvdr126klz4xmhiv737xys6d3wvgrs216h9544y4s1pvxskpk"))
+ (modules '((ice-9 ftw)
+ (srfi srfi-26)
+ (guix build utils)))
(snippet
- ;; Remove bundled libraries.
- '(begin
- (with-directory-excursion "3rdparty"
- (for-each delete-file-recursively
- '("asio" "expat" "glm" "libflac" "libjpeg" "lua"
- "portaudio" "portmidi" "pugixml" "rapidjson" "SDL2"
- "SDL2-override" "sqlite3" "utf8proc" "zlib")))))))
+ ;; Remove most bundled libraries.
+ ;;
+ ;; XXX: Some of the preserved the libraries below ship with Guix, but
+ ;; may prove difficult to un-bundle.
+ #~(with-directory-excursion "3rdparty"
+ (let ((keep (list "." ".."
+ "asmjit"
+ "bgfx"
+ "bimg"
+ "bx"
+ "genie"
+ "linenoise"
+ "lsqlite3"
+ "lua-linenoise"
+ "lua-zlib"
+ "luafilesystem"
+ "lzma"
+ "minimp3"
+ "nanosvg"
+ "softfloat"
+ "softfloat3"
+ "sol2"
+ "wdlfft"
+ "ymfm")))
+ (for-each delete-file-recursively
+ (scandir "." (negate (cut member <> keep)))))))))
(build-system gnu-build-system)
(arguments
(list
#:make-flags
- #~(cons*
+ #~(list
;; A 'strict-overflow' error pops up on i686 so disable '-Werror'.
"NOWERROR=1"
(string-append "QT_HOME=" #$(this-package-input "qtbase"))
- (string-append "SDL_INI_PATH=" #$output "/share/mame/ini")
- (map (lambda (lib)
- (string-append "USE_SYSTEM_LIB_" (string-upcase lib) "=1"))
- '("asio" "expat" "flac" "glm" "jpeg" "lua" "portaudio" "portmidi"
- "pugixml" "rapidjson" "sqlite3" "utf8proc" "zlib")))
+ (string-append "SDL_INI_PATH=" #$output "/share/mame/ini"))
#:tests? #f ;no test in regular release
#:phases
#~(modify-phases %standard-phases
+ ;; (add-after 'unpack 'fix-sol2-build-error
+ ;; ;; Fix "error: operator '!=' has no left operand" because
+ ;; ;; LUA_COMPAT_BITLIB is empty.
+ ;; (lambda _
+ ;; (substitute* "3rdparty/sol2/sol/sol.hpp"
+ ;; (("&& \\(LUA_COMPAT_BITLIB != 0\\)") ""))))
(delete 'configure)
+ (add-before 'build 'use-system-libraries
+ (lambda _
+ (substitute* "makefile"
+ (("# +(USE_SYSTEM_LIB)" _ option) option))))
+ (add-before 'build 'use-c++-lua
+ (lambda _
+ (substitute* (list "scripts/src/main.lua"
+ "scripts/src/3rdparty.lua")
+ (("ext_lib\\(\"lua\"\\)") "ext_lib(\"lua++\")"))))
(add-after 'build 'build-documentation
(lambda _ (invoke "make" "-C" "docs" "man" "info")))
(replace 'install
@@ -3163,7 +3195,8 @@ (define-public mame
Keywords=Game;Emulator;Arcade;~%"
executable)))))))))
(native-inputs
- (list pkg-config
+ (list nasm
+ pkg-config
python-sphinx
python-sphinxcontrib-svg2pdfconverter
texinfo))
@@ -3177,7 +3210,7 @@ (define-public mame
libjpeg-turbo
libxi
libxinerama
- lua
+ lua-5.4
portaudio
portmidi
pugixml
@@ -3188,7 +3221,8 @@ (define-public mame
(sdl-union (list sdl2 sdl2-ttf))
sqlite
utf8proc
- zlib))
+ zlib
+ `(,zstd "lib")))
(home-page "https://www.mamedev.org")
(synopsis "Multi-purpose emulation framework")
(description "MAME's purpose is to preserve decades of software
base-commit: d83d4653e42da26bfb4548f9fcf1bd6e323b40fe
--
2.48.1
mail@HIDDEN, adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#76545; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 25 Feb 2025 10:27:37 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Feb 25 05:27:37 2025
Received: from localhost ([127.0.0.1]:44929 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tmsA4-0000Ih-1K
for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 05:27:36 -0500
Received: from lists.gnu.org ([2001:470:142::17]:57870)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <mail@HIDDEN>)
id 1tmsA0-0000II-NG
for submit <at> debbugs.gnu.org; Tue, 25 Feb 2025 05:27:33 -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 <mail@HIDDEN>)
id 1tms9u-0008BG-Ve
for guix-patches@HIDDEN; Tue, 25 Feb 2025 05:27:27 -0500
Received: from msg-4.mailo.com ([213.182.54.15] helo=mailo.com)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <mail@HIDDEN>)
id 1tms9s-0002JR-Mu
for guix-patches@HIDDEN; Tue, 25 Feb 2025 05:27:26 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=nicolasgoaziou.fr;
s=mailo; t=1740479235;
bh=ZL0BAV9fHo6o/vBs+Tlv+pcUlc+jJexZob7EQnY3wAQ=;
h=X-EA-Auth:From:To:Cc:Subject:Date:Message-ID:X-Mailer:
MIME-Version:Content-Type:Content-Transfer-Encoding;
b=zgQ2Gl/8bbsH89oCyPhauSQj+xZBLvwv2JpRtjPpGZxl0I9ASNytXv5gkZegCi3Tj
ZBb2EX5bDLnfZEs7n3OAtef0kOeyv8j6msmDKnXTIJgt1OoiROhwjlJEwYNAbrJ7e7
6MSXldiizpWD1z4t43Ahp5tIL7phy4vNxu2l8z00=
Received: by b221-8.in.mailobj.net [192.168.90.28] with ESMTP
via ip-20.mailobj.net [213.182.54.20]
Tue, 25 Feb 2025 11:27:11 +0100 (CET)
X-EA-Auth: qYwyyCluRCHxvEDVHDXhgqc/rZ61gVBs+a8qzFjw5QSqkwSc23VhTLRUZ5pT2qUgrsGYTXUP2OM4ufZCT7v0kCULJ78uKcuZsqfL2rAescc=
From: Nicolas Goaziou <mail@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: mame: Update to 0.274.
Date: Tue, 25 Feb 2025 11:26:43 +0100
Message-ID: <76983e8b7129b0420e0e2e51e6785a2bebb6bdaf.1740479118.git.mail@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
X-Debbugs-Cc: Adam Faiz <adam.faiz@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=213.182.54.15;
envelope-from=mail@HIDDEN; helo=mailo.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,
RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.7 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: * gnu/packages/emulators.scm (mame): Update to 0.274.
[source]:
Add modules for CUT and SCANDIR. Preserve the minimum set of third-party
libraries. [arguments]<#:make-flags>: Remove unnecessary flags. [...]
Content analysis details: (1.7 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.8 PDS_OTHER_BAD_TLD Untrustworthy TLDs
[URI: ambrevar.xyz (xyz)]
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
0.9 SPF_FAIL SPF: sender does not match SPF record (fail)
[SPF failed: Please see http://www.openspf.org/Why?s=mfrom;
id=mail%40nicolasgoaziou.fr; ip=2001%3A470%3A142%3A%3A17; r=debbugs.gnu.org]
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org]
X-Debbugs-Envelope-To: submit
Cc: Nicolas Goaziou <mail@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 0.7 (/)
* gnu/packages/emulators.scm (mame): Update to 0.274.
[source]: Add modules for CUT and SCANDIR. Preserve the minimum set of
third-party libraries.
[arguments]<#:make-flags>: Remove unnecessary flags.
<#:phases>: Add a phase to use all possible system libraries instead of
listing them piece wise.
[native-inputs]: Add NASM.
[inputs]: Replace LUA with LUA-5.4.
Change-Id: I650a008461d69e5a39ba6a12e7140aa785dc0298
---
gnu/packages/emulators.scm | 71 ++++++++++++++++++++++++++++----------
1 file changed, 52 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 0eafc3df9e..7a38700ac1 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2015, 2018, 2023 David Thompson <dthompson2@HIDDEN>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@HIDDEN>
;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner <efraim@HIDDEN>
-;;; Copyright © 2017-2024 Nicolas Goaziou <mail@HIDDEN>
+;;; Copyright © 2017-2025 Nicolas Goaziou <mail@HIDDEN>
;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice <me@HIDDEN>
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@HIDDEN>
;;; Copyright © 2019 Pierre Neidhardt <mail@HIDDEN>
@@ -3034,7 +3034,7 @@ (define-public libticalcs2
(define-public mame
(package
(name "mame")
- (version "0.252")
+ (version "0.274")
(source
(origin
(method git-fetch)
@@ -3043,33 +3043,65 @@ (define-public mame
(commit (apply string-append "mame" (string-split version #\.)))))
(file-name (git-file-name name version))
(sha256
- (base32 "07qhcm1v47sy2wj30nx3cbhvcbgki0cl83gabr0miiw60fhgyn6j"))
- (modules '((guix build utils)))
+ (base32 "0xkj5xvnv8fl54k1nnr738jpsxkxmpsxak60ins3bjzcxl3az4by"))
+ (modules '((ice-9 ftw)
+ (srfi srfi-26)
+ (guix build utils)))
(snippet
- ;; Remove bundled libraries.
- '(begin
- (with-directory-excursion "3rdparty"
- (for-each delete-file-recursively
- '("asio" "expat" "glm" "libflac" "libjpeg" "lua"
- "portaudio" "portmidi" "pugixml" "rapidjson" "SDL2"
- "SDL2-override" "sqlite3" "utf8proc" "zlib")))))))
+ ;; Remove most bundled libraries.
+ ;;
+ ;; XXX: Some of the preserved the libraries below ship with Guix, but
+ ;; may prove difficult to un-bundle.
+ #~(with-directory-excursion "3rdparty"
+ (let ((keep (list "." ".."
+ "asmjit"
+ "bgfx"
+ "bimg"
+ "bx"
+ "genie"
+ "linenoise"
+ "lsqlite3"
+ "lua-linenoise"
+ "lua-zlib"
+ "luafilesystem"
+ "lzma"
+ "minimp3"
+ "nanosvg"
+ "softfloat"
+ "softfloat3"
+ "sol2"
+ "wdlfft"
+ "ymfm")))
+ (for-each delete-file-recursively
+ (scandir "." (negate (cut member <> keep)))))))))
(build-system gnu-build-system)
(arguments
(list
#:make-flags
- #~(cons*
+ #~(list
;; A 'strict-overflow' error pops up on i686 so disable '-Werror'.
"NOWERROR=1"
(string-append "QT_HOME=" #$(this-package-input "qtbase"))
- (string-append "SDL_INI_PATH=" #$output "/share/mame/ini")
- (map (lambda (lib)
- (string-append "USE_SYSTEM_LIB_" (string-upcase lib) "=1"))
- '("asio" "expat" "flac" "glm" "jpeg" "lua" "portaudio" "portmidi"
- "pugixml" "rapidjson" "sqlite3" "utf8proc" "zlib")))
+ (string-append "SDL_INI_PATH=" #$output "/share/mame/ini"))
#:tests? #f ;no test in regular release
#:phases
#~(modify-phases %standard-phases
+ ;; (add-after 'unpack 'fix-sol2-build-error
+ ;; ;; Fix "error: operator '!=' has no left operand" because
+ ;; ;; LUA_COMPAT_BITLIB is empty.
+ ;; (lambda _
+ ;; (substitute* "3rdparty/sol2/sol/sol.hpp"
+ ;; (("&& \\(LUA_COMPAT_BITLIB != 0\\)") ""))))
(delete 'configure)
+ (add-before 'build 'use-system-libraries
+ (lambda _
+ (substitute* "makefile"
+ (("# +(USE_SYSTEM_LIB)" _ option) option))))
+ (add-before 'build 'use-c++-lua
+ (lambda _
+ (substitute* (list "scripts/src/main.lua"
+ "scripts/src/3rdparty.lua")
+ (("ext_lib\\(\"lua\"\\)") "ext_lib(\"lua++\")"))))
(add-after 'build 'build-documentation
(lambda _ (invoke "make" "-C" "docs" "man" "info")))
(replace 'install
@@ -3172,7 +3204,8 @@ (define-public mame
Keywords=Game;Emulator;Arcade;~%"
executable)))))))))
(native-inputs
- (list pkg-config
+ (list nasm
+ pkg-config
python-sphinx
python-sphinxcontrib-svg2pdfconverter
texinfo))
@@ -3186,7 +3219,7 @@ (define-public mame
libjpeg-turbo
libxi
libxinerama
- lua
+ lua-5.4
portaudio
portmidi
pugixml
base-commit: 075fe3083b5838463f2cef26e2fc0d1b2c87e310
--
2.48.1
Nicolas Goaziou <mail@HIDDEN>:adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN.
Full text available.adam.faiz@HIDDEN, liliana.prikler@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:bug#76545; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.