Received: (at 62724) by debbugs.gnu.org; 17 Apr 2023 11:16:59 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Apr 17 07:16:59 2023 Received: from localhost ([127.0.0.1]:53863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1poMqw-0003xp-QC for submit <at> debbugs.gnu.org; Mon, 17 Apr 2023 07:16:59 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:49363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1poMqr-0003xY-Ep for 62724 <at> debbugs.gnu.org; Mon, 17 Apr 2023 07:16:56 -0400 Received: (Authenticated sender: admin@HIDDEN) by mail.gandi.net (Postfix) with ESMTPSA id 9DA3924000C for <62724 <at> debbugs.gnu.org>; Mon, 17 Apr 2023 11:16:46 +0000 (UTC) From: Nicolas Goaziou <mail@HIDDEN> To: 62724 <at> debbugs.gnu.org Subject: [PATCH v7] gnu: mame: Update to 0.253. Date: Mon, 17 Apr 2023 13:16:40 +0200 Message-Id: <20230417111640.1029677-1-mail@HIDDEN> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 62724 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.7 (-) * 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. [inputs]: Replace LUA with LUA-5.4. --- v7: Preserve "lsqlite3" third-party library. gnu/packages/emulators.scm | 59 ++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index fa1f07eaf3..a4b1260f4b 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.253") (source (origin (method git-fetch) @@ -1769,33 +1769,55 @@ (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" + "linenoise" + "lsqlite3" + "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 +1920,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 +1935,7 @@ (define-public mame libjpeg-turbo libxi libxinerama - lua + lua-5.4 portaudio portmidi pugixml base-commit: 9a5e1dc1f16f5f8c056e64f2077b035784003673 -- 2.39.2
guix-patches@HIDDEN
:bug#62724
; Package guix-patches
.
Full text available.Received: (at 62724) by debbugs.gnu.org; 14 Apr 2023 21:13:34 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Apr 14 17:13:34 2023 Received: from localhost ([127.0.0.1]:47804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pnQjd-0003AV-Sn for submit <at> debbugs.gnu.org; Fri, 14 Apr 2023 17:13:34 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:43869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1pnQja-0003AD-SE for 62724 <at> debbugs.gnu.org; Fri, 14 Apr 2023 17:13:31 -0400 Received: (Authenticated sender: admin@HIDDEN) by mail.gandi.net (Postfix) with ESMTPSA id 029D240006 for <62724 <at> debbugs.gnu.org>; Fri, 14 Apr 2023 21:13:23 +0000 (UTC) From: Nicolas Goaziou <mail@HIDDEN> To: 62724 <at> debbugs.gnu.org Subject: [PATCH v6] gnu: mame: Update to 0.253. Date: Fri, 14 Apr 2023 23:13:17 +0200 Message-Id: <20230414211317.964287-1-mail@HIDDEN> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 62724 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.7 (-) * 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. [inputs]: Replace LUA with LUA-5.4. --- v6: Preserve "minimp3" third-party library. gnu/packages/emulators.scm | 58 ++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7e73b217ea..d8fb09f89a 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,54 @@ (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" + "linenoise" + "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 @@ -1897,7 +1918,8 @@ (define-public mame Keywords=Game;Emulator;Arcade;~%" executable))))))))) (native-inputs - (list pkg-config + (list nasm + pkg-config python-sphinx python-sphinxcontrib-svg2pdfconverter texinfo)) @@ -1911,7 +1933,7 @@ (define-public mame libjpeg-turbo libxi libxinerama - lua + lua-5.4 portaudio portmidi pugixml base-commit: a4e9842a70775a54bbe1369881b739e7ea9a6432 -- 2.39.2
guix-patches@HIDDEN
:bug#62724
; Package guix-patches
.
Full text available.Received: (at 62724) by debbugs.gnu.org; 13 Apr 2023 15:37:56 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Apr 13 11:37:56 2023 Received: from localhost ([127.0.0.1]:44473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pmz1H-0007e9-Qx for submit <at> debbugs.gnu.org; Thu, 13 Apr 2023 11:37:56 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:41469) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1pmz1D-0007ds-TH for 62724 <at> debbugs.gnu.org; Thu, 13 Apr 2023 11:37:54 -0400 Received: (Authenticated sender: admin@HIDDEN) by mail.gandi.net (Postfix) with ESMTPSA id 691E0C000B for <62724 <at> debbugs.gnu.org>; Thu, 13 Apr 2023 15:37:43 +0000 (UTC) From: Nicolas Goaziou <mail@HIDDEN> To: 62724 <at> debbugs.gnu.org Subject: [PATCH v5] gnu: mame: Update to 0.253. Date: Thu, 13 Apr 2023 17:37:42 +0200 Message-Id: <20230413153742.942748-1-mail@HIDDEN> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 62724 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.7 (-) * 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. [inputs]: Replace LUA with LUA-5.4. --- v5: Preserve linenoise and wdlfft third-party libraries. gnu/packages/emulators.scm | 57 ++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7e73b217ea..6b7d453c64 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,53 @@ (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" + "linenoise" + "lzma" + "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 @@ -1897,7 +1917,8 @@ (define-public mame Keywords=Game;Emulator;Arcade;~%" executable))))))))) (native-inputs - (list pkg-config + (list nasm + pkg-config python-sphinx python-sphinxcontrib-svg2pdfconverter texinfo)) @@ -1911,7 +1932,7 @@ (define-public mame libjpeg-turbo libxi libxinerama - lua + lua-5.4 portaudio portmidi pugixml base-commit: a4e9842a70775a54bbe1369881b739e7ea9a6432 -- 2.39.2
guix-patches@HIDDEN
:bug#62724
; Package guix-patches
.
Full text available.Received: (at 62724) by debbugs.gnu.org; 13 Apr 2023 11:32:49 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Apr 13 07:32:49 2023 Received: from localhost ([127.0.0.1]:42725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pmvC5-0005jr-7s for submit <at> debbugs.gnu.org; Thu, 13 Apr 2023 07:32:49 -0400 Received: from relay2-d.mail.gandi.net ([217.70.183.194]:34151) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1pmvC3-0005jd-3j for 62724 <at> debbugs.gnu.org; Thu, 13 Apr 2023 07:32:48 -0400 Received: (Authenticated sender: admin@HIDDEN) by mail.gandi.net (Postfix) with ESMTPSA id A502040010 for <62724 <at> debbugs.gnu.org>; Thu, 13 Apr 2023 11:32:40 +0000 (UTC) From: Nicolas Goaziou <mail@HIDDEN> To: 62724 <at> debbugs.gnu.org Subject: [PATCH v4] gnu: mame: Update to 0.253. Date: Thu, 13 Apr 2023 13:32:39 +0200 Message-Id: <20230413113239.939168-1-mail@HIDDEN> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 62724 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.7 (-) * 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. [inputs]: Replace LUA with LUA-5.4. --- v4: Use Lua 5.4 as input. gnu/packages/emulators.scm | 55 +++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7e73b217ea..0850f9ce46 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)) @@ -1911,7 +1930,7 @@ (define-public mame libjpeg-turbo libxi libxinerama - lua + lua-5.4 portaudio portmidi pugixml base-commit: a4e9842a70775a54bbe1369881b739e7ea9a6432 -- 2.39.2
guix-patches@HIDDEN
:bug#62724
; Package guix-patches
.
Full text available.Received: (at 62724) by debbugs.gnu.org; 12 Apr 2023 17:42:03 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Apr 12 13:42:03 2023 Received: from localhost ([127.0.0.1]:41742 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pmeTr-0003A0-7w for submit <at> 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 <mail@HIDDEN>) id 1pmeTo-00039A-9A for 62724 <at> debbugs.gnu.org; Wed, 12 Apr 2023 13:42:02 -0400 Received: (Authenticated sender: admin@HIDDEN) by mail.gandi.net (Postfix) with ESMTPSA id 4E9DBC0005 for <62724 <at> debbugs.gnu.org>; Wed, 12 Apr 2023 17:41:53 +0000 (UTC) From: Nicolas Goaziou <mail@HIDDEN> To: 62724 <at> debbugs.gnu.org Subject: [PATCH v3] gnu: mame: Update to 0.253. Date: Wed, 12 Apr 2023 19:41:47 +0200 Message-Id: <20230412174147.930153-1-mail@HIDDEN> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 62724 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.7 (-) * 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
guix-patches@HIDDEN
:bug#62724
; Package guix-patches
.
Full text available.Received: (at 62724) by debbugs.gnu.org; 11 Apr 2023 12:54:10 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 11 08:54:10 2023 Received: from localhost ([127.0.0.1]:36876 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pmDVh-0004I6-T8 for submit <at> debbugs.gnu.org; Tue, 11 Apr 2023 08:54:10 -0400 Received: from relay6-d.mail.gandi.net ([217.70.183.198]:48999) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1pmDVf-0004Hq-Pp for 62724 <at> debbugs.gnu.org; Tue, 11 Apr 2023 08:54:08 -0400 Received: (Authenticated sender: admin@HIDDEN) by mail.gandi.net (Postfix) with ESMTPSA id 47F62C0002 for <62724 <at> debbugs.gnu.org>; Tue, 11 Apr 2023 12:54:01 +0000 (UTC) From: Nicolas Goaziou <mail@HIDDEN> To: 62724 <at> debbugs.gnu.org Subject: [PATCH v2] gnu: mame: Update to 0.253. Date: Tue, 11 Apr 2023 14:53:55 +0200 Message-Id: <20230411125355.919934-1-mail@HIDDEN> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 62724 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.7 (-) * 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
guix-patches@HIDDEN
:bug#62724
; Package guix-patches
.
Full text available.Received: (at submit) by debbugs.gnu.org; 8 Apr 2023 10:14:31 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Apr 08 06:14:31 2023 Received: from localhost ([127.0.0.1]:57771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1pl5aY-0007Bp-To for submit <at> debbugs.gnu.org; Sat, 08 Apr 2023 06:14:31 -0400 Received: from lists.gnu.org ([209.51.188.17]:53280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mail@HIDDEN>) id 1pl5aY-0007Bi-C7 for submit <at> debbugs.gnu.org; Sat, 08 Apr 2023 06:14:30 -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 <mail@HIDDEN>) id 1pl5aY-0007Gs-3S for guix-patches@HIDDEN; Sat, 08 Apr 2023 06:14:30 -0400 Received: from relay11.mail.gandi.net ([2001:4b98:dc4:8::231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <mail@HIDDEN>) id 1pl5aW-0002Lh-85 for guix-patches@HIDDEN; Sat, 08 Apr 2023 06:14:29 -0400 Received: (Authenticated sender: admin@HIDDEN) by mail.gandi.net (Postfix) with ESMTPSA id D4127100002 for <guix-patches@HIDDEN>; Sat, 8 Apr 2023 10:14:23 +0000 (UTC) From: Nicolas Goaziou <mail@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH] gnu: mame: Update to 0.253. Date: Sat, 8 Apr 2023 12:14:22 +0200 Message-Id: <20230408101422.781587-1-mail@HIDDEN> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:4b98:dc4:8::231; envelope-from=mail@HIDDEN; helo=relay11.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit 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: -2.6 (--) * gnu/packages/emulators.scm (mame): Update to 0.253. --- gnu/packages/emulators.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7e73b217ea..7854888a65 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,7 +1768,7 @@ (define-public mame (commit (apply string-append "mame" (string-split version #\.))))) (file-name (git-file-name name version)) (sha256 - (base32 "07qhcm1v47sy2wj30nx3cbhvcbgki0cl83gabr0miiw60fhgyn6j")) + (base32 "0mk6clpvw7y567qis1g1rxabwz7qxik6c1ywjdqr5075a2kw44jm")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. base-commit: 6311493d7a6271bfbc51f4693857f9a12fe9965d -- 2.39.2
Nicolas Goaziou <mail@HIDDEN>
:guix-patches@HIDDEN
.
Full text available.guix-patches@HIDDEN
:bug#62724
; Package guix-patches
.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.