From patchwork Thu Mar 13 15:53:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Goaziou X-Patchwork-Id: 40137 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 2E0B227BBE9; Thu, 13 Mar 2025 15:56: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.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 33BCE27BBE2 for ; Thu, 13 Mar 2025 15:56:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tskuq-0000sN-QL; Thu, 13 Mar 2025 11:56:14 -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 1tskui-0000re-PO for guix-patches@gnu.org; Thu, 13 Mar 2025 11:56:06 -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 1tskui-0007Jr-Aa for guix-patches@gnu.org; Thu, 13 Mar 2025 11:56:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=p4rgbYb5LqquMB0VJlCPWI8NCVBrpPJ00HZoznlrPyI=; b=Ow3rzixwiqJnVVYfBU+sSY3eTcPi+Tpda6I7OlSK9kcj7NGdZHUbY9Ptg1yQo3LJs01joUa0sAssnriS1UYthqAmD2qyNEaTuocEo5ehTpyBmxQWnocBG1MbNYEC49E7qYa7W1U1SpiuTBw9zVDZG3TLshSXzLWTQfqYjidp5BhV27rdu36FUMqFcb7Esu5mhn44t1vbuvvyAQBczkgbzNzzroH8DnbvDcwa8iEuJH30iWFPquEfSzASNvrDWankoS/66RtHs0qpgDc4ge58r3UURMpcqSK44g1b99UTPiJnlRg8pYh4eLwaMnJMfPyzMq4b+qH9jSRbR77mXsFwLw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tskug-0007av-AW; Thu, 13 Mar 2025 11:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76545] [PATCH v2] gnu: mame: Update to 0.275. References: <76983e8b7129b0420e0e2e51e6785a2bebb6bdaf.1740479118.git.mail@nicolasgoaziou.fr> In-Reply-To: <76983e8b7129b0420e0e2e51e6785a2bebb6bdaf.1740479118.git.mail@nicolasgoaziou.fr> Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: mail@nicolasgoaziou.fr, adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Thu, 13 Mar 2025 15:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76545@debbugs.gnu.org Cc: Nicolas Goaziou , Nicolas Goaziou , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Nicolas Goaziou , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 76545-submit@debbugs.gnu.org id=B76545.174188131329112 (code B ref 76545); Thu, 13 Mar 2025 15:56:02 +0000 Received: (at 76545) by debbugs.gnu.org; 13 Mar 2025 15:55:13 +0000 Received: from localhost ([127.0.0.1]:57757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tskts-0007ZQ-2d for submit@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 ) id 1tsktn-0007T1-DP for 76545@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= Date: Thu, 13 Mar 2025 16:53:58 +0100 Message-ID: <5179ae334bbc5b51d217a8cd310758add6a1e5d5.1741823527.git.mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.48.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: , Reply-to: Nicolas Goaziou X-ACL-Warn: , Nicolas Goaziou via Guix-patches X-Patchwork-Original-From: Nicolas Goaziou via Guix-patches via From: Nicolas Goaziou 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 (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(-) base-commit: d83d4653e42da26bfb4548f9fcf1bd6e323b40fe 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 ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016, 2017, 2018, 2020 Efraim Flashner -;;; Copyright © 2017-2024 Nicolas Goaziou +;;; Copyright © 2017-2025 Nicolas Goaziou ;;; Copyright © 2017, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2019 Pierre Neidhardt @@ -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