[PATCH 1/2] gnu: Add freealut.

[PATCH 1/2] gnu: Add freealut.

[David Hashe]

* gnu/packages/audio.scm (freealut): New variable.
---
 gnu/packages/audio.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index ca438f8..336bfe5 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 David Hashe <david.hashe@dhashe.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1504,6 +1505,40 @@ buffers, and audio capture.")
     (home-page "http://kcat.strangesoft.net/openal.html")
     (license license:lgpl2.0+)))
 
+(define-public freealut
+  (package
+    (name "freealut")
+    (version "1.1.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    ;; The official repository is defunct. This is the most
+                    ;; popular mirror.
+                    (url (string-append "https://github.com/vancegroup/" name))
+                    (commit version)))
+              (file-name (string-append name "-" version))
+              (sha256
+               (base32
+                "1v2f9rfy96x516z2yibymja1qp7zgdcrx9li8lmzgwp4jg8kqab5"))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'autogen
+                    (lambda _
+                      (zero? (system* "sh" "autogen.sh")))))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
+    (inputs
+     `(("openal" ,openal)))
+    (home-page "http://www.openal.org/")
+    (synopsis "OpenAL Utility Tool")
+    (description "Freealut is a free implementation of OpenAL's ALUT
+standard.")
+    (license license:lgpl2.0+)))
+
 (define-public patchage
   (package
     (name "patchage")
-- 
1.9.1

[PATCH 2/2] gnu: Add taisei.

[David Hashe]

* gnu/packages/games.scm (taisei): New variable.
---
 gnu/packages/games.scm | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 653e0c7..dc26283 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2014, 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
+;;; Copyright © 2015, 2016 David Hashe <david.hashe@dhashe.com>
 ;;; Copyright © 2015 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
@@ -2026,3 +2026,38 @@ is attributed to Albert Einstein.")
 the chat server psyced with the specific config located at
 http://lavachat.symlynx.com/unix/")
     (license license:gpl2+)))
+
+(define-public taisei
+  ;; The tarball is named with the maintainer, commit, and revision.
+  (let ((maintainer "laochailan")
+        (commit     "9ef1a86")
+        (revision   "0"))
+    (package
+      (name "taisei")
+      (version "1.0a")
+      (source (origin
+                (method url-fetch)
+                (uri (string-append
+                      "https://github.com/" maintainer "/" name "/tarball/v"
+                      version))
+                (file-name (string-append maintainer "-" name "-" version "-"
+                                          revision "-" commit ".tar.gz"))
+                (sha256
+                 (base32
+                  "0smv7rzzg22wnkymi76y2iz5li8hyl418kmpn4h0vm3f6wdw3i1d"))))
+      (arguments `(#:tests? #f)) ; no tests
+      (build-system cmake-build-system)
+      (inputs
+       `(("sdl" ,sdl)
+         ("sdl-ttf" ,sdl-ttf)
+         ("libpng" ,libpng)
+         ("mesa" ,mesa)
+         ("glu" ,glu)
+         ("openal" ,openal)
+         ("freealut" ,freealut)))
+      (home-page "https://taisei-project.org/")
+      (synopsis "Touhou clone")
+      (description "Taisei is an open clone of the Touhou series.  Touhou is a
+one-man project of shoot-em-up games set in an isolated world full of Japanese
+folklore.")
+      (license license:expat))))
-- 
1.9.1

Re: [PATCH 1/2] gnu: Add freealut.

[Ricardo Wurmus]

Hi David,

thank you for the patch!

> * gnu/packages/audio.scm (freealut): New variable.
> ---

[...]

>  
> +(define-public freealut
> +  (package
> +    (name "freealut")
> +    (version "1.1.0")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    ;; The official repository is defunct. This is the most
> +                    ;; popular mirror.
> +                    (url (string-append "https://github.com/vancegroup/" name))
> +                    (commit version)))

I see that Arch and Fedora both use the tarball from here:

    http://pkgs.fedoraproject.org/repo/pkgs/freealut/freealut-1.1.0.tar.gz/e089b28a0267faabdb6c079ee173664a/freealut-1.1.0.tar.gz

The advantage of that tarball is that it doesn’t require bootstrapping,
so you can do without the additional “autogen” phase and without the
three native inputs.

> +    (home-page "http://www.openal.org/")

Does Freealut itself have a home page?  It doesn’t seem right to me to
declare the website of OpenAL as the home page, when the package is
really just one implemenatation of the standard published on the OpenAL
website.

> +    (synopsis "OpenAL Utility Tool")

Is it a library or a tool (or both)?  What does it do?

> +    (description "Freealut is a free implementation of OpenAL's ALUT
> +standard.")

Could you try to extend the description a little?  I don’t know what
this really means.

~~ Ricardo

Re: [PATCH 1/2] gnu: Add freealut.

[David Hashe]

[-- Attachment #1.1: Type: text/plain, Size: 2570 bytes --]

Hi Ricardo,

Thanks for taking the time to review this!

On Mon, Mar 21, 2016 at 9:36 AM, Ricardo Wurmus <
ricardo.wurmus@mdc-berlin.de> wrote:

>
> Hi David,
>
> thank you for the patch!
>
> > * gnu/packages/audio.scm (freealut): New variable.
> > ---
>
> [...]
>
> >
> > +(define-public freealut
> > +  (package
> > +    (name "freealut")
> > +    (version "1.1.0")
> > +    (source (origin
> > +              (method git-fetch)
> > +              (uri (git-reference
> > +                    ;; The official repository is defunct. This is the
> most
> > +                    ;; popular mirror.
> > +                    (url (string-append "https://github.com/vancegroup/"
> name))
> > +                    (commit version)))
>
> I see that Arch and Fedora both use the tarball from here:
>
>
> http://pkgs.fedoraproject.org/repo/pkgs/freealut/freealut-1.1.0.tar.gz/e089b28a0267faabdb6c079ee173664a/freealut-1.1.0.tar.gz
>
> The advantage of that tarball is that it doesn’t require bootstrapping,
> so you can do without the additional “autogen” phase and without the
> three native inputs.
>

Done. By the way, where exactly do you find what tarball Arch and Fedora
use for a given package? I couldn't seem to find that information on a
cursory glance.


>
> > +    (home-page "http://www.openal.org/")
>
> Does Freealut itself have a home page?  It doesn’t seem right to me to
> declare the website of OpenAL as the home page, when the package is
> really just one implemenatation of the standard published on the OpenAL
> website.
>
>
I agree, but it doesn't seem to have a separate home page. Debian simply
lists the home page as "http://www.openal.org/", for instance. I could set
the field to #f, but guix lint complains about that and it looks like only
the bootstrap-binaries actually do that. For now, I've added a comment
clarifying the situation.

Let me know if you think that another option would be better.


> > +    (synopsis "OpenAL Utility Tool")
>
> Is it a library or a tool (or both)?  What does it do?
>

It is a library, similar to GLUT from OpenGL. I've expanded the synopsis
to "Implementation of the OpenAL Utility Toolkit (ALUT)", which I patterned
off of the freeglut synopsis.


>
> > +    (description "Freealut is a free implementation of OpenAL's ALUT
> > +standard.")
>
> Could you try to extend the description a little?  I don’t know what
> this really means.
>

I've expanded the synopsis.


>
> ~~ Ricardo
>

Thanks!
David Hashe

[-- Attachment #1.2: Type: text/html, Size: 4748 bytes --]

[-- Attachment #2: 0001-gnu-Add-freealut.patch --]
[-- Type: text/x-patch, Size: 2260 bytes --]

From 196fcc5fb1071da976aec1785fd95ada8fdf7418 Mon Sep 17 00:00:00 2001
From: David Hashe <david.hashe@dhashe.com>
Date: Sat, 19 Mar 2016 00:56:55 -0500
Subject: [PATCH] gnu: Add freealut.

* gnu/packages/audio.scm (freealut): New variable.
---
 gnu/packages/audio.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index ca438f8..5225c64 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 David Hashe <david.hashe@dhashe.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1504,6 +1505,36 @@ buffers, and audio capture.")
     (home-page "http://kcat.strangesoft.net/openal.html")
     (license license:lgpl2.0+)))
 
+(define-public freealut
+  (package
+    (name "freealut")
+    (version "1.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (let ((name-version-tar
+                      (string-append name "-" version ".tar.gz")))
+                 (string-append
+                  "http://pkgs.fedoraproject.org/repo/pkgs/" name "/"
+                  name-version-tar "/"
+                  "e089b28a0267faabdb6c079ee173664a/"
+                  name-version-tar)))
+              (sha256
+               (base32
+                "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("openal" ,openal)))
+    ;; This is the home page for the specification, but there is no
+    ;; project-specific homepage.
+    (home-page "https://www.openal.org/")
+    (synopsis "Implementation of the OpenAL Utility Toolkit (ALUT)")
+    (description "Freealut is a free implementation of OpenAL's ALUT standard.
+ALUT is the OpenAL equivalent to GLUT fom OpenGL and has an intentionally
+similar API.  It is intended to allow developers to quickly learn OpenAL while
+abstracting away details such as loading sound samples from disk.")
+    (license license:lgpl2.0+)))
+
 (define-public patchage
   (package
     (name "patchage")
-- 
1.9.1

Re: [PATCH 1/2] gnu: Add freealut.

[Ricardo Wurmus]

David Hashe <david.hashe@dhashe.com> writes:

>> I see that Arch and Fedora both use the tarball from here:
>>
>>
>> http://pkgs.fedoraproject.org/repo/pkgs/freealut/freealut-1.1.0.tar.gz/e089b28a0267faabdb6c079ee173664a/freealut-1.1.0.tar.gz
>>
>> The advantage of that tarball is that it doesn’t require bootstrapping,
>> so you can do without the additional “autogen” phase and without the
>> three native inputs.
>>
>
> Done. By the way, where exactly do you find what tarball Arch and Fedora
> use for a given package? I couldn't seem to find that information on a
> cursory glance.

I looked at the PKGBUILD of the Arch package.

>> Does Freealut itself have a home page?  It doesn’t seem right to me to
>> declare the website of OpenAL as the home page, when the package is
>> really just one implemenatation of the standard published on the OpenAL
>> website.
>>
>>
> I agree, but it doesn't seem to have a separate home page. Debian simply
> lists the home page as "http://www.openal.org/", for instance. I could set
> the field to #f, but guix lint complains about that and it looks like only
> the bootstrap-binaries actually do that. For now, I've added a comment
> clarifying the situation.

That’s good, thanks.

The patch looks pretty good to me now, except maybe for this

+              (uri
+               (let ((name-version-tar
+                      (string-append name "-" version ".tar.gz")))
+                 (string-append
+                  "http://pkgs.fedoraproject.org/repo/pkgs/" name "/"
+                  name-version-tar "/"
+                  "e089b28a0267faabdb6c079ee173664a/"
+                  name-version-tar)))

I find the let binding a bit too ... much :)  But if nobody else has a
problem with this, I wouldn’t complain.

Thanks!

~~ Ricardo

Re: [PATCH 1/2] gnu: Add freealut.

[David Hashe]

[-- Attachment #1.1: Type: text/plain, Size: 2203 bytes --]

On Mon, Mar 21, 2016 at 4:24 PM, Ricardo Wurmus <
ricardo.wurmus@mdc-berlin.de> wrote:

>
> David Hashe <david.hashe@dhashe.com> writes:
>
> >> I see that Arch and Fedora both use the tarball from here:
> >>
> >>
> >>
> http://pkgs.fedoraproject.org/repo/pkgs/freealut/freealut-1.1.0.tar.gz/e089b28a0267faabdb6c079ee173664a/freealut-1.1.0.tar.gz
> >>
> >> The advantage of that tarball is that it doesn’t require bootstrapping,
> >> so you can do without the additional “autogen” phase and without the
> >> three native inputs.
> >>
> >
> > Done. By the way, where exactly do you find what tarball Arch and Fedora
> > use for a given package? I couldn't seem to find that information on a
> > cursory glance.
>
> I looked at the PKGBUILD of the Arch package.
>
> >> Does Freealut itself have a home page?  It doesn’t seem right to me to
> >> declare the website of OpenAL as the home page, when the package is
> >> really just one implemenatation of the standard published on the OpenAL
> >> website.
> >>
> >>
> > I agree, but it doesn't seem to have a separate home page. Debian simply
> > lists the home page as "http://www.openal.org/", for instance. I could
> set
> > the field to #f, but guix lint complains about that and it looks like
> only
> > the bootstrap-binaries actually do that. For now, I've added a comment
> > clarifying the situation.
>
> That’s good, thanks.
>
> The patch looks pretty good to me now, except maybe for this
>
> +              (uri
> +               (let ((name-version-tar
> +                      (string-append name "-" version ".tar.gz")))
> +                 (string-append
> +                  "http://pkgs.fedoraproject.org/repo/pkgs/" name "/"
> +                  name-version-tar "/"
> +                  "e089b28a0267faabdb6c079ee173664a/"
> +                  name-version-tar)))
>
> I find the let binding a bit too ... much :)  But if nobody else has a
> problem with this, I wouldn’t complain.
>

Yeah... I wasn't sure if it made things better or worse. I've gone ahead
and removed it, since it might be a bit more readable that way.


>
> Thanks!
>
> ~~ Ricardo
>

- David

[-- Attachment #1.2: Type: text/html, Size: 3537 bytes --]

[-- Attachment #2: 0001-gnu-Add-freealut.patch --]
[-- Type: text/x-patch, Size: 2155 bytes --]

From 38bdec70d4cb3cdc3e810eea7c3c475a289e3cd4 Mon Sep 17 00:00:00 2001
From: David Hashe <david.hashe@dhashe.com>
Date: Sat, 19 Mar 2016 00:56:55 -0500
Subject: [PATCH] gnu: Add freealut.

* gnu/packages/audio.scm (freealut): New variable.
---
 gnu/packages/audio.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index ca438f8..cbaad11 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 David Hashe <david.hashe@dhashe.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1504,6 +1505,33 @@ buffers, and audio capture.")
     (home-page "http://kcat.strangesoft.net/openal.html")
     (license license:lgpl2.0+)))
 
+(define-public freealut
+  (package
+    (name "freealut")
+    (version "1.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://pkgs.fedoraproject.org/repo/pkgs/" name "/"
+                    name "-" version ".tar.gz/"
+                    "e089b28a0267faabdb6c079ee173664a/"
+                    name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0kzlil6112x2429nw6mycmif8y6bxr2cwjcvp18vh6s7g63ymlb0"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("openal" ,openal)))
+    ;; This is the home page for the specification, but there is no
+    ;; project-specific homepage.
+    (home-page "https://www.openal.org/")
+    (synopsis "Implementation of the OpenAL Utility Toolkit (ALUT)")
+    (description "Freealut is a free implementation of OpenAL's ALUT standard.
+ALUT is the OpenAL equivalent to GLUT fom OpenGL and has an intentionally
+similar API.  It is intended to allow developers to quickly learn OpenAL while
+abstracting away details such as loading sound samples from disk.")
+    (license license:lgpl2.0+)))
+
 (define-public patchage
   (package
     (name "patchage")
-- 
1.9.1