* [bug#31153] [PATCH] gnu: nestopia-ue: Update to 1.48.
@ 2018-04-14 16:32 Kei Kebreau
2018-04-16 22:17 ` Marius Bakke
0 siblings, 1 reply; 5+ messages in thread
From: Kei Kebreau @ 2018-04-14 16:32 UTC (permalink / raw)
To: 31153; +Cc: Kei Kebreau
* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread* [bug#31153] [PATCH] gnu: nestopia-ue: Update to 1.48.
2018-04-14 16:32 [bug#31153] [PATCH] gnu: nestopia-ue: Update to 1.48 Kei Kebreau
@ 2018-04-16 22:17 ` Marius Bakke
2018-04-17 3:32 ` Kei Kebreau
0 siblings, 1 reply; 5+ messages in thread
From: Marius Bakke @ 2018-04-16 22:17 UTC (permalink / raw)
To: Kei Kebreau, 31153
[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]
Kei Kebreau <kkebreau@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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread* [bug#31153] [PATCH] gnu: nestopia-ue: Update to 1.48.
2018-04-16 22:17 ` Marius Bakke
@ 2018-04-17 3:32 ` Kei Kebreau
2018-04-17 22:36 ` Marius Bakke
0 siblings, 1 reply; 5+ messages in thread
From: Kei Kebreau @ 2018-04-17 3:32 UTC (permalink / raw)
To: Marius Bakke; +Cc: 31153
[-- Attachment #1.1: Type: text/plain, Size: 1388 bytes --]
Marius Bakke <mbakke@fastmail.com> writes:
> Kei Kebreau <kkebreau@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.
[-- Attachment #1.2: 0001-gnu-nestopia-ue-Update-to-1.48.patch --]
[-- Type: text/plain, Size: 3779 bytes --]
From 7738c755edc7dec075090e567a53f1f05df05e53 Mon Sep 17 00:00:00 2001
From: Kei Kebreau <kkebreau@posteo.net>
Date: Sat, 7 Apr 2018 00:11:39 -0400
Subject: [PATCH] gnu: nestopia-ue: Update to 1.48.
To: guix-patches@gnu.org
* gnu/packages/emulators.scm (nestopia-ue): Update to 1.48.
[source]: Simplify snippet; 3rd-party zlib is no longer bundled.
[build-system]: Switch to cmake-build-system.
[inputs]: Remove glu and mesa. Add libepoxy.
[arguments]: Remove #:make-flags. Re-enable 'configure' phase. Remove
'remove-xdg-desktop-menu-call' and 'remove-gdkwayland-include' phases. Add
'wrap-program' phase.
---
gnu/packages/emulators.scm | 36 ++++++++++++++----------------------
1 file changed, 14 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 232e14b47..79947059b 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -993,7 +993,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
@@ -1002,42 +1002,34 @@ 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)))
+ ;; This fixes the file chooser crash that happens with GTK 3.
+ (add-after 'install 'wrap-program
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (nestopia (string-append out "/bin/nestopia"))
+ (gtk (assoc-ref inputs "gtk+"))
+ (gtk-share (string-append gtk "/share")))
+ (wrap-program nestopia
+ `("XDG_DATA_DIRS" ":" prefix (,gtk-share)))))))
;; There are no tests.
#:tests? #f))
(home-page "http://0ldsk00l.ca/nestopia/")
--
2.17.0
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread* [bug#31153] [PATCH] gnu: nestopia-ue: Update to 1.48.
2018-04-17 3:32 ` Kei Kebreau
@ 2018-04-17 22:36 ` Marius Bakke
2018-04-18 0:15 ` bug#31153: " Kei Kebreau
0 siblings, 1 reply; 5+ messages in thread
From: Marius Bakke @ 2018-04-17 22:36 UTC (permalink / raw)
To: Kei Kebreau; +Cc: 31153
[-- Attachment #1: Type: text/plain, Size: 1489 bytes --]
Kei Kebreau <kkebreau@posteo.net> writes:
> Marius Bakke <mbakke@fastmail.com> writes:
>
>> Kei Kebreau <kkebreau@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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-04-18 0:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-14 16:32 [bug#31153] [PATCH] gnu: nestopia-ue: Update to 1.48 Kei Kebreau
2018-04-16 22:17 ` Marius Bakke
2018-04-17 3:32 ` Kei Kebreau
2018-04-17 22:36 ` Marius Bakke
2018-04-18 0:15 ` bug#31153: " Kei Kebreau
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).