[PATCH] gnu: Add abbaye

[PATCH] gnu: Add abbaye

[David Thompson]

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

"l'Abbaye des Morts" is a fun little indie game that I found a few days
ago that only relies on SDL libraries, so I figured I'd package it.  The
source code and makefile are a mess so I had to add a few extra phases
to get everything to work right.


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

From 040828eabadf401743c4811c26dfb9220f8052d0 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson@member.fsf.org>
Date: Wed, 30 Apr 2014 20:36:32 -0400
Subject: [PATCH 2/2] gnu: Add abbaye.

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

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 46fbd21..3caef32 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -32,6 +32,7 @@
   #:use-module (gnu packages xorg)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages sqlite)
+  #:use-module (gnu packages sdl)
   #:use-module (guix build-system gnu))
 
 (define-public gnubg
@@ -94,3 +95,65 @@ you to set the size of the cube (the default is 3x3) or to change the colors.
  You may even apply photos to the faces instead of colors.  The game is
 scriptable with Guile.")
     (license gpl3+)))
+
+(define-public abbaye
+  (package
+    (name "abbaye")
+    (version "1.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "http://abbaye-for-linux.googlecode.com/files/abbaye-for-linux-src-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1wgvckgqa2084rbskxif58wbb83xbas8s1i8s7d57xbj08ryq8rk"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:modules ((ice-9 match)
+                  (guix build gnu-build-system)
+                  (guix build utils))
+       #:phases (alist-cons-after
+                 'set-paths 'set-sdl-paths
+                 (lambda* (#:key inputs outputs (search-paths '()) #:allow-other-keys)
+                   (define input-directories
+                     (match inputs
+                       (((_ . dir) ...)
+                        dir)))
+                   ;; Modify CPATH variable to point to include/SDL for SDL header
+                   ;; files.
+                   (set-path-environment-variable "CPATH"
+                                                  '("include/SDL")
+                                                  input-directories))
+                 (alist-cons-after
+                  'patch-source-shebangs 'patch-makefile
+                  (lambda* (#:key outputs #:allow-other-keys)
+                    ;; Replace /usr with package output directory.
+                    (for-each (lambda (file)
+                                (substitute* file
+                                  (("/usr") (assoc-ref outputs "out"))))
+                              '("makefile" "src/pantallas.c" "src/comun.h")))
+                  (alist-cons-before
+                   'install 'make-install-dirs
+                   (lambda* (#:key outputs #:allow-other-keys)
+                     (let ((prefix (assoc-ref outputs "out")))
+                       ;; Create directories that the makefile assumes exist.
+                       (mkdir-p (string-append prefix "/bin"))
+                       (mkdir-p (string-append prefix "/share/applications"))))
+                   ;; No configure script.
+                   (alist-delete 'configure %standard-phases))))
+       #:tests? #f)) ;; No check target.
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (inputs `(("sdl" ,sdl)
+              ("sdl-gfx" ,sdl-gfx)
+              ("sdl-image" ,sdl-image)
+              ("sdl-mixer" ,sdl-mixer)
+              ("sdl-ttf" ,sdl-ttf)))
+    (home-page "http://code.google.com/p/abbaye-for-linux/")
+    (synopsis "GNU/Linux port of the indie game \"l'Abbaye des Morts\"")
+    (description "l'Abbaye des Morts is a 2D platform game set in 13th century
+France.  The Cathars, who preach about good Christian beliefs, were being
+expelled by the Catholic Church out of the Languedoc region in France.  One of
+them, called Jean Raymond, found an old church in which to hide, not knowing
+that beneath its ruins lay buried an ancient evil.")
+    (license gpl3+)))
-- 
1.8.4

Re: [PATCH] gnu: Add abbaye

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> From 040828eabadf401743c4811c26dfb9220f8052d0 Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson@member.fsf.org>
> Date: Wed, 30 Apr 2014 20:36:32 -0400
> Subject: [PATCH 2/2] gnu: Add abbaye.
>
> * gnu/packages/games.scm (abbaye): New variable.

Minor comments:

>  gnu/packages/games.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 63 insertions(+)
>
> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
> index 46fbd21..3caef32 100644
> --- a/gnu/packages/games.scm
> +++ b/gnu/packages/games.scm

Please add add a copyright line for you in this file.

> +                   ;; Modify CPATH variable to point to include/SDL for SDL header
> +                   ;; files.
> +                   (set-path-environment-variable "CPATH"
> +                                                  '("include/SDL")
> +                                                  input-directories))

So the crux of the problem is that this package doesn’t use pkg-config,
right?

> +    (description "l'Abbaye des Morts is a 2D platform game set in 13th century

Capital “L”.

OK to push with these changes.

Thank you!

Ludo’.

Re: [PATCH] gnu: Add abbaye

[David Thompson]

Ludovic Courtès <ludo@gnu.org> writes:

> David Thompson <dthompson2@worcester.edu> skribis:
>
>> From 040828eabadf401743c4811c26dfb9220f8052d0 Mon Sep 17 00:00:00 2001
>> From: David Thompson <dthompson@member.fsf.org>
>> Date: Wed, 30 Apr 2014 20:36:32 -0400
>> Subject: [PATCH 2/2] gnu: Add abbaye.
>>
>> * gnu/packages/games.scm (abbaye): New variable.
>
> Minor comments:
>
>>  gnu/packages/games.scm | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 63 insertions(+)
>>
>> diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
>> index 46fbd21..3caef32 100644
>> --- a/gnu/packages/games.scm
>> +++ b/gnu/packages/games.scm
>
> Please add add a copyright line for you in this file.
>
>> +                   ;; Modify CPATH variable to point to include/SDL for SDL header
>> +                   ;; files.
>> +                   (set-path-environment-variable "CPATH"
>> +                                                  '("include/SDL")
>> +                                                  input-directories))
>
> So the crux of the problem is that this package doesn’t use pkg-config,
> right?
>
>> +    (description "l'Abbaye des Morts is a 2D platform game set in 13th century
>
> Capital “L”.
>
> OK to push with these changes.
>
> Thank you!
>
> Ludo’.

Thanks for the feedback.  Fixed and pushed.

- Dave

Re: [PATCH] gnu: Add abbaye

[Ludovic Courtès]

I noticed that ‘abbaye’ segfaults for me, immediately after opening its
first window (splash screen?).

I wanted to try it in the VM but I get:

--8<---------------cut here---------------start------------->8---
ERROR: union-build: collision between file and directories ((files ("/gnu/store/9gfzrsj71ph5pk2hxn7mmpsfflz0jpc7-abbaye-1.13/share/pixmaps")) (dirs ("/gnu/store/4blsxkx3864263l6cmgqqrab15rgdfpj-xterm-303/share/pixmaps")))
--8<---------------cut here---------------end--------------->8---

This is because share/pixmaps here is a file, not a directory, contrary
to common practice.

Do you think this could be changed?

TIA,  :-)
Ludo’.

Re: [PATCH] gnu: Add abbaye

[Thompson, David]

On Thu, May 1, 2014 at 12:27 PM, Ludovic Courtès <ludo@gnu.org> wrote:
> I noticed that ‘abbaye’ segfaults for me, immediately after opening its
> first window (splash screen?).
>

That crash happens with the old version of the sdl-image package
because it can't use libpng to open images.  Did something go wrong
where the fixed sdl-image package isn't being used?

> I wanted to try it in the VM but I get:
>
> --8<---------------cut here---------------start------------->8---
> ERROR: union-build: collision between file and directories ((files ("/gnu/store/9gfzrsj71ph5pk2hxn7mmpsfflz0jpc7-abbaye-1.13/share/pixmaps")) (dirs ("/gnu/store/4blsxkx3864263l6cmgqqrab15rgdfpj-xterm-303/share/pixmaps")))
> --8<---------------cut here---------------end--------------->8---
>
> This is because share/pixmaps here is a file, not a directory, contrary
> to common practice.
>
> Do you think this could be changed?
>

Yes, I think I could write a patch to fix that.

> TIA,  :-)
> Ludo’.

Sorry about the problems.

- Dave

Re: [PATCH] gnu: Add abbaye

[Ludovic Courtès]

"Thompson, David" <dthompson2@worcester.edu> skribis:

> On Thu, May 1, 2014 at 12:27 PM, Ludovic Courtès <ludo@gnu.org> wrote:
>> I noticed that ‘abbaye’ segfaults for me, immediately after opening its
>> first window (splash screen?).
>>
>
> That crash happens with the old version of the sdl-image package
> because it can't use libpng to open images.  Did something go wrong
> where the fixed sdl-image package isn't being used?

Looking at the strace output, it does seem to relate to libpng:

--8<---------------cut here---------------start------------->8---
open("/gnu/store/hf5kklv837xbfcv6gc7gpsj36l69j3sj-glibc-2.19/lib/libpng15.so.15", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
open("/gnu/store/6z7k9ms4sf367c3phl7djhb740ly3dqi-gcc-4.8.2/lib/libpng15.so.15", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
open("/gnu/store/hf5kklv837xbfcv6gc7gpsj36l69j3sj-glibc-2.19/lib/libpng15.so.15", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
close(6)                                = 0
munmap(0x7f09053e2000, 4096)            = 0
--- SIGSEGV {si_signo=SIGSEGV, si_code=SEGV_MAPERR, si_addr=0x8} ---
--8<---------------cut here---------------end--------------->8---

And indeed, ‘abbaye’ is not explicitly linked against libpng, so it
can’t find it.

If I do:

--8<---------------cut here---------------start------------->8---
LD_LIBRARY_PATH=/gnu/store/naxqxdf7f6lfpy4h481h8j8hs2r44v09-libpng-1.5.17/lib /gnu/store/9gfzrsj71ph5pk2hxn7mmpsfflz0jpc7-abbaye-1.13/bin/abbaye
--8<---------------cut here---------------end--------------->8---

Then it works like a charm.

I suppose we need to add -lpng on the link command line?

BTW, the splash screen says “freeware”; would be great if we could
change that to “free software”.

(Seeing this game makes me feel younger.  ;-))

Thanks,
Ludo’.

Re: [PATCH] gnu: Add abbaye

[Thompson, David]

On Fri, May 2, 2014 at 3:05 AM, Ludovic Courtès <ludo@gnu.org> wrote:
> "Thompson, David" <dthompson2@worcester.edu> skribis:
>
>> On Thu, May 1, 2014 at 12:27 PM, Ludovic Courtès <ludo@gnu.org> wrote:
>>> I noticed that ‘abbaye’ segfaults for me, immediately after opening its
>>> first window (splash screen?).
>>>
>>
>> That crash happens with the old version of the sdl-image package
>> because it can't use libpng to open images.  Did something go wrong
>> where the fixed sdl-image package isn't being used?
>
> Looking at the strace output, it does seem to relate to libpng:
>
> --8<---------------cut here---------------start------------->8---
> open("/gnu/store/hf5kklv837xbfcv6gc7gpsj36l69j3sj-glibc-2.19/lib/libpng15.so.15", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
> open("/gnu/store/6z7k9ms4sf367c3phl7djhb740ly3dqi-gcc-4.8.2/lib/libpng15.so.15", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
> open("/gnu/store/hf5kklv837xbfcv6gc7gpsj36l69j3sj-glibc-2.19/lib/libpng15.so.15", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)
> close(6)                                = 0
> munmap(0x7f09053e2000, 4096)            = 0
> --- SIGSEGV {si_signo=SIGSEGV, si_code=SEGV_MAPERR, si_addr=0x8} ---
> --8<---------------cut here---------------end--------------->8---
>
> And indeed, ‘abbaye’ is not explicitly linked against libpng, so it
> can’t find it.
>
> If I do:
>
> --8<---------------cut here---------------start------------->8---
> LD_LIBRARY_PATH=/gnu/store/naxqxdf7f6lfpy4h481h8j8hs2r44v09-libpng-1.5.17/lib /gnu/store/9gfzrsj71ph5pk2hxn7mmpsfflz0jpc7-abbaye-1.13/bin/abbaye
> --8<---------------cut here---------------end--------------->8---
>
> Then it works like a charm.
>
> I suppose we need to add -lpng on the link command line?
>

Thanks for investigating.  Abbaye doesn't directly use libpng,
SDL_image does, so I think that your copy of Abbaye is not using the
latest sdl-image package that propagates libpng (and others).  Did you
build abbaye yourself or use a substitute from hydra?  I noticed that
there have been some build failures of SDL libraries to another
dependency failing to build.
http://hydra.gnu.org/job/gnu/master/sdl-image-1.2.12.x86_64-linux

> BTW, the splash screen says “freeware”; would be great if we could
> change that to “free software”.
>

I noticed that and wanted to change it, too.  However, it's not as
simple as a quick substitute, since it's actually part of an image.
Perhaps we could simply use imagemagick to write over the text with
the background color.  WDYT?

> (Seeing this game makes me feel younger.  ;-))
>
> Thanks,
> Ludo’.

It's a simple little game with a very old-school feel, but it's fun,
very difficult, and the enhanced pixel art graphics are nice.  :)

- Dave

Re: [PATCH] gnu: Add abbaye

[Andreas Enge]

On Fri, May 02, 2014 at 08:55:58AM -0400, Thompson, David wrote:
> On Fri, May 2, 2014 at 3:05 AM, Ludovic Courtès <ludo@gnu.org> wrote:
> > BTW, the splash screen says “freeware”; would be great if we could
> > change that to “free software”.
> I noticed that and wanted to change it, too.  However, it's not as
> simple as a quick substitute, since it's actually part of an image.
> Perhaps we could simply use imagemagick to write over the text with
> the background color.  WDYT?

Please, let us not patch software to eliminate swearwords; it is enough
if we avoid them for package descriptions!

Andreas

Re: [PATCH] gnu: Add abbaye

[Ludovic Courtès]

Andreas Enge <andreas@enge.fr> skribis:

> On Fri, May 02, 2014 at 08:55:58AM -0400, Thompson, David wrote:
>> On Fri, May 2, 2014 at 3:05 AM, Ludovic Courtès <ludo@gnu.org> wrote:
>> > BTW, the splash screen says “freeware”; would be great if we could
>> > change that to “free software”.
>> I noticed that and wanted to change it, too.  However, it's not as
>> simple as a quick substitute, since it's actually part of an image.
>> Perhaps we could simply use imagemagick to write over the text with
>> the background color.  WDYT?
>
> Please, let us not patch software to eliminate swearwords; it is enough
> if we avoid them for package descriptions!

Yeah the FSDG doesn’t require it, and in this case it’s technically
difficult.  I was tempted to do that because “freeware” is really
misdirecting here.

Ludo’.

Re: [PATCH] gnu: Add abbaye

[Andreas Enge]

On Fri, May 02, 2014 at 08:55:58AM -0400, Thompson, David wrote:
> Thanks for investigating.  Abbaye doesn't directly use libpng,
> SDL_image does, so I think that your copy of Abbaye is not using the
> latest sdl-image package that propagates libpng (and others).  Did you
> build abbaye yourself or use a substitute from hydra?  I noticed that
> there have been some build failures of SDL libraries to another
> dependency failing to build.
> http://hydra.gnu.org/job/gnu/master/sdl-image-1.2.12.x86_64-linux

It happens with the git trunk, which downloads the sdl-image package from
hydra.

The library is not linked with libpng:
$ ldd /gnu/store/0sp8kyd2vrmsw79gnw0g31wvvdjnfxwc-sdl-image-1.2.12/lib/libSDL_image-1.2.so.0.8.4 | grep png
prints nothing. So maybe an explicit linking step is needed?

Or does sdl-image dlopen the libpng library? Then more work might be needed
so that the sources contain the correct path.

Andreas

Re: [PATCH] gnu: Add abbaye

[Thompson, David]

On Fri, May 2, 2014 at 9:59 AM, Andreas Enge <andreas@enge.fr> wrote:
> On Fri, May 02, 2014 at 08:55:58AM -0400, Thompson, David wrote:
>> Thanks for investigating.  Abbaye doesn't directly use libpng,
>> SDL_image does, so I think that your copy of Abbaye is not using the
>> latest sdl-image package that propagates libpng (and others).  Did you
>> build abbaye yourself or use a substitute from hydra?  I noticed that
>> there have been some build failures of SDL libraries to another
>> dependency failing to build.
>> http://hydra.gnu.org/job/gnu/master/sdl-image-1.2.12.x86_64-linux
>
> It happens with the git trunk, which downloads the sdl-image package from
> hydra.
>
> The library is not linked with libpng:
> $ ldd /gnu/store/0sp8kyd2vrmsw79gnw0g31wvvdjnfxwc-sdl-image-1.2.12/lib/libSDL_image-1.2.so.0.8.4 | grep png
> prints nothing. So maybe an explicit linking step is needed?
>
> Or does sdl-image dlopen the libpng library? Then more work might be needed
> so that the sources contain the correct path.
>
> Andreas
>

sdl-image dlopen's the libpng library, afaict.

- Dave

Re: [PATCH] gnu: Add abbaye

[Ludovic Courtès]

"Thompson, David" <dthompson2@worcester.edu> skribis:

> On Fri, May 2, 2014 at 9:59 AM, Andreas Enge <andreas@enge.fr> wrote:
>> On Fri, May 02, 2014 at 08:55:58AM -0400, Thompson, David wrote:
>>> Thanks for investigating.  Abbaye doesn't directly use libpng,
>>> SDL_image does, so I think that your copy of Abbaye is not using the
>>> latest sdl-image package that propagates libpng (and others).  Did you
>>> build abbaye yourself or use a substitute from hydra?  I noticed that
>>> there have been some build failures of SDL libraries to another
>>> dependency failing to build.
>>> http://hydra.gnu.org/job/gnu/master/sdl-image-1.2.12.x86_64-linux
>>
>> It happens with the git trunk, which downloads the sdl-image package from
>> hydra.
>>
>> The library is not linked with libpng:
>> $ ldd /gnu/store/0sp8kyd2vrmsw79gnw0g31wvvdjnfxwc-sdl-image-1.2.12/lib/libSDL_image-1.2.so.0.8.4 | grep png
>> prints nothing. So maybe an explicit linking step is needed?
>>
>> Or does sdl-image dlopen the libpng library? Then more work might be needed
>> so that the sources contain the correct path.
>>
>> Andreas
>>
>
> sdl-image dlopen's the libpng library, afaict.

So the trick would be to add an explicit -lpng when linking sdl-image.

Ludo’.