futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: dosbox-staging: Update to 0.80.1.

Browse Source 
* 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.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
宋文武 2023-08-31 19:42:12 +08:00 committed by Maxim Cournoyer
parent 3fd15479af
commit 20013ff603
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/emulators.scm
View File

@ -60,6 +60,7 @@
#:use-module (gnu packages cdrom) #:use-module (gnu packages cdrom)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages containers)
#:use-module (gnu packages cross-base) #:use-module (gnu packages cross-base)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages digest) #:use-module (gnu packages digest)
@ -400,7 +401,7 @@ older games.")
;; This is not a patch staging area for DOSBox, but an unaffiliated fork. ;; This is not a patch staging area for DOSBox, but an unaffiliated fork.
(package (package
(name "dosbox-staging") (name "dosbox-staging")
(version "0.79.1") (version "0.80.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -409,16 +410,14 @@ older games.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0wdnkz3djjc514hn945fr9g9mnpnvk16fan84ny9g5wxak6dvsqp")))) (base32 "1iqqrw95lpgjbmi777jdl5z1nizxgfy8xwpmy1fasjlb2yh2kp93"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list #:configure-flags (list #:configure-flags
#~(list #~(list
;; These both try to git clone subprojects. ;; These both try to git clone subprojects.
"-Dunit_tests=disabled" ; gtest "-Dunit_tests=disabled" ; gtest
"-Duse_mt32emu=false" "-Duse_mt32emu=false")
;; Not packaged.
"-Duse_slirp=false")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-includes (add-after 'unpack 'fix-includes
@ -426,7 +425,7 @@ older games.")
;; This unnecessary file has an encoding error. ;; This unnecessary file has an encoding error.
(delete-file "./src/libs/sdlcd/macosx/SDLOSXCAGuard.h") (delete-file "./src/libs/sdlcd/macosx/SDLOSXCAGuard.h")
(substitute* (find-files "." "\\.(cpp|h)") (substitute* (find-files "." "\\.(cpp|h)")
(("^(#include <)(SDL[_.])" _ include file) (("^(#[[:space:]]*include <)(SDL[_.])" _ include file)
(string-append include "SDL2/" file)))))))) (string-append include "SDL2/" file))))))))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
@ -435,9 +434,12 @@ older games.")
fluidsynth fluidsynth
iir iir
libpng libpng
libslirp
mesa mesa
opusfile opusfile
(sdl-union (list sdl2 sdl2-net)) sdl2
sdl2-image
sdl2-net
speexdsp speexdsp
zlib)) zlib))
(home-page "https://dosbox-staging.github.io") (home-page "https://dosbox-staging.github.io")