From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 AJ1kJjuPg2RilAAASxT56A (envelope-from ) for ; Fri, 09 Jun 2023 22:44:43 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 0LBiJjuPg2R2QQAA9RJhRA (envelope-from ) for ; Fri, 09 Jun 2023 22:44:43 +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 30F78D364 for ; Fri, 9 Jun 2023 22:44:43 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7ixq-0005Ck-2T; Fri, 09 Jun 2023 16:44:06 -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 1q7ixo-0005C9-HL for guix-patches@gnu.org; Fri, 09 Jun 2023 16:44:04 -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 1q7ixn-0005hq-5W for guix-patches@gnu.org; Fri, 09 Jun 2023 16:44:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q7ixm-0007tF-Eu for guix-patches@gnu.org; Fri, 09 Jun 2023 16:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62724] [PATCH v11] gnu: mame: Update to 0.255. 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: Fri, 09 Jun 2023 20:44:02 +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.168634343630309 (code B ref 62724); Fri, 09 Jun 2023 20:44:02 +0000 Received: (at 62724) by debbugs.gnu.org; 9 Jun 2023 20:43:56 +0000 Received: from localhost ([127.0.0.1]:32786 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7ixf-0007sm-GQ for submit@debbugs.gnu.org; Fri, 09 Jun 2023 16:43:55 -0400 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:50679) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7ixd-0007sW-Nl for 62724@debbugs.gnu.org; Fri, 09 Jun 2023 16:43:54 -0400 X-GND-Sasl: mail@nicolasgoaziou.fr Received: by mail.gandi.net (Postfix) with ESMTPSA id 349ADE0004 for <62724@debbugs.gnu.org>; Fri, 9 Jun 2023 20:43:45 +0000 (UTC) From: Nicolas Goaziou Date: Fri, 9 Jun 2023 22:43:39 +0200 Message-Id: <960d106218b9b6ec68861fa8a800eadcec09e349.1686343392.git.mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.40.1 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1686343483; 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=xye3oZPb6kqQvfCTEpppdWjfCGnlYzKr7Yqr8WW65XE=; b=GO6cSHsTyUjagafZtqUqgOiGetqQA3pMYimSZWwcQS2vOMA3Df4eStbKd2UMuZ4LxqW6EC 4PIQlAIgAAkTQm4ABbHRVeFsbGzCIiYXGHPCRd/NSBvC/zieXmrmYpV8FVp/pNCgs56p4P To4mt7EtK9hcPdU/62MsuvgaAgsBi5Wlppd1FiDp3sBDxjPeNzvF4u4HEQCSO1wljFo1R/ RvKttMVO+52Wv2W5jGvIv59KHanec3kJDvmMc72R42YF4kTQcVQfMjlMwbl6q74NQpCjC5 6Utv5kzWiG5Ojs0DBO89y4+L4Sgw9VK4YeF6OwtlHTDGRX/NqyG9yjmqIXKMuA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=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" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1686343483; a=rsa-sha256; cv=none; b=mMu0VTluk50agNKUH9JoFkSsVx1LwIYOaluxIHFeZoiPIkj5vUjChjXiisulSlJb+X7Xj8 I+buxwR7ZJSrQZHydev7SKiHJ9Vry2qcvM1YJMQeAQCDtJQWnS7dfspzCPKvd8jyIW9P1u wDIKN3bmPsxBRJqfB8lE907/FSf5K8vdqefs0WhL+D61ZELZ2pmoFprT0FaI+DEaR2XpNm zR/PM2xXHlTTarOKkqFDeiFb64WxDI2rebkaT4c7S7ju6Tc4Qnj6eVnV3f2Pb89NNsw4HH ffRWT3r+CXU+1yjAXCZLX7aK9fFNPF+W+Jwa0uod6lbArsjdk3udZC7GGxDNOA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -1.81 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=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" X-Migadu-Queue-Id: 30F78D364 X-Spam-Score: -1.81 X-TUID: mojAjawQvYep * gnu/packages/emulators.scm (mame): Update to 0.254. [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. --- v11: Update to 0.255. Preserve luafilesystem library. gnu/packages/emulators.scm | 64 +++++++++++++++++++++++++++----------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 13b6022308..30082ca163 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1760,7 +1760,7 @@ (define-public libticalcs2 (define-public mame (package (name "mame") - (version "0.252") + (version "0.255") (source (origin (method git-fetch) @@ -1769,33 +1769,60 @@ (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 "13basy5gjrkyfy9ha2nhww1yl0q3q0fawcx6sk3vfmi927c5asq0")) + (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. + ;; + ;; TODO: 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-after 'build 'build-documentation (lambda _ (invoke "make" "-C" "docs" "man" "info"))) (replace 'install @@ -1898,7 +1925,8 @@ (define-public mame Keywords=Game;Emulator;Arcade;~%" executable))))))))) (native-inputs - (list pkg-config + (list nasm + pkg-config python-sphinx python-sphinxcontrib-svg2pdfconverter texinfo)) @@ -1912,7 +1940,7 @@ (define-public mame libjpeg-turbo libxi libxinerama - lua + lua-5.4 portaudio portmidi pugixml base-commit: 44bbfc24e4bcc48d0e3343cd3d83452721af8c36 -- 2.40.1