GNU bug report logs - #31153
[PATCH] gnu: nestopia-ue: Update to 1.48.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 31153 in the body.
You can then email your comments to 31153 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Kei Kebreau <kkebreau <at> posteo.net>
Subject: [PATCH] gnu: nestopia-ue: Update to 1.48.
Date: Sat, 14 Apr 2018 12:32:26 -0400

* gnu/packages/emulators.scm (nestopia-ue): Update to 1.48.
[source]: Simplify snippet.
[build-system]: Switch to cmake-build-system.
[inputs]: Remove glu and mesa. Add libepoxy.
[arguments]: Remove modified phases.
---
 gnu/packages/emulators.scm | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 1784111cd..2e825d930 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -992,7 +992,7 @@ towards a working Mupen64Plus for casual users.")
 (define-public nestopia-ue
   (package
     (name "nestopia-ue")
-    (version "1.47")
+    (version "1.48")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1001,43 +1001,24 @@ towards a working Mupen64Plus for casual users.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1dzrrjmvyqks64q5l5pfly80jb6qcsbj5b3dm40fijd5xnpbapci"))
+                "184y05z4k4a4m4022niy625kan0rklh8gcxyynxli1fss2sjjrpv"))
               (modules '((guix build utils)))
               (snippet
                '(begin
                   ;; We don't need libretro for the GNU/Linux build.
-                  (delete-file-recursively "libretro")
-                  ;; Use system zlib.
-                  (delete-file-recursively "source/zlib")
-                  (substitute* "source/core/NstZlib.cpp"
-                    (("#include \"../zlib/zlib.h\"") "#include <zlib.h>"))))))
-    (build-system gnu-build-system)
+                  (delete-file-recursively "libretro")))))
+    (build-system cmake-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (inputs
      `(("ao" ,ao)
-       ("glu" ,glu)
        ("gtk+" ,gtk+)
        ("libarchive" ,libarchive)
-       ("mesa" ,mesa)
+       ("libepoxy" ,libepoxy)
        ("sdl2" ,sdl2)
        ("zlib" ,zlib)))
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         ;; The Nestopia build system consists solely of a Makefile.
-         (delete 'configure)
-         (add-before 'build 'remove-xdg-desktop-menu-call
-           (lambda _
-             (substitute* "Makefile"
-               (("xdg-desktop-menu install .*") ""))))
-         (add-before 'build 'remove-gdkwayland-include
-           (lambda _
-             (substitute* "source/unix/gtkui/gtkui.h"
-               (("#include <gdk/gdkwayland\\.h>") "")))))
-       #:make-flags (let ((out (assoc-ref %outputs "out")))
-                      (list "CC=gcc" "CXX=g++" (string-append "PREFIX=" out)))
-       ;; There are no tests.
+     '(;; There are no tests.
        #:tests? #f))
     (home-page "http://0ldsk00l.ca/nestopia/")
     (synopsis "Nintendo Entertainment System (NES/Famicom) emulator")
-- 
2.16.3

Message #8 received at 31153 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Kei Kebreau <kkebreau <at> posteo.net>, 31153 <at> debbugs.gnu.org
Cc: Kei Kebreau <kkebreau <at> posteo.net>
Subject: Re: [bug#31153] [PATCH] gnu: nestopia-ue: Update to 1.48.
Date: Tue, 17 Apr 2018 00:17:03 +0200

[Message part 1 (text/plain, inline)]

Kei Kebreau <kkebreau <at> posteo.net> writes:

> * gnu/packages/emulators.scm (nestopia-ue): Update to 1.48.
> [source]: Simplify snippet.
> [build-system]: Switch to cmake-build-system.
> [inputs]: Remove glu and mesa. Add libepoxy.
> [arguments]: Remove modified phases.

[...]

>                (modules '((guix build utils)))
>                (snippet
>                 '(begin
>                    ;; We don't need libretro for the GNU/Linux build.
> -                  (delete-file-recursively "libretro")
> -                  ;; Use system zlib.
> -                  (delete-file-recursively "source/zlib")
> -                  (substitute* "source/core/NstZlib.cpp"
> -                    (("#include \"../zlib/zlib.h\"") "#include <zlib.h>"))))))
> -    (build-system gnu-build-system)
> +                  (delete-file-recursively "libretro")))))
> +    (build-system cmake-build-system)

The commit message says 'simplify snippet', but the actual change is to
not delete the zlib subfolder.  Is zlib no longer bundled?  If so,
please mention that in the commit message.

Apart from that LGTM.

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 31153 <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 31153 <at> debbugs.gnu.org
Subject: Re: [bug#31153] [PATCH] gnu: nestopia-ue: Update to 1.48.
Date: Mon, 16 Apr 2018 23:32:23 -0400

[Message part 1 (text/plain, inline)]

Marius Bakke <mbakke <at> fastmail.com> writes:

> Kei Kebreau <kkebreau <at> posteo.net> writes:
>
>> * gnu/packages/emulators.scm (nestopia-ue): Update to 1.48.
>> [source]: Simplify snippet.
>> [build-system]: Switch to cmake-build-system.
>> [inputs]: Remove glu and mesa. Add libepoxy.
>> [arguments]: Remove modified phases.
>
> [...]
>
>>                (modules '((guix build utils)))
>>                (snippet
>>                 '(begin
>>                    ;; We don't need libretro for the GNU/Linux build.
>> -                  (delete-file-recursively "libretro")
>> -                  ;; Use system zlib.
>> -                  (delete-file-recursively "source/zlib")
>> -                  (substitute* "source/core/NstZlib.cpp"
>> -                    (("#include \"../zlib/zlib.h\"") "#include <zlib.h>"))))))
>> -    (build-system gnu-build-system)
>> +                  (delete-file-recursively "libretro")))))
>> +    (build-system cmake-build-system)
>
> The commit message says 'simplify snippet', but the actual change is to
> not delete the zlib subfolder.  Is zlib no longer bundled?  If so,
> please mention that in the commit message.
>
> Apart from that LGTM.

Thank you for reviewing this!

I've attached a revised patch with some other small but necessary
changes that I overlooked the first time around. If the patch below
looks good, then I will push it to master.

[0001-gnu-nestopia-ue-Update-to-1.48.patch (text/plain, attachment)]

[signature.asc (application/pgp-signature, inline)]

Message #14 received at 31153 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Kei Kebreau <kkebreau <at> posteo.net>
Cc: 31153 <at> debbugs.gnu.org
Subject: Re: [bug#31153] [PATCH] gnu: nestopia-ue: Update to 1.48.
Date: Wed, 18 Apr 2018 00:36:58 +0200

[Message part 1 (text/plain, inline)]

Kei Kebreau <kkebreau <at> posteo.net> writes:

> Marius Bakke <mbakke <at> fastmail.com> writes:
>
>> Kei Kebreau <kkebreau <at> posteo.net> writes:
>>
>>> * gnu/packages/emulators.scm (nestopia-ue): Update to 1.48.
>>> [source]: Simplify snippet.
>>> [build-system]: Switch to cmake-build-system.
>>> [inputs]: Remove glu and mesa. Add libepoxy.
>>> [arguments]: Remove modified phases.
>>
>> [...]
>>
>>>                (modules '((guix build utils)))
>>>                (snippet
>>>                 '(begin
>>>                    ;; We don't need libretro for the GNU/Linux build.
>>> -                  (delete-file-recursively "libretro")
>>> -                  ;; Use system zlib.
>>> -                  (delete-file-recursively "source/zlib")
>>> -                  (substitute* "source/core/NstZlib.cpp"
>>> -                    (("#include \"../zlib/zlib.h\"") "#include <zlib.h>"))))))
>>> -    (build-system gnu-build-system)
>>> +                  (delete-file-recursively "libretro")))))
>>> +    (build-system cmake-build-system)
>>
>> The commit message says 'simplify snippet', but the actual change is to
>> not delete the zlib subfolder.  Is zlib no longer bundled?  If so,
>> please mention that in the commit message.
>>
>> Apart from that LGTM.
>
> Thank you for reviewing this!
>
> I've attached a revised patch with some other small but necessary
> changes that I overlooked the first time around. If the patch below
> looks good, then I will push it to master.

LGTM, thank you!

[signature.asc (application/pgp-signature, inline)]

Message #19 received at 31153-done <at> debbugs.gnu.org (full text, mbox):

From: Kei Kebreau <kkebreau <at> posteo.net>
To: 31153-done <at> debbugs.gnu.org
Subject: Re: [bug#31153] [PATCH] gnu: nestopia-ue: Update to 1.48.
Date: Tue, 17 Apr 2018 20:15:54 -0400

[Message part 1 (text/plain, inline)]

Done!

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.