Subject: bug#31587: closed (Re: [bug#31587] [PATCH] Add scummvm)

From: [email-masked] (GNU bug Tracking System)
Date: Fri, 25 May 2018 21:27:02 +0000

Your bug report

#31587: [PATCH] Add scummvm

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
31587: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=31587
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#31587] [PATCH] Add scummvm
From: Nicolas Goaziou <[email-masked]>
To: Rutger Helling <[email-masked]>
Cc: [email-masked]
Date: Fri, 25 May 2018 23:26:23 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello,

Rutger Helling <[email-masked]> writes:

> LGTM, thanks for this!

Pushed. Thank you for the review.

Regards,

-- 
Nicolas Goaziou                                                0x80A93738

Subject: [PATCH] Add scummvm
From: Nicolas Goaziou <[email-masked]>
To: [email-masked]
Date: Fri, 25 May 2018 00:25:03 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hello,

The following patch adds ScummVM to "emulators.scm".

Feedback welcome.

Regards,

-- 
Nicolas Goaziou                                                0x80A93738
>From 057e7e1d72382a6b9776a2d8a9e453c3087e423c Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <[email-masked]>
Date: Fri, 25 May 2018 00:13:40 +0200
Subject: [PATCH] gnu: Add scummvm.

* gnu/packages/emulators.scm (scummvm): New variable.
---
 gnu/packages/emulators.scm | 60 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 4415a5aa9..c354386bd 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2015, 2018 David Thompson <[email-masked]>
 ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <[email-masked]>
 ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <[email-masked]>
-;;; Copyright © 2017 Nicolas Goaziou <[email-masked]>
+;;; Copyright © 2017, 2018 Nicolas Goaziou <[email-masked]>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2017, 2018 Rutger Helling <[email-masked]>
 ;;;
@@ -33,6 +33,7 @@
   #:use-module (guix svn-download)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
+  #:use-module (gnu packages assembly)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
@@ -55,6 +56,7 @@
   #:use-module (gnu packages libedit)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages mp3)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
@@ -1109,3 +1111,59 @@ straight into any libretro-compatible frontend.  RetroArch is the official
 reference frontend for the libretro API, currently used by most as a modular
 multi-system game/emulator system.")
     (license license:gpl3+)))
+
+(define-public scummvm
+  (package
+    (name "scummvm")
+    (version "2.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://www.scummvm.org/frs/scummvm/" version
+                           "/scummvm-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0q6aiw97wsrf8cjw9vjilzhqqsr2rw2lll99s8i5i9svan6l314p"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f                      ;require "git"
+       #:configure-flags (list "--enable-release") ;for optimizations
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           ;; configure does not work followed by both "SHELL=..." and
+           ;; "CONFIG_SHELL=..."; set environment variables instead
+           (lambda* (#:key outputs configure-flags #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bash (which "bash"))
+                    (flags `(,(string-append "--prefix=" out)
+                             ,@configure-flags)))
+               (setenv "SHELL" bash)
+               (setenv "CONFIG_SHELL" bash)
+               (apply invoke "./configure" flags)))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("faad2" ,faad2)
+       ("fluidsynth" ,fluidsynth)
+       ("freetype" ,freetype)
+       ("libflac" ,flac)
+       ("libjpeg-turbo" ,libjpeg-turbo)
+       ("libmad" ,libmad)
+       ("libmpeg2" ,libmpeg2)
+       ("libogg" ,libogg)
+       ("libpng" ,libpng)
+       ("libtheora" ,libtheora)
+       ("libvorbis" ,libvorbis)
+       ("nasm" ,nasm)
+       ("sdl2" ,sdl2)
+       ("zlib" ,zlib)))
+    (home-page "https://www.scummvm.org/")
+    (synopsis "Engine for several graphical adventure games")
+    (description "ScummVM is a program which allows you to run certain
+classic graphical point-and-click adventure games, provided you
+already have their data files.  The clever part about this: ScummVM
+just replaces the executables shipped with the games, allowing you to
+play them on systems for which they were never designed!")
+    (license license:gpl2+)))
-- 
2.17.0