diff mbox series

[bug#76719,v2,2/2] gnu: dosbox-staging: Update to 0.82.0.

Message ID aa84aeb1e34d7de4049cdba2e8c30a10dd4c99cf.1741114063.git.wongandj@icloud.com
State New
Headers
Series [bug#76719,v2,1/2] gnu: Add mt32emu. |

Commit Message

Andrew Wong March 4, 2025, 6:47 p.m. UTC 
  * gnu/packages/emulators.scm (dosbox-staging): Update to 0.82.0.
[arguments]: Enable MT-32 emulation.
[inputs]: Add mt32emu, googletest.

Change-Id: Ia8ccdd533be6932e2e4fc3660cb472791194523a
---
 gnu/packages/emulators.scm | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

Comments

宋文武 March 5, 2025, 7:43 a.m. UTC | #1 
Andrew Wong <wongandj@icloud.com> writes:

> * gnu/packages/emulators.scm (dosbox-staging): Update to 0.82.0.
> [arguments]: Enable MT-32 emulation.
> [inputs]: Add mt32emu, googletest.

Pushed to master, with skip-failing-tests phase added, thanks.
diff mbox series

Patch

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 0eafc3df9e..15fdc163ec 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -571,7 +571,7 @@  (define-public dosbox-staging
   ;; This is not a patch staging area for DOSBox, but an unaffiliated fork.
   (package
     (name "dosbox-staging")
-    (version "0.81.0")
+    (version "0.82.0")
     (source
      (origin
        (method git-fetch)
@@ -580,32 +580,23 @@  (define-public dosbox-staging
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1fkshxaq12pd72v8m2f3a6d6jk9gh39hn0846gfkfinvw7yykzrl"))))
+        (base32 "1s4c6fiyjm91dnmkval9fvsqszc6yjq5b6pq895xi606dn29b85d"))))
     (build-system meson-build-system)
     (arguments
-     (list #:configure-flags
-           #~(list
-              ;; These both try to git clone subprojects.
-              "-Dunit_tests=disabled"   ; gtest
-              "-Duse_mt32emu=false")
-           #:phases
-           #~(modify-phases %standard-phases
-               (add-after 'unpack 'fix-includes
-                 (lambda _
-                   ;; This unnecessary file has an encoding error.
-                   (delete-file "./src/libs/sdlcd/macosx/SDLOSXCAGuard.h")
-                   (substitute* (find-files "." "\\.(cpp|h)")
-                     (("^(#[[:space:]]*include <)(SDL[_.])" _ include file)
-                      (string-append include "SDL2/" file))))))))
+     ;; The tests expect a traditional directory layout.
+     ;; TODO: find a way to "pick out" the bad test(s).
+     (list #:tests? #f))
     (native-inputs
      (list pkg-config))
     (inputs
      (list alsa-lib
            fluidsynth
+           googletest
            iir
            libpng
            libslirp
            mesa
+           mt32emu
            opusfile
            sdl2
            sdl2-image