[PATCH] gnu: Add nestopiaue.

[PATCH] gnu: Add nestopiaue.

[Taylan Ulrich Bayırlı/Kammer]

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

Any opinions on how to handle the xdg-desktop-menu(1) call in the
Makefile?  So far I just remove it.  AFAIUI it's the kind of thing our
profile generator handles.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-nestopiaue.patch --]
[-- Type: text/x-diff, Size: 3778 bytes --]

From 6bd3c34da4e96ffcd5df34cd5b44adf5ab58086a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Sun, 1 Nov 2015 19:38:53 +0100
Subject: [PATCH] gnu: Add nestopiaue.

---
 gnu/packages/games.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 546944a..87358e2 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -38,10 +38,12 @@
   #:use-module (guix svn-download)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages game-development)
   #:use-module (gnu packages gettext)
@@ -1212,3 +1214,61 @@ world}, @uref{http://evolonline.org, Evol Online} and
     ;; "data/themes/{golden-delicious,jewelry}/*" are under CC-BY-SA.
     ;; The rest is under GPL2+.
     (license (list license:gpl2+ license:zlib license:cc-by-sa4.0))))
+
+(define-public nestopiaue
+  (package
+    (name "nestopiaue")
+    (version "1.46.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/rdanbrook/nestopia/archive/"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p"))
+              (modules '((guix build utils)))
+              ;; We don't need libretro for the GNU/Linux build.
+              (snippet
+               '(delete-file-recursively "libretro"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("xdg-utils" ,xdg-utils)))
+    (inputs `(("ao" ,ao)
+              ("glu" ,glu)
+              ("gtk+" ,gtk+)
+              ("libarchive" ,libarchive)
+              ("mesa" ,mesa)
+              ("sdl2" ,sdl2)))
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  ;; The Nestopia build system consists solely of a Makefile.
+                  (delete 'configure)
+                  ;; XXX Should be unnecessary with the next release.
+                  (add-before
+                   'build 'patch-makefile
+                   (lambda _
+                     (substitute* "Makefile"
+                       (("@mkdir \\$@") "@mkdir -p $@")
+                       (("CC =") "CC ?=")
+                       (("CXX =") "CXX ?=")
+                       (("PREFIX =") "PREFIX ?=")
+                       (("^install:\n$")
+                        "install:\n\tmkdir -p $(BINDIR)\n"))))
+                  (add-before
+                   'build 'remove-xdg-desktop-menu-call
+                   (lambda _
+                     (substitute* "Makefile"
+                       (("xdg-desktop-menu install .*") "")))))
+       #:make-flags (let ((out (assoc-ref %outputs "out")))
+                      (list "CC=gcc" "CXX=g++" (string-append "PREFIX=" out)))
+       ;; There are no tests.
+       #:tests? #f))
+    (home-page "http://sourceforge.net/projects/nestopiaue/")
+    (synopsis "Nintendo Entertainment System (NES/Famicom) emulator")
+    (description
+     "Nestopia UE (Undead Edition) is a fork of the Nintendo Entertainment
+System (NES/Famicom) emulator Nestopia, with enhancements from members of the
+emulation community.  It provides highly accurate emulation.")
+    (license license:gpl2+)))
-- 
2.5.0

Re: [PATCH] gnu: Add nestopiaue.

[Taylan Ulrich Bayırlı/Kammer]

[-- Attachment #1: Type: text/plain, Size: 51 bytes --]

The homepage was wrong.  Here's an updated patch.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-nestopiaue.patch --]
[-- Type: text/x-diff, Size: 3763 bytes --]

From f8fcbf5fa4f5616c18df652f93f4b00f85d6f4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Sun, 1 Nov 2015 19:38:53 +0100
Subject: [PATCH] gnu: Add nestopiaue.

---
 gnu/packages/games.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 546944a..1ba9f3f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -38,10 +38,12 @@
   #:use-module (guix svn-download)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages game-development)
   #:use-module (gnu packages gettext)
@@ -1212,3 +1214,61 @@ world}, @uref{http://evolonline.org, Evol Online} and
     ;; "data/themes/{golden-delicious,jewelry}/*" are under CC-BY-SA.
     ;; The rest is under GPL2+.
     (license (list license:gpl2+ license:zlib license:cc-by-sa4.0))))
+
+(define-public nestopiaue
+  (package
+    (name "nestopiaue")
+    (version "1.46.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/rdanbrook/nestopia/archive/"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p"))
+              (modules '((guix build utils)))
+              ;; We don't need libretro for the GNU/Linux build.
+              (snippet
+               '(delete-file-recursively "libretro"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("xdg-utils" ,xdg-utils)))
+    (inputs `(("ao" ,ao)
+              ("glu" ,glu)
+              ("gtk+" ,gtk+)
+              ("libarchive" ,libarchive)
+              ("mesa" ,mesa)
+              ("sdl2" ,sdl2)))
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  ;; The Nestopia build system consists solely of a Makefile.
+                  (delete 'configure)
+                  ;; XXX Should be unnecessary with the next release.
+                  (add-before
+                   'build 'patch-makefile
+                   (lambda _
+                     (substitute* "Makefile"
+                       (("@mkdir \\$@") "@mkdir -p $@")
+                       (("CC =") "CC ?=")
+                       (("CXX =") "CXX ?=")
+                       (("PREFIX =") "PREFIX ?=")
+                       (("^install:\n$")
+                        "install:\n\tmkdir -p $(BINDIR)\n"))))
+                  (add-before
+                   'build 'remove-xdg-desktop-menu-call
+                   (lambda _
+                     (substitute* "Makefile"
+                       (("xdg-desktop-menu install .*") "")))))
+       #:make-flags (let ((out (assoc-ref %outputs "out")))
+                      (list "CC=gcc" "CXX=g++" (string-append "PREFIX=" out)))
+       ;; There are no tests.
+       #:tests? #f))
+    (home-page "http://0ldsk00l.ca/nestopia/")
+    (synopsis "Nintendo Entertainment System (NES/Famicom) emulator")
+    (description
+     "Nestopia UE (Undead Edition) is a fork of the Nintendo Entertainment
+System (NES/Famicom) emulator Nestopia, with enhancements from members of the
+emulation community.  It provides highly accurate emulation.")
+    (license license:gpl2+)))
-- 
2.5.0

Re: [PATCH] gnu: Add nestopiaue.

[Taylan Ulrich Bayırlı/Kammer]

[-- Attachment #1: Type: text/plain, Size: 91 bytes --]

Seems I forgot our commit message guidelines; here's a patch with a
fixed commit message.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-nestopiaue.patch --]
[-- Type: text/x-diff, Size: 3816 bytes --]

From 06d1fe3145052d7b660bba98db751fcc670a6602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Sun, 1 Nov 2015 19:38:53 +0100
Subject: [PATCH] gnu: Add nestopiaue.

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

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 546944a..1ba9f3f 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -38,10 +38,12 @@
   #:use-module (guix svn-download)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages backup)
   #:use-module (gnu packages base)
   #:use-module (gnu packages admin)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages fribidi)
   #:use-module (gnu packages game-development)
   #:use-module (gnu packages gettext)
@@ -1212,3 +1214,61 @@ world}, @uref{http://evolonline.org, Evol Online} and
     ;; "data/themes/{golden-delicious,jewelry}/*" are under CC-BY-SA.
     ;; The rest is under GPL2+.
     (license (list license:gpl2+ license:zlib license:cc-by-sa4.0))))
+
+(define-public nestopiaue
+  (package
+    (name "nestopiaue")
+    (version "1.46.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/rdanbrook/nestopia/archive/"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p"))
+              (modules '((guix build utils)))
+              ;; We don't need libretro for the GNU/Linux build.
+              (snippet
+               '(delete-file-recursively "libretro"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("xdg-utils" ,xdg-utils)))
+    (inputs `(("ao" ,ao)
+              ("glu" ,glu)
+              ("gtk+" ,gtk+)
+              ("libarchive" ,libarchive)
+              ("mesa" ,mesa)
+              ("sdl2" ,sdl2)))
+    (arguments
+     '(#:phases (modify-phases %standard-phases
+                  ;; The Nestopia build system consists solely of a Makefile.
+                  (delete 'configure)
+                  ;; XXX Should be unnecessary with the next release.
+                  (add-before
+                   'build 'patch-makefile
+                   (lambda _
+                     (substitute* "Makefile"
+                       (("@mkdir \\$@") "@mkdir -p $@")
+                       (("CC =") "CC ?=")
+                       (("CXX =") "CXX ?=")
+                       (("PREFIX =") "PREFIX ?=")
+                       (("^install:\n$")
+                        "install:\n\tmkdir -p $(BINDIR)\n"))))
+                  (add-before
+                   'build 'remove-xdg-desktop-menu-call
+                   (lambda _
+                     (substitute* "Makefile"
+                       (("xdg-desktop-menu install .*") "")))))
+       #:make-flags (let ((out (assoc-ref %outputs "out")))
+                      (list "CC=gcc" "CXX=g++" (string-append "PREFIX=" out)))
+       ;; There are no tests.
+       #:tests? #f))
+    (home-page "http://0ldsk00l.ca/nestopia/")
+    (synopsis "Nintendo Entertainment System (NES/Famicom) emulator")
+    (description
+     "Nestopia UE (Undead Edition) is a fork of the Nintendo Entertainment
+System (NES/Famicom) emulator Nestopia, with enhancements from members of the
+emulation community.  It provides highly accurate emulation.")
+    (license license:gpl2+)))
-- 
2.5.0

Re: [PATCH] gnu: Add nestopiaue.

[Taylan Ulrich Bayırlı/Kammer]

I now pushed a slightly edited version of this patch.

(Removed the xdg-utils input since I was already patching out its use in
the Makefile, removed the freedesktop module use that was needed for
xdg-utils, and renamed the package to nestopia-ue.)

Taylan

Re: [PATCH] gnu: Add nestopiaue.

[Ludovic Courtès]

taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:

> I now pushed a slightly edited version of this patch.

Thanks, sorry for not replying earlier.

One thing that may be worth double-checking if you haven’t already:
since it’s an emulator, we should make sure there’s no non-free software
or binary blobs in there.  Maybe checking what Debian does can help
here.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add nestopiaue.

[Taylan Ulrich Bayırlı/Kammer]

ludo@gnu.org (Ludovic Courtès) writes:

> taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") skribis:
>
>> I now pushed a slightly edited version of this patch.
>
> Thanks, sorry for not replying earlier.

No problem. :-)

> One thing that may be worth double-checking if you haven’t already:
> since it’s an emulator, we should make sure there’s no non-free software
> or binary blobs in there.  Maybe checking what Debian does can help
> here.

I now checked and Debian contains no patches to remove any files.

Although this made me notice it uses a bundled zlib by default.  I'll
push a commit fixing that shortly...

> Thanks,
> Ludo’.

Taylan