[PATCH] gnu: Add dosbox x86 emulator.

[PATCH] gnu: Add dosbox x86 emulator.

[Paul van der Walt]

* gnu/packages/games.scm (dosbox): New variable.
---
 gnu/packages/games.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 3023794..f204b53 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2015 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -34,7 +35,9 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (guix svn-download)
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages audio)
@@ -1048,6 +1051,47 @@ experience and advance levels, and are carried over from one scenario to the
 next campaign.")
     (license license:gpl2+)))
 
+(define-public dosbox
+  (package
+    (name "dosbox")
+    (version "0.74")
+    (source (origin
+              (method svn-fetch)
+              (uri (svn-reference
+                    (url "http://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk/")
+                    (revision 3947)))
+              ;; Using SVN head, since the last release (2010) is incompatible
+              ;; with GCC5 (see
+              ;; <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624976>).
+              (sha256
+               (base32
+                "1p918j6090d1nkvgq7ifvmn506zrdmyi32y7p3ms40d5ssqjg8fj"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-before
+                   'configure 'autogen.sh
+                   (lambda _
+                     (zero? (system* "sh" "autogen.sh")))))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)))
+    (inputs
+     `(("sdl" ,sdl)
+       ("libpng" ,libpng)
+       ("zlib" ,zlib)
+       ("alsa-lib" ,alsa-lib)
+       ("glu" ,glu)
+       ("mesa" ,mesa)))
+    (home-page "http://www.dosbox.com")
+    (synopsis "x86 emulator with CGA/EGA/VGA/etc. graphics and sound")
+    (description "DOSBox is a DOS-emulator that uses the SDL-library.  DOSBox
+also emulates CPU:286/386 realmode/protected mode, Directory
+FileSystem/XMS/EMS, Tandy/Hercules/CGA/EGA/VGA/VESA graphics, a
+SoundBlaster/Gravis Ultra Sound card for excellent sound compatibility with
+older games.")
+    (license license:gpl3)))
+
 (define-public gamine
   (package
     (name "gamine")
-- 
2.6.1

Re: [PATCH] gnu: Add dosbox x86 emulator.

[Ludovic Courtès]

Paul van der Walt <paul@denknerd.org> skribis:

> * gnu/packages/games.scm (dosbox): New variable.

[...]

> +    (name "dosbox")
> +    (version "0.74")

Rather 0.74.svn3947 or similar.

> +    (source (origin
> +              (method svn-fetch)
> +              (uri (svn-reference
> +                    (url "http://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk/")
> +                    (revision 3947)))
> +              ;; Using SVN head, since the last release (2010) is incompatible
> +              ;; with GCC5 (see
> +              ;; <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624976>).

Sure, but we’re currently building with GCC 4.9.  :-)  Anyway, we’ll have
the problem sooner or later, so this is probably wise.

> +    (description "DOSBox is a DOS-emulator that uses the SDL-library.  DOSBox

“the SDL library”

> +    (license license:gpl3)))

According to dosbox-0.74.tar.gz, it’s GPLv2+, not GPLv3-only.  Could you
double check?

Thanks!

Ludo’.

Re: [PATCH] gnu: Add dosbox x86 emulator.

[Paul van der Walt]

On 2015-10-21 at 21:41, quoth Ludovic Courtès:
>> +    (name "dosbox")
>> +    (version "0.74")
>
> Rather 0.74.svn3947 or similar.

Right, fixed.

>> +              ;; Using SVN head, since the last release (2010) is incompatible
>> +              ;; with GCC5 (see
>> +              ;; <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624976>).
>
> Sure, but we’re currently building with GCC 4.9.  :-)  Anyway, we’ll have
> the problem sooner or later, so this is probably wise.

I've fixed the comment.  IIUC it's actually a problem with GCC 4.8+, but
anyway :).

>> +    (description "DOSBox is a DOS-emulator that uses the SDL-library.  DOSBox
>
> “the SDL library”

Done.

>> +    (license license:gpl3)))
>
> According to dosbox-0.74.tar.gz, it’s GPLv2+, not GPLv3-only.  Could you
> double check?

You're right, fixed.

Cheers,
p.

Re: [PATCH] gnu: Add dosbox x86 emulator.

[Mark H Weaver]

Hi Paul,

Paul van der Walt <paul@denknerd.org> writes:
> +(define-public dosbox
> +  (package
> +    (name "dosbox")
> +    (version "0.74")
> +    (source (origin
> +              (method svn-fetch)
> +              (uri (svn-reference
> +                    (url "http://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk/")
> +                    (revision 3947)))
> +              ;; Using SVN head, since the last release (2010) is incompatible
> +              ;; with GCC5 (see
> +              ;; <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=624976>).
> +              (sha256
> +               (base32
> +                "1p918j6090d1nkvgq7ifvmn506zrdmyi32y7p3ms40d5ssqjg8fj"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:phases (modify-phases %standard-phases
> +                  (add-before
> +                   'configure 'autogen.sh
> +                   (lambda _
> +                     (zero? (system* "sh" "autogen.sh")))))))

For future reference, phases like the one above, that generates the
configure script, should always be put after 'unpack' instead of before
'configure'.  The reason is that there are some phases between the
'unpack' and 'configure' phases that are needed to fix things up in the
generated 'configure' script for non-Intel platforms, especially
'patch-usr-bin-file' which is typically needed on MIPS.

I went ahead and made this change in commit e0a7d36458.

    Regards,
      Mark

Re: [PATCH] gnu: Add dosbox x86 emulator.

[Paul van der Walt]

Hi Mark,

On 2015-10-22 at 00:40, quoth Mark H Weaver:
>> +    (arguments
>> +     `(#:phases (modify-phases %standard-phases
>> +                  (add-before
>> +                   'configure 'autogen.sh
>> +                   (lambda _
>> +                     (zero? (system* "sh" "autogen.sh")))))))
>
> For future reference, phases like the one above, that generates the
> configure script, should always be put after 'unpack' instead of before
> 'configure'.  The reason is that there are some phases between the
> 'unpack' and 'configure' phases that are needed to fix things up in the
> generated 'configure' script for non-Intel platforms, especially
> 'patch-usr-bin-file' which is typically needed on MIPS.
>
> I went ahead and made this change in commit e0a7d36458.

Right, sorry about that, and thank you very much!

p.