[PATCH] gnu: Add SDL extension libraries

[PATCH] gnu: Add SDL extension libraries

[David Thompson]

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

Attached is a patch to add the following extension libraries for SDL
1.x: SDL_gfx, SDL_image, SDL_mixer, SDL_net, and SDL_ttf.

SDL_mixer is missing an optional dependency for playing MIDI files, and
SDL_image is missing an optional dependency for reading webp files.

- Dave

[-- Attachment #2: 0001-gnu-Add-SDL-extension-libraries.patch --]
[-- Type: text/x-patch, Size: 6260 bytes --]

From 108f8690547da8a217531330c53a64e605941327 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Wed, 20 Nov 2013 21:40:45 -0500
Subject: [PATCH] gnu: Add SDL extension libraries.

* gnu/packages/sdl.scm (sdl-gfx, sdl-image, sdl-mixer, sdl-net, sdl-ttf): New
  variables.
---
 gnu/packages/sdl.scm | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 134 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index e8fd65c..c10bf0d 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -22,13 +22,24 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module ((gnu packages fontutils) #:prefix font:)
+  #:use-module (gnu packages libjpeg)
+  #:use-module (gnu packages libpng)
+  #:use-module (gnu packages libtiff)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages mp3)
+  #:use-module (gnu packages oggvorbis)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages xorg)
   #:export (sdl
             sdl2
-            libmikmod))
+            libmikmod
+            sdl-gfx
+            sdl-image
+            sdl-mixer
+            sdl-net
+            sdl-ttf))
 
 (define sdl
   (package
@@ -92,3 +103,125 @@ digital sound files. It can take advantage of particular features of your
 system, such as sound redirection over the network.")
     (license lgpl2.1)
     (home-page "http://mikmod.sourceforge.net/")))
+
+(define sdl-gfx
+  (package
+    (name "sdl-gfx")
+    (version "2.0.24")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-"
+                              version ".tar.gz"))
+              (sha256
+               (base32
+                "064islldm4r42lgj9fr4kbk66r7jmmakk9745hhyb1kmw71kib9h"))))
+    (build-system gnu-build-system)
+    (propagated-inputs `(("sdl" ,sdl)))
+    (inputs `(("libx11" ,libx11)))
+    (synopsis "SDL graphics primitives library")
+    (description "SDL_gfx provides graphics drawing primitives, rotozoom and
+other supporting functions for SDL.")
+    (home-page "http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx")
+    (license zlib)))
+
+(define sdl-image
+  (package
+    (name "sdl-image")
+    (version "1.2.12")
+    (source (origin
+             (method url-fetch)
+             (uri
+              (string-append "http://www.libsdl.org/projects/SDL_image/release/SDL_image-"
+                             version ".tar.gz"))
+             (sha256
+              (base32
+               "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"))))
+    (build-system gnu-build-system)
+    ;; FIXME: Add webp
+    (propagated-inputs `(("sdl" ,sdl)
+                         ("libpng" ,libpng)
+                         ("libjpeg" ,libjpeg)
+                         ("libtiff" ,libtiff)))
+    (inputs `(("pkg-config" ,pkg-config)))
+    (synopsis "SDL image loading library")
+    (description "SDL_image is an image file loading library for SDL that
+supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF,
+WEBP, XCF, XPM, and XV.")
+    (home-page "www.libsdl.org/projects/SDL_image/")
+    (license bsd-3)))
+
+(define sdl-mixer
+  (package
+    (name "sdl-mixer")
+    (version "1.2.12")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-"
+                              version ".tar.gz"))
+              (sha256
+               (base32
+                "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"))))
+    (build-system gnu-build-system)
+    ;; no check target
+    ;; use libmad instead of smpeg
+    (arguments `(#:tests? #f
+                 #:configure-flags '("--enable-music-mp3-mad-gpl")))
+    ;; FIXME: Add libfluidsynth
+    (propagated-inputs `(("sdl" ,sdl)
+                         ("libvorbis" ,libvorbis)
+                         ("libflac" ,flac)
+                         ("libmad" ,libmad)
+                         ("libmikmod" ,libmikmod)))
+    (synopsis "SDL multi-channel audio mixer library")
+    (description "SDL_mixer is a multi-channel audio mixer library for SDL.
+It supports any number of simultaneously playing channels of 16 bit stereo
+audio, plus a single channel of music.  Supported format include FLAC, MOD,
+MIDI, Ogg Vorbis, and MP3.")
+    (home-page "www.libsdl.org/projects/SDL_mixer/")
+    (license bsd-3)))
+
+(define sdl-net
+  (package
+    (name "sdl-net")
+    (version "1.2.8")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "http://www.libsdl.org/projects/SDL_net/release/SDL_net-"
+                              version ".tar.gz"))
+              (sha256
+               (base32
+                "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"))))
+    (build-system gnu-build-system)
+    (propagated-inputs `(("sdl" ,sdl)))
+    (inputs `(("pkg-config" ,pkg-config)))
+    (synopsis "SDL networking library")
+    (description "SDL_net is a small, cross-platform networking library for
+SDL.")
+    (home-page "www.libsdl.org/projects/SDL_net/")
+    (license zlib)))
+
+(define sdl-ttf
+  (package
+    (name "sdl-ttf")
+    (version "2.0.11")
+    (source (origin
+             (method url-fetch)
+             (uri
+              (string-append "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-"
+                             version ".tar.gz"))
+             (sha256
+              (base32
+               "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"))))
+    (build-system gnu-build-system)
+    (propagated-inputs `(("sdl" ,sdl)
+                         ("pkg-config" ,pkg-config)
+                         ("freetype" ,font:freetype)))
+    (inputs `(("libx11" ,libx11)
+              ("mesa" ,mesa)))
+    (synopsis "SDL TrueType font library")
+    (description "SDL_ttf is a TrueType font rendering library for SDL.")
+    (home-page "www.libsdl.org/projects/SDL_ttf/")
+    (license zlib)))
-- 
1.8.4.2

Re: [PATCH] gnu: Add SDL extension libraries

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> Attached is a patch to add the following extension libraries for SDL
> 1.x: SDL_gfx, SDL_image, SDL_mixer, SDL_net, and SDL_ttf.

Wow, cool.

Is the copyright/licensing of these packages clear?  In particular, do
all the files within each package have clearly the same license, or a
compatible license?  (I’d expect it to be the case given that SDL is
widespread, but just asking to be sure.)

> +(define sdl-image
> +  (package
> +    (name "sdl-image")
> +    (version "1.2.12")
> +    (source (origin
> +             (method url-fetch)
> +             (uri
> +              (string-append "http://www.libsdl.org/projects/SDL_image/release/SDL_image-"
> +                             version ".tar.gz"))
> +             (sha256
> +              (base32
> +               "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"))))
> +    (build-system gnu-build-system)
> +    ;; FIXME: Add webp
> +    (propagated-inputs `(("sdl" ,sdl)
> +                         ("libpng" ,libpng)
> +                         ("libjpeg" ,libjpeg)
> +                         ("libtiff" ,libtiff)))

Are you sure that all these need to be propagated?

(An input typically needs to be propagated if an installed header
#includes a header of that input, or if the .pc file mentions that input
in its ‘Requires:’ field.)

Otherwise looks good to me!

Thanks,
Ludo’.

Re: [PATCH] gnu: Add SDL extension libraries

[Ludovic Courtès]

I’ve added you to the Savannah group, so you can commit yourself
directly.  Of course, it’s still a good idea to post here for review;
please read “Commit Access” in ‘HACKING’ for the details.

Happy hacking!  :-)

Ludo’.

Re: [PATCH] gnu: Add SDL extension libraries

[Thompson, David]

On Thu, Nov 21, 2013 at 7:23 AM, Ludovic Courtès <ludo@gnu.org> wrote:
> Is the copyright/licensing of these packages clear?  In particular, do
> all the files within each package have clearly the same license, or a
> compatible license?  (I’d expect it to be the case given that SDL is
> widespread, but just asking to be sure.)

I will go through the source code and double check.

>> +(define sdl-image
>> +  (package
>> +    (name "sdl-image")
>> +    (version "1.2.12")
>> +    (source (origin
>> +             (method url-fetch)
>> +             (uri
>> +              (string-append "http://www.libsdl.org/projects/SDL_image/release/SDL_image-"
>> +                             version ".tar.gz"))
>> +             (sha256
>> +              (base32
>> +               "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"))))
>> +    (build-system gnu-build-system)
>> +    ;; FIXME: Add webp
>> +    (propagated-inputs `(("sdl" ,sdl)
>> +                         ("libpng" ,libpng)
>> +                         ("libjpeg" ,libjpeg)
>> +                         ("libtiff" ,libtiff)))
>
> Are you sure that all these need to be propagated?
>
> (An input typically needs to be propagated if an installed header
> #includes a header of that input, or if the .pc file mentions that input
> in its ‘Requires:’ field.)

I'm pretty sure that they are runtime dependencies, but I will check
the .pc file and verify.

- Dave

Re: [PATCH] gnu: Add SDL extension libraries

[Thompson, David]

On Thu, Nov 21, 2013 at 7:29 AM, Ludovic Courtès <ludo@gnu.org> wrote:
> I’ve added you to the Savannah group, so you can commit yourself
> directly.  Of course, it’s still a good idea to post here for review;
> please read “Commit Access” in ‘HACKING’ for the details.

Wow! Thank you. :)

Re: [PATCH] gnu: Add SDL extension libraries

[Ludovic Courtès]

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

> On Thu, Nov 21, 2013 at 7:23 AM, Ludovic Courtès <ludo@gnu.org> wrote:
>> Is the copyright/licensing of these packages clear?  In particular, do
>> all the files within each package have clearly the same license, or a
>> compatible license?  (I’d expect it to be the case given that SDL is
>> widespread, but just asking to be sure.)
>
> I will go through the source code and double check.

Thanks.  (Another way to get hints is to look at the Trisquel or Debian
patches, or
<http://libreplanet.org/wiki/List_of_software_that_does_not_respect_the_Free_System_Distribution_Guidelines>.)

>>> +(define sdl-image
>>> +  (package
>>> +    (name "sdl-image")
>>> +    (version "1.2.12")
>>> +    (source (origin
>>> +             (method url-fetch)
>>> +             (uri
>>> +              (string-append "http://www.libsdl.org/projects/SDL_image/release/SDL_image-"
>>> +                             version ".tar.gz"))
>>> +             (sha256
>>> +              (base32
>>> +               "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"))))
>>> +    (build-system gnu-build-system)
>>> +    ;; FIXME: Add webp
>>> +    (propagated-inputs `(("sdl" ,sdl)
>>> +                         ("libpng" ,libpng)
>>> +                         ("libjpeg" ,libjpeg)
>>> +                         ("libtiff" ,libtiff)))
>>
>> Are you sure that all these need to be propagated?
>>
>> (An input typically needs to be propagated if an installed header
>> #includes a header of that input, or if the .pc file mentions that input
>> in its ‘Requires:’ field.)
>
> I'm pretty sure that they are runtime dependencies, but I will check
> the .pc file and verify.

I wouldn’t be surprised if sdl-image’s headers #include SDL’s headers;
dunno about the others.

Thanks,
Ludo’.

Re: [PATCH] gnu: Add SDL extension libraries

[David Thompson]

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

On 11/21/2013 07:23 AM, Ludovic Courtès wrote:
> David Thompson <dthompson2@worcester.edu> skribis:
> 
>> Attached is a patch to add the following extension libraries for SDL
>> 1.x: SDL_gfx, SDL_image, SDL_mixer, SDL_net, and SDL_ttf.
> 
> Wow, cool.
> 
> Is the copyright/licensing of these packages clear?  In particular, do
> all the files within each package have clearly the same license, or a
> compatible license?  (I’d expect it to be the case given that SDL is
> widespread, but just asking to be sure.)

Turns out that I was a little sloppy with the licenses. All of these are
zlib licensed, but I had specified bsd-3 for a couple of them.
> 
>> +(define sdl-image
>> +  (package
>> +    (name "sdl-image")
>> +    (version "1.2.12")
>> +    (source (origin
>> +             (method url-fetch)
>> +             (uri
>> +              (string-append "http://www.libsdl.org/projects/SDL_image/release/SDL_image-"
>> +                             version ".tar.gz"))
>> +             (sha256
>> +              (base32
>> +               "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"))))
>> +    (build-system gnu-build-system)
>> +    ;; FIXME: Add webp
>> +    (propagated-inputs `(("sdl" ,sdl)
>> +                         ("libpng" ,libpng)
>> +                         ("libjpeg" ,libjpeg)
>> +                         ("libtiff" ,libtiff)))
> 
> Are you sure that all these need to be propagated?
> 
> (An input typically needs to be propagated if an installed header
> #includes a header of that input, or if the .pc file mentions that input
> in its ‘Requires:’ field.)

You were right. No need to propagate anything besides sdl.

> 
> Otherwise looks good to me!
> 
> Thanks,
> Ludo’.
> 

Updated patch attached. If you think it looks good I can push it to master.

- Dave

[-- Attachment #2: 0001-gnu-Add-SDL-extension-libraries.patch --]
[-- Type: text/x-patch, Size: 6161 bytes --]

From bd7e5b6c7cc4119a357cb89fdb5a350de9577f47 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Wed, 20 Nov 2013 21:40:45 -0500
Subject: [PATCH] gnu: Add SDL extension libraries.

* gnu/packages/sdl.scm (sdl-gfx, sdl-image, sdl-mixer, sdl-net, sdl-ttf): New
  variables.
---
 gnu/packages/sdl.scm | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 134 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index e8fd65c..37b074d 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -22,13 +22,24 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module ((gnu packages fontutils) #:prefix font:)
+  #:use-module (gnu packages libjpeg)
+  #:use-module (gnu packages libpng)
+  #:use-module (gnu packages libtiff)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages mp3)
+  #:use-module (gnu packages oggvorbis)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages xorg)
   #:export (sdl
             sdl2
-            libmikmod))
+            libmikmod
+            sdl-gfx
+            sdl-image
+            sdl-mixer
+            sdl-net
+            sdl-ttf))
 
 (define sdl
   (package
@@ -92,3 +103,125 @@ digital sound files. It can take advantage of particular features of your
 system, such as sound redirection over the network.")
     (license lgpl2.1)
     (home-page "http://mikmod.sourceforge.net/")))
+
+(define sdl-gfx
+  (package
+    (name "sdl-gfx")
+    (version "2.0.24")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-"
+                              version ".tar.gz"))
+              (sha256
+               (base32
+                "064islldm4r42lgj9fr4kbk66r7jmmakk9745hhyb1kmw71kib9h"))))
+    (build-system gnu-build-system)
+    (propagated-inputs `(("sdl" ,sdl)))
+    (inputs `(("libx11" ,libx11)))
+    (synopsis "SDL graphics primitives library")
+    (description "SDL_gfx provides graphics drawing primitives, rotozoom and
+other supporting functions for SDL.")
+    (home-page "http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx")
+    (license zlib)))
+
+(define sdl-image
+  (package
+    (name "sdl-image")
+    (version "1.2.12")
+    (source (origin
+             (method url-fetch)
+             (uri
+              (string-append "http://www.libsdl.org/projects/SDL_image/release/SDL_image-"
+                             version ".tar.gz"))
+             (sha256
+              (base32
+               "16an9slbb8ci7d89wakkmyfvp7c0cval8xw4hkg0842nhhlp540b"))))
+    (build-system gnu-build-system)
+    ;; FIXME: Add webp
+    (inputs `(("libpng" ,libpng)
+              ("libjpeg" ,libjpeg)
+              ("libtiff" ,libtiff)
+              ("pkg-config" ,pkg-config)))
+    (propagated-inputs `(("sdl" ,sdl)))
+    (synopsis "SDL image loading library")
+    (description "SDL_image is an image file loading library for SDL that
+supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF,
+WEBP, XCF, XPM, and XV.")
+    (home-page "www.libsdl.org/projects/SDL_image/")
+    (license zlib)))
+
+(define sdl-mixer
+  (package
+    (name "sdl-mixer")
+    (version "1.2.12")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-"
+                              version ".tar.gz"))
+              (sha256
+               (base32
+                "0alrhqgm40p4c92s26mimg9cm1y7rzr6m0p49687jxd9g6130i0n"))))
+    (build-system gnu-build-system)
+    ;; no check target
+    ;; use libmad instead of smpeg
+    (arguments `(#:tests? #f
+                 #:configure-flags '("--enable-music-mp3-mad-gpl")))
+    (inputs `(("libvorbis" ,libvorbis)
+              ("libflac" ,flac)
+              ("libmad" ,libmad)
+              ("libmikmod" ,libmikmod)))
+    ;; FIXME: Add libfluidsynth
+    (propagated-inputs `(("sdl" ,sdl)))
+    (synopsis "SDL multi-channel audio mixer library")
+    (description "SDL_mixer is a multi-channel audio mixer library for SDL.
+It supports any number of simultaneously playing channels of 16 bit stereo
+audio, plus a single channel of music.  Supported format include FLAC, MOD,
+MIDI, Ogg Vorbis, and MP3.")
+    (home-page "www.libsdl.org/projects/SDL_mixer/")
+    (license zlib)))
+
+(define sdl-net
+  (package
+    (name "sdl-net")
+    (version "1.2.8")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "http://www.libsdl.org/projects/SDL_net/release/SDL_net-"
+                              version ".tar.gz"))
+              (sha256
+               (base32
+                "1d5c9xqlf4s1c01gzv6cxmg0r621pq9kfgxcg3197xw4p25pljjz"))))
+    (build-system gnu-build-system)
+    (propagated-inputs `(("sdl" ,sdl)))
+    (inputs `(("pkg-config" ,pkg-config)))
+    (synopsis "SDL networking library")
+    (description "SDL_net is a small, cross-platform networking library for
+SDL.")
+    (home-page "www.libsdl.org/projects/SDL_net/")
+    (license zlib)))
+
+(define sdl-ttf
+  (package
+    (name "sdl-ttf")
+    (version "2.0.11")
+    (source (origin
+             (method url-fetch)
+             (uri
+              (string-append "http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-"
+                             version ".tar.gz"))
+             (sha256
+              (base32
+               "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j"))))
+    (build-system gnu-build-system)
+    (propagated-inputs `(("sdl" ,sdl)))
+    (inputs `(("freetype" ,font:freetype)
+              ("libx11" ,libx11)
+              ("mesa" ,mesa)
+              ("pkg-config" ,pkg-config)))
+    (synopsis "SDL TrueType font library")
+    (description "SDL_ttf is a TrueType font rendering library for SDL.")
+    (home-page "www.libsdl.org/projects/SDL_ttf/")
+    (license zlib)))
-- 
1.8.4.2

Re: [PATCH] gnu: Add SDL extension libraries

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> Updated patch attached. If you think it looks good I can push it to master.

Looks good to me, please push!

Ludo’.

Re: [PATCH] gnu: Add SDL extension libraries

[David Thompson]

On 11/23/2013 05:42 AM, Ludovic Courtès wrote:
> Looks good to me, please push!
> 
> Ludo’. 

Pushed!