[PATCH] Add libtheora package

[PATCH] Add libtheora package

[David Thompson]

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

Hello all,

This is my first Guix patch. A little birdy told me that libtheora would 
be a good place to start for my first package. It was little more than 
duplicating the libvorbis package and replacing vorbis with theora.

How does it look?

- Dave

[-- Attachment #2: 0001-Add-libtheora-package.patch --]
[-- Type: text/x-patch, Size: 1689 bytes --]

From 085fdad0505ecb22c5eefd7f5bcac329bf1fcddd Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sun, 13 Oct 2013 19:17:27 -0400
Subject: [PATCH] Add libtheora package.

---
 gnu/packages/oggvorbis.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/oggvorbis.scm b/gnu/packages/oggvorbis.scm
index 589828b..881ab5a 100644
--- a/gnu/packages/oggvorbis.scm
+++ b/gnu/packages/oggvorbis.scm
@@ -80,6 +80,29 @@ polyphonic) audio and music at fixed and variable bitrates from 16 to
                                "See COPYING in the distribution."))
    (home-page "http://xiph.org/vorbis/")))
 
+(define-public libtheora
+  (package
+    (name "libtheora")
+    (version "1.1.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://downloads.xiph.org/releases/theora/libtheora-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0q8wark9ribij57dciym5vdikg2464p8q2mgqvfb78ksjh4s8vgk"))))
+    (build-system gnu-build-system)
+    (propagated-inputs `(("libogg" ,libogg)
+                         ("libvorbis" ,libvorbis)))
+    (synopsis "A library implementing the theora video format")
+    (description
+     "The libtheora library implements the ogg theora video format,
+a fully open, non-proprietary, patent-and-royalty-free, general-purpose
+compressed video format.")
+    (license (license:bsd-style "file://COPYING"
+                                "See COPYING in the distribution."))
+    (home-page "http://xiph.org/theora/")))
+
 (define-public speex
   (package
     (name "speex")
-- 
1.8.4.rc3

Re: [PATCH] Add libtheora package

[Andreas Enge]

On Sun, Oct 13, 2013 at 07:20:59PM -0400, David Thompson wrote:
> How does it look?

It compiles well and looks good, congratulations! One point, though:
If you do
   cd /nix/store/f06apny3g77kjk0wxzhmgl4b3ya77f0b-libtheora-1.1.1/lib/pkgconfig/
   grep Requires *.pc
you only see ogg, not vorbis.
So I think you can move libvorbis from propagated-inputs into regular inputs.

At a later point, you might wish to add libsdl as an input (I think you were
working on it already.)

Andreas

Re: [PATCH] Add libtheora package

[David Thompson]

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

On 10/14/2013 05:23 AM, Andreas Enge wrote:
> On Sun, Oct 13, 2013 at 07:20:59PM -0400, David Thompson wrote:
>> How does it look?
>
> It compiles well and looks good, congratulations! One point, though:
> If you do
>     cd /nix/store/f06apny3g77kjk0wxzhmgl4b3ya77f0b-libtheora-1.1.1/lib/pkgconfig/
>     grep Requires *.pc
> you only see ogg, not vorbis.
> So I think you can move libvorbis from propagated-inputs into regular inputs.
>
> At a later point, you might wish to add libsdl as an input (I think you were
> working on it already.)
>
> Andreas
>

Thanks for the feedback. Here's an updated patch.

[-- Attachment #2: 0001-Add-libtheora-package.patch --]
[-- Type: text/x-patch, Size: 1680 bytes --]

From 8b6a37847c8375acabc4c477c773ae768cece29f Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Sun, 13 Oct 2013 19:17:27 -0400
Subject: [PATCH] Add libtheora package.

---
 gnu/packages/oggvorbis.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/oggvorbis.scm b/gnu/packages/oggvorbis.scm
index 589828b..00dfc01 100644
--- a/gnu/packages/oggvorbis.scm
+++ b/gnu/packages/oggvorbis.scm
@@ -80,6 +80,29 @@ polyphonic) audio and music at fixed and variable bitrates from 16 to
                                "See COPYING in the distribution."))
    (home-page "http://xiph.org/vorbis/")))
 
+(define-public libtheora
+  (package
+    (name "libtheora")
+    (version "1.1.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://downloads.xiph.org/releases/theora/libtheora-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0q8wark9ribij57dciym5vdikg2464p8q2mgqvfb78ksjh4s8vgk"))))
+    (build-system gnu-build-system)
+    (inputs `(("libvorbis" ,libvorbis)))
+    (propagated-inputs `(("libogg" ,libogg)))
+    (synopsis "A library implementing the theora video format")
+    (description
+     "The libtheora library implements the ogg theora video format,
+a fully open, non-proprietary, patent-and-royalty-free, general-purpose
+compressed video format.")
+    (license (license:bsd-style "file://COPYING"
+                                "See COPYING in the distribution."))
+    (home-page "http://xiph.org/theora/")))
+
 (define-public speex
   (package
     (name "speex")
-- 
1.8.4.rc3

Re: [PATCH] Add libtheora package

[David Thompson]

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

On 10/14/2013 05:23 AM, Andreas Enge wrote:
> On Sun, Oct 13, 2013 at 07:20:59PM -0400, David Thompson wrote:
>> How does it look?
>
> It compiles well and looks good, congratulations! One point, though:
> If you do
>     cd /nix/store/f06apny3g77kjk0wxzhmgl4b3ya77f0b-libtheora-1.1.1/lib/pkgconfig/
>     grep Requires *.pc
> you only see ogg, not vorbis.
> So I think you can move libvorbis from propagated-inputs into regular inputs.
>
> At a later point, you might wish to add libsdl as an input (I think you were
> working on it already.)
>
> Andreas
>

One more try, this time with what I hope is a proper commit log.

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

From 0865a4a55bd7b0cccf2e45b0f5bb655344d98017 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Mon, 14 Oct 2013 16:40:02 -0400
Subject: [PATCH] gnu: Add libtheora.

* gnu/packages/oggvorbis.scm (libtheora): New variable.
---
 gnu/packages/oggvorbis.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/oggvorbis.scm b/gnu/packages/oggvorbis.scm
index 0652ec3..952ef9e 100644
--- a/gnu/packages/oggvorbis.scm
+++ b/gnu/packages/oggvorbis.scm
@@ -34,6 +34,7 @@
   #:use-module (guix build-system gnu)
   #:export (libogg
             libvorbis
+            libtheora
             speex
             ao
             flac
@@ -88,6 +89,29 @@ polyphonic) audio and music at fixed and variable bitrates from 16 to
                                "See COPYING in the distribution."))
    (home-page "http://xiph.org/vorbis/")))
 
+(define libtheora
+  (package
+    (name "libtheora")
+    (version "1.1.1")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "http://downloads.xiph.org/releases/theora/libtheora-"
+                                 version ".tar.xz"))
+             (sha256
+              (base32
+               "0q8wark9ribij57dciym5vdikg2464p8q2mgqvfb78ksjh4s8vgk"))))
+    (build-system gnu-build-system)
+    (inputs `(("libvorbis" ,libvorbis)))
+    (propagated-inputs `(("libogg" ,libogg)))
+    (synopsis "A library implementing the theora video format")
+    (description
+     "The libtheora library implements the ogg theora video format,
+a fully open, non-proprietary, patent-and-royalty-free, general-purpose
+compressed video format.")
+    (license (license:bsd-style "file://COPYING"
+                                "See COPYING in the distribution."))
+    (home-page "http://xiph.org/theora/")))
+
 (define speex
   (package
     (name "speex")
-- 
1.8.4.rc3

Re: [PATCH] Add libtheora package

[Ludovic Courtès]

David Thompson <dthompson2@worcester.edu> skribis:

> From 0865a4a55bd7b0cccf2e45b0f5bb655344d98017 Mon Sep 17 00:00:00 2001
> From: David Thompson <dthompson2@worcester.edu>
> Date: Mon, 14 Oct 2013 16:40:02 -0400
> Subject: [PATCH] gnu: Add libtheora.
>
> * gnu/packages/oggvorbis.scm (libtheora): New variable.

Applied, with minor changes: the license is actually BSD-3 (see
<http://directory.fsf.org/wiki/License:BSD_3Clause>); I added a comment
stating why the inputs are propagated, and added you as a copyright holder.

Thanks!

Ludo’.