bug#65656: closed ([PATCH] gnu: dosbox-staging: Update to 0.80.1.)

[GNU bug Tracking System]

Your message dated Tue, 05 Sep 2023 23:36:24 -0400
with message-id <87msy0as7b.fsf@gmail.com>
and subject line Re: bug#65656: [PATCH] gnu: dosbox-staging: Update to 0.80.1.
has caused the debbugs.gnu.org bug report #65656,
regarding [PATCH] gnu: dosbox-staging: Update to 0.80.1.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
65656: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=65656
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: dosbox-staging: Update to 0.80.1.
>
>
>
>
> Date: 
>
> Thu, 31 Aug 2023 19:42:12 +0800
>
>
>
>
> From: 宋文武 <iyzsong@member.fsf.org>
>
> * gnu/packages/emulators.scm (dosbox-staging): Update to 0.80.1.
> [inputs]: Add libslirp an sdl2-image.  Don't use sdl-union.
> [arguments]: Adjust configure-flags and 'fix-includes' phase.
> ---
>  gnu/packages/emulators.scm | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
> index 67950c1603..1d50c9ef01 100644
> --- a/gnu/packages/emulators.scm
> +++ b/gnu/packages/emulators.scm
> @@ -60,6 +60,7 @@ (define-module (gnu packages emulators)
>    #:use-module (gnu packages cdrom)
>    #:use-module (gnu packages check)
>    #:use-module (gnu packages compression)
> +  #:use-module (gnu packages containers)
>    #:use-module (gnu packages cross-base)
>    #:use-module (gnu packages curl)
>    #:use-module (gnu packages digest)
> @@ -400,7 +401,7 @@ (define-public dosbox-staging
>    ;; This is not a patch staging area for DOSBox, but an unaffiliated fork.
>    (package
>      (name "dosbox-staging")
> -    (version "0.79.1")
> +    (version "0.80.1")
>      (source
>       (origin
>         (method git-fetch)
> @@ -409,16 +410,14 @@ (define-public dosbox-staging
>               (commit (string-append "v" version))))
>         (file-name (git-file-name name version))
>         (sha256
> -        (base32 "0wdnkz3djjc514hn945fr9g9mnpnvk16fan84ny9g5wxak6dvsqp"))))
> +        (base32 "1iqqrw95lpgjbmi777jdl5z1nizxgfy8xwpmy1fasjlb2yh2kp93"))))
>      (build-system meson-build-system)
>      (arguments
>       (list #:configure-flags
>             #~(list
>                ;; These both try to git clone subprojects.
>                "-Dunit_tests=disabled"   ; gtest
> -              "-Duse_mt32emu=false"
> -              ;; Not packaged.
> -              "-Duse_slirp=false")
> +              "-Duse_mt32emu=false")
>             #:phases
>             #~(modify-phases %standard-phases
>                 (add-after 'unpack 'fix-includes
> @@ -426,7 +425,7 @@ (define-public dosbox-staging
>                     ;; This unnecessary file has an encoding error.
>                     (delete-file "./src/libs/sdlcd/macosx/SDLOSXCAGuard.h")
>                     (substitute* (find-files "." "\\.(cpp|h)")
> -                     (("^(#include <)(SDL[_.])" _ include file)
> +                     (("^(#[[:space:]]*include <)(SDL[_.])" _ include file)
>                        (string-append include "SDL2/" file))))))))
>      (native-inputs
>       (list pkg-config))
> @@ -435,9 +434,12 @@ (define-public dosbox-staging
>             fluidsynth
>             iir
>             libpng
> +           libslirp
>             mesa
>             opusfile
> -           (sdl-union (list sdl2 sdl2-net))
> +           sdl2
> +           sdl2-image
> +           sdl2-net
>             speexdsp
>             zlib))
>      (home-page "https://dosbox-staging.github.io";)
>
> base-commit: 299d0463d54c97b237deb2fe9e464108544344c0
> -- 
> 2.41.0
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#65656: [PATCH] gnu: dosbox-staging: Update to 0.80.1.
>
>
>
>
> Date: 
>
> Tue, 05 Sep 2023 23:36:24 -0400
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
>
>
>
>
> > From: 宋文武 <iyzsong@member.fsf.org>
> >
> > * gnu/packages/emulators.scm (dosbox-staging): Update to 0.80.1.
> > [inputs]: Add libslirp an sdl2-image.  Don't use sdl-union.
> > [arguments]: Adjust configure-flags and 'fix-includes' phase.
>
> Installed!
>
> -- 
> Thanks,
> Maxim
>
>
> --- End Message ---