[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62724] [PATCH v2] gnu: mame: Update to 0.253.
From: |
Nicolas Goaziou |
Subject: |
[bug#62724] [PATCH v2] gnu: mame: Update to 0.253. |
Date: |
Tue, 11 Apr 2023 14:53:55 +0200 |
* 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.
---
v2: Do not list every third-party to remove. Try to find a minimal set instead.
gnu/packages/emulators.scm | 46 ++++++++++++++++++++++++--------------
1 file changed, 29 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 7e73b217ea..882778bd21 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,44 @@ (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"
+ "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
(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 +1908,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
- [bug#62724] [PATCH] gnu: mame: Update to 0.253., Nicolas Goaziou, 2023/04/08
- [bug#62724] [PATCH v2] gnu: mame: Update to 0.253.,
Nicolas Goaziou <=
- [bug#62724] [PATCH v3] gnu: mame: Update to 0.253., Nicolas Goaziou, 2023/04/12
- [bug#62724] [PATCH v4] gnu: mame: Update to 0.253., Nicolas Goaziou, 2023/04/13
- [bug#62724] [PATCH v5] gnu: mame: Update to 0.253., Nicolas Goaziou, 2023/04/13
- [bug#62724] [PATCH v6] gnu: mame: Update to 0.253., Nicolas Goaziou, 2023/04/14
- [bug#62724] [PATCH v7] gnu: mame: Update to 0.253., Nicolas Goaziou, 2023/04/17
- [bug#62724] [PATCH v8] gnu: mame: Update to 0.253., Nicolas Goaziou, 2023/04/19
- [bug#62724] [PATCH v9] gnu: mame: Update to 0.253., Nicolas Goaziou, 2023/04/20