me/guix
Archived
1
0
Fork 0
Code Activity

gnu: dosbox-staging: Update to 0.77.1.

Browse source 
* gnu/packages/emulators.scm (dosbox-staging): Update to 0.77.1.
[build-system]: Switch to Meson.
[arguments]: Remove all old #:configure-flags.  Disable unit_tests and mt32emu.
[native-inputs]: Remove autoconf & automake.
[inputs]: Add mesa.
This commit is contained in:
Tobias Geerinckx-Rice 2021-10-04 23:46:56 +02:00
parent 226221df6f
commit 365a994738
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/emulators.scm
View file

@ -47,10 +47,11 @@
#:use-module (gnu packages audio) #:use-module (gnu packages audio)
#:use-module (gnu packages autogen) #:use-module (gnu packages autogen)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages backup)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages boost) #:use-module (gnu packages boost)
#:use-module (gnu packages backup) #:use-module (gnu packages build-tools)
#: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)
@ -102,6 +103,7 @@
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)) #:use-module (guix build-system python))
(define-public vice (define-public vice
@ -398,7 +400,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.76.0") (version "0.77.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -407,34 +409,20 @@ 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 "14zlkm9qmaq2x4zdiadczsxvdnrf35w13ccvkxzd8cwrzxv84fvd")))) (base32 "07jwmmm1bhfxavlhl854cj8l5iy5hqx5hpwkkjbcwqg7yh9jfs2x"))))
(build-system gnu-build-system) (build-system meson-build-system)
(arguments (arguments
`(#:configure-flags `(#:meson ,meson-0.55 #:configure-flags
(let* ((flags (list "-O3" ;; These both try to git clone subprojects.
;; From scripts/automator/build/gcc-defaults. (list "-Dunit_tests=disabled" ; gtest
"-fstrict-aliasing" "-Duse_mt32emu=false"))) ; mt32emu
"-fno-signed-zeros"
"-fno-trapping-math"
"-fassociative-math"
"-frename-registers"
"-ffunction-sections"
"-fdata-sections"))
(CFLAGS (string-join flags " ")))
;; Several files #include <SDL_net.h> instead of <SDL2/SDL_net.h>,
;; including configure.ac itself.
(list (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "sdl2")
"/include/SDL2")
(string-append "CFLAGS=" CFLAGS)
(string-append "CXXFLAGS=-DNDEBUG " CFLAGS)))))
(native-inputs (native-inputs
`(("autoconf" ,autoconf) `(("pkg-config" ,pkg-config)))
("automake" ,automake)
("pkg-config" ,pkg-config)))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("fluidsynth" ,fluidsynth) ("fluidsynth" ,fluidsynth)
("libpng" ,libpng) ("libpng" ,libpng)
("mesa" ,mesa)
("opusfile" ,opusfile) ("opusfile" ,opusfile)
("sdl2" ,(sdl-union (list sdl2 sdl2-net))) ("sdl2" ,(sdl-union (list sdl2 sdl2-net)))
("zlib" ,zlib))) ("zlib" ,zlib)))