From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id yDGtOrntNmTN8QAASxT56A (envelope-from ) for ; Wed, 12 Apr 2023 19:43:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id YMniObntNmSoRgAAG6o9tA (envelope-from ) for ; Wed, 12 Apr 2023 19:43:21 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6BE83F0AE for ; Wed, 12 Apr 2023 19:43:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmeUt-0005X8-9X; Wed, 12 Apr 2023 13:43:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmeUo-0005Vd-Gh for guix-patches@gnu.org; Wed, 12 Apr 2023 13:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pmeUo-0005fp-8o for guix-patches@gnu.org; Wed, 12 Apr 2023 13:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pmeUn-0003BF-Nw for guix-patches@gnu.org; Wed, 12 Apr 2023 13:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62724] [PATCH v3] gnu: mame: Update to 0.253. References: <20230408101422.781587-1-mail@nicolasgoaziou.fr> In-Reply-To: <20230408101422.781587-1-mail@nicolasgoaziou.fr> Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Apr 2023 17:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62724 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62724@debbugs.gnu.org Received: via spool by 62724-submit@debbugs.gnu.org id=B62724.168132132312156 (code B ref 62724); Wed, 12 Apr 2023 17:43:01 +0000 Received: (at 62724) by debbugs.gnu.org; 12 Apr 2023 17:42:03 +0000 Received: from localhost ([127.0.0.1]:41742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmeTr-0003A0-7w for submit@debbugs.gnu.org; Wed, 12 Apr 2023 13:42:03 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:36741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pmeTo-00039A-9A for 62724@debbugs.gnu.org; Wed, 12 Apr 2023 13:42:02 -0400 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 4E9DBC0005 for <62724@debbugs.gnu.org>; Wed, 12 Apr 2023 17:41:53 +0000 (UTC) From: Nicolas Goaziou Date: Wed, 12 Apr 2023 19:41:47 +0200 Message-Id: <20230412174147.930153-1-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1681321401; a=rsa-sha256; cv=none; b=Z/aKa6YhALzUiBiZfzD9WBHT1dLLRYcgjvtCulVeIiGsDpqOglWJGBogilf3SnKW9vH4Uy NgLbM1BXetJUPbp8ozMbjP3GI3ZVqsCVafW2w6fHUsEr4wp6peF3oHdJkY2jxrpIKckmTD v7wuleqWhJbteGVySBWf4bJTRthm2JLJYu4FQwI8VPqAM+mhBV4GRPaFrZhoIEaivJ9opF er6R0GyT2OIYiwGDQr3zkCfTzqZbipxrMHHr0ZbsNn+IKms91r+Zjiwki/5xccZOuklme8 t4np0Oz+UuDfHiVmu9wNXwDIW2NoRPV7lHVzk0WP7YS51gtXQmfHdg9Xmmg/0g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1681321401; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=VhY0ugi5Os1Ct6AptwSQmqi/vxSVRKkXmbjWat2uSHA=; b=OdBXQPnPe7k4a2jiaKPYwNmVSwhLJkoIR6PtXGZBDpuZSSPKC6ZTjRT9j6Va+BvOv+ASTn OTDFx8Y5Z534sGi7JihCDxqUegUX2PJ0HszLsj0XAx29OBymITmPxGHgYwvX6cjWYwIlQU iw6W3iOYEQc7L0YUoeK1kKM4Jyx2eoMVQrLAJW2trGef20y1mWv+FRMX4xK6S3o/5ymmA/ lFJn8n7YshtQr9AyTkRvc9LsqtXYoXTEgUto6LQsW/wLRSjAgrn+JxG1q/WrlD1Qkshk/W M6FIOSN6wL/HVbphrGs2S8ATkDFs5cNdGst8/BqKAGCbWcSr61R5q0LJK47gEA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.82 X-Spam-Score: -1.82 X-Migadu-Queue-Id: 6BE83F0AE Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-TUID: 3AqupV1lDXfl * gnu/packages/emulators.scm (mame): Update to 0.253. [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. --- v3: Preserve nanosvg directory. Add a phase to fix a build issue with sol2. gnu/packages/emulators.scm | 53 ++++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7e73b217ea..31ebc9883a 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1759,7 +1759,7 @@ (define-public libticalcs2 (define-public mame (package (name "mame") - (version "0.252") + (version "0.253") (source (origin (method git-fetch) @@ -1768,33 +1768,51 @@ (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 "0mk6clpvw7y567qis1g1rxabwz7qxik6c1ywjdqr5075a2kw44jm")) + (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. Some of the kept libraries below + ;; are provided by Guix, but difficult to un-bundle. + #~(with-directory-excursion "3rdparty" + (let ((keep (list "." ".." + "asmjit" + "bgfx" + "bimg" + "bx" + "genie" + "lzma" + "nanosvg" + "softfloat" + "softfloat3" + "sol2" + "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-after 'build 'build-documentation (lambda _ (invoke "make" "-C" "docs" "man" "info"))) (replace 'install @@ -1897,7 +1915,8 @@ (define-public mame Keywords=Game;Emulator;Arcade;~%" executable))))))))) (native-inputs - (list pkg-config + (list nasm + pkg-config python-sphinx python-sphinxcontrib-svg2pdfconverter texinfo)) base-commit: a4e9842a70775a54bbe1369881b739e7ea9a6432 -- 2.39.2