Re: 01/01: gnu: mame: Update to 0.200.

Re: 01/01: gnu: mame: Update to 0.200.

[Tobias Geerinckx-Rice]

Nicolas,

Nicolas Goaziou wrote:
> ngz pushed a commit to branch master
> in repository guix.
>
> commit c5ca9b96cb36290cdd6bb96be45edb04fc49ef4b
> Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
> Date:   Sat Aug 11 00:05:24 2018 +0200
>
>     gnu: mame: Update to 0.200.
>     
>     * gnu/packages/emulators.scm (mame): Update to 0.200.
>     [arguments]: Fix missing includes in source.
> ---
>  gnu/packages/emulators.scm | 15 +++++++++++++--
>  1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/emulators.scm 
> b/gnu/packages/emulators.scm
> index a59b0f2..141423d 100644
> --- a/gnu/packages/emulators.scm
> +++ b/gnu/packages/emulators.scm
> @@ -1175,7 +1175,7 @@ play them on systems for which they were 
> never designed!")
>  (define-public mame
>    (package
>      (name "mame")
> -    (version "0.199")
> +    (version "0.200")
>      (source
>       (origin
>         (method git-fetch)
> @@ -1185,7 +1185,7 @@ play them on systems for which they were 
> never designed!")
>         (file-name (git-file-name name version))
>         (sha256
>          (base32
> - 
> "0rb2k6dxss36jjalbpvj2xsqdwqyqy89qab7jpv8ig1y08dpg36n"))
> + 
> "0ddw8635hdm21lgpf13k1vhfywy3460rwciv93vrqmpkq2dvpmib"))
>         (modules '((guix build utils)))
>         (snippet
>          ;; Remove bundled libraries.
> @@ -1211,6 +1211,17 @@ play them on systems for which they were 
> never designed!")
>         #:tests? #f                      ;no test in regular 
>         release
>         #:phases
>         (modify-phases %standard-phases
> +         ;; Add missing include lines for "fmin" and "ceil" 
> functions.
> +         ;; Reported upstream.  Will be fixed in 0.201.
> +         (add-after 'unpack 'add-missing-include
> +           (lambda _
> +             (substitute* "src/devices/cpu/mips/mips3.cpp"
> +               (("#include \"ps2vu.h\"" all)
> +                (string-append all "\n#include <cmath>")))
> +             (substitute* "src/devices/cpu/mips/ps2vif1.cpp"
> +               (("#include \"ps2vif1.h\"" all)
> +                (string-append all "\n#include <cmath>")))
> +             #t))
>           (delete 'configure)
>           (add-after 'build 'build-documentation
>             (lambda _ (invoke "make" "-C" "docs" "man" "info")))

D'oh. I just reported the same bug[0] and was just about to push 
the same fix. :-)

(SUBSTITUTE* can take a list o' files, by the way, so you don't 
need to call it twice.)

Thanks!

T G-R

[0]: 
https://github.com/mamedev/mame/issues/2048#issuecomment-412221348

Re: 01/01: gnu: mame: Update to 0.200.

[Nicolas Goaziou]

Hello,

Tobias Geerinckx-Rice <me@tobias.gr> writes:

> D'oh. I just reported the same bug[0] and was just about to push the
> same fix. :-)

Heh.

The upstream fix landed here:
<https://github.com/mamedev/mame/commit/e84cae7fc6ecd1c8dd2de16c5a2a6469b04ff6ed>

BTW, if you intend to take care about future mame updates -- in addition
to the truckload of packages you already keep up-to-date! --, please let
me know, I'll happily drop it from my watch list. We could then avoid
duplicating efforts.

> (SUBSTITUTE* can take a list o' files, by the way, so you don't need
> to call it twice.)

True, but it means that in each file, one regexp is not matching. I find
it confusing. I guess I'm bike-shedding now. Feel free to refactor it
the way you want. :)

Regards,

-- 
Nicolas Goaziou                                                0x80A93738