[PATCH] gnu: Add twolame.

[PATCH] gnu: Add twolame.

[Taylan Ulrich Bayırlı/Kammer]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: patch --]
[-- Type: text/x-diff, Size: 1857 bytes --]

From ad7a15b990eb340bd491b99eb70e36675d277b92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Fri, 20 Feb 2015 21:51:09 +0100
Subject: [PATCH 7/9] gnu: Add twolame.

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

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index b9808b8..d220349 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -46,6 +46,7 @@
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages file)
   #:use-module (gnu packages cmake)
+  #:use-module (gnu packages which)
   #:use-module (srfi srfi-1))
 
 (define-public aubio
@@ -762,3 +763,28 @@ control functionality, or just for playing around with the sound effects.")
      "The SoX Resampler library (libsoxr) performs one-dimensional sample-rate
 conversion.  It may be used, for example, to resample PCM-encoded audio.")
     (license license:lgpl2.1+)))
+
+(define-public twolame
+  (package
+    (name "twolame")
+    (version "0.3.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://sourceforge/twolame/twolame-" version ".tar.gz"))
+       (sha256
+        (base32 "0ahiqqng5pidwhj1wzph4vxxgxxgcfa3gl0gywipzx2ii7s35wwq"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libsndfile" ,libsndfile)))
+    (native-inputs
+     `(("perl" ,perl)
+       ("which" ,which)))
+    (home-page "http://www.twolame.org/")
+    (synopsis "MPEG Audio Layer 2 (MP2) encoder")
+    (description
+     "TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on
+tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 code and
+portions of LAME.")
+    (license license:lgpl2.1+)))
-- 
2.2.1

Re: [PATCH] gnu: Add twolame.

[Andreas Enge]

On Sun, Feb 22, 2015 at 12:24:23AM +0100, Taylan Ulrich Bayırlı/Kammer wrote:
> +       ("which" ,which)))

What is this needed for? Maybe add a little comment as it is rather unusual.

Otherwise it looks good. There is at least one package, ffmpeg, that can take
twolame as an additional input (see the comments in the package); maybe there
are others. It would be nice if, once twolame pushed, you could hunt them down
and adapt them.

Andreas

Re: [PATCH] gnu: Add twolame.

[Taylan Ulrich Bayırlı/Kammer]

Andreas Enge <andreas@enge.fr> writes:

>> +       ("which" ,which)))
>
> What is this needed for? Maybe add a little comment as it is rather
> unusual.

I noticed that occasionally some ./configure scripts will say "which:
command not found" and in that case I add it.  I didn't look into what
difference it makes though, since it doesn't make the configure script
fail.  Is it normal; can one leave it out?

> Otherwise it looks good. There is at least one package, ffmpeg, that
> can take twolame as an additional input (see the comments in the
> package); maybe there are others. It would be nice if, once twolame
> pushed, you could hunt them down and adapt them.

OK, will look into it.

Taylan

Re: [PATCH] gnu: Add twolame.

[Andreas Enge]

On Sun, Feb 22, 2015 at 01:18:25PM +0100, Taylan Ulrich Bayırlı/Kammer wrote:
> I noticed that occasionally some ./configure scripts will say "which:
> command not found" and in that case I add it.  I didn't look into what
> difference it makes though, since it doesn't make the configure script
> fail.  Is it normal; can one leave it out?

I do not know. It would be interesting to see what is searched for.

Andreas

Re: [PATCH] gnu: Add twolame.

[Taylan Ulrich Bayırlı/Kammer]

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

Andreas Enge <andreas@enge.fr> writes:

> On Sun, Feb 22, 2015 at 01:18:25PM +0100, Taylan Ulrich Bayırlı/Kammer wrote:
>> I noticed that occasionally some ./configure scripts will say "which:
>> command not found" and in that case I add it.  I didn't look into what
>> difference it makes though, since it doesn't make the configure script
>> fail.  Is it normal; can one leave it out?
>
> I do not know. It would be interesting to see what is searched for.
>
> Andreas

So I ran it without the which input and, my bad, it's not the configure
script this time but a piece of code in the test.pl script:

SKIP: {
  my $result = system("which sndfile-convert > /dev/null");
  skip("sndfile-convert is not available", 5) unless ($result == 0);

  ...
}

I guess I should at least comment for what it's needed. :-)

Other than that, we could modify that file to remove that check, knowing
that `sndfile-convert' is there, since the inputs have `libsndfile'.
Should we go that way, how about:

;; We know that sndfile-convert will be there, and this is the only
;; usage of which(1), so remove it.
(substitute* "tests/test.pl"
  (("system\\(\"which sndfile-convert > /dev/null\"\\)")
   "0")))

Patch with the above proposal:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 2240 bytes --]

From ff45bf2ea61ba384913b50c3f24cd3ff00d22966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Fri, 20 Feb 2015 21:51:09 +0100
Subject: [PATCH 4/8] gnu: Add twolame.

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

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index a307a88..5b21613 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -46,6 +46,7 @@
   #:use-module (gnu packages xml)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages file)
+  #:use-module (gnu packages which)
   #:use-module (srfi srfi-1))
 
 (define-public aubio
@@ -743,3 +744,38 @@ control functionality, or just for playing around with the sound effects.")
      "The SoX Resampler library (libsoxr) performs one-dimensional sample-rate
 conversion.  It may be used, for example, to resample PCM-encoded audio.")
     (license license:lgpl2.1+)))
+
+(define-public twolame
+  (package
+    (name "twolame")
+    (version "0.3.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://sourceforge/twolame/twolame-" version ".tar.gz"))
+       (sha256
+        (base32 "0ahiqqng5pidwhj1wzph4vxxgxxgcfa3gl0gywipzx2ii7s35wwq"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libsndfile" ,libsndfile)))
+    (native-inputs
+     `(("perl" ,perl)))
+    (arguments
+     '(#:phases
+       (alist-cons-before
+        'check 'remove-which-usage
+        (lambda _
+          ;; We know that sndfile-convert will be there, and this is the only
+          ;; usage of which(1), so remove it.
+          (substitute* "tests/test.pl"
+            (("system\\(\"which sndfile-convert > /dev/null\"\\)")
+             "0")))
+        %standard-phases)))
+    (home-page "http://www.twolame.org/")
+    (synopsis "MPEG Audio Layer 2 (MP2) encoder")
+    (description
+     "TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on
+tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 code and
+portions of LAME.")
+    (license license:lgpl2.1+)))
-- 
2.2.1

Re: [PATCH] gnu: Add twolame.

[Andreas Enge]

On Mon, Feb 23, 2015 at 10:42:35PM +0100, Taylan Ulrich Bayırlı/Kammer wrote:
> Other than that, we could modify that file to remove that check, knowing
> that `sndfile-convert' is there, since the inputs have `libsndfile'.
> Should we go that way, how about:

I do not know. If it is used and needed, then I think the easiest solution
would be to add "which" as a native input, with a little comment.

Andreas

Re: [PATCH] gnu: Add twolame.

[Taylan Ulrich Bayırlı/Kammer]

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

Andreas Enge <andreas@enge.fr> writes:

> On Mon, Feb 23, 2015 at 10:42:35PM +0100, Taylan Ulrich Bayırlı/Kammer wrote:
>> Other than that, we could modify that file to remove that check, knowing
>> that `sndfile-convert' is there, since the inputs have `libsndfile'.
>> Should we go that way, how about:
>
> I do not know. If it is used and needed, then I think the easiest solution
> would be to add "which" as a native input, with a little comment.
>
> Andreas

OK.  Will push the attached patch if nobody has objections.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 1941 bytes --]

From 79a35cc12ebb07b789c08ca943465f11db3e199e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 <taylanbayirli@gmail.com>
Date: Fri, 20 Feb 2015 21:51:09 +0100
Subject: [PATCH 4/8] gnu: Add twolame.

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

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 3ed2301..44ab891 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -44,6 +44,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages rdf)
   #:use-module (gnu packages readline)
+  #:use-module (gnu packages which)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
   #:use-module (srfi srfi-1))
@@ -742,3 +743,28 @@ control functionality, or just for playing around with the sound effects.")
      "The SoX Resampler library (libsoxr) performs one-dimensional sample-rate
 conversion.  It may be used, for example, to resample PCM-encoded audio.")
     (license license:lgpl2.1+)))
+
+(define-public twolame
+  (package
+    (name "twolame")
+    (version "0.3.13")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "mirror://sourceforge/twolame/twolame-" version ".tar.gz"))
+       (sha256
+        (base32 "0ahiqqng5pidwhj1wzph4vxxgxxgcfa3gl0gywipzx2ii7s35wwq"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("libsndfile" ,libsndfile)))
+    (native-inputs
+     `(("perl" ,perl)
+       ("which" ,which)))               ;used in tests/test.pl
+    (home-page "http://www.twolame.org/")
+    (synopsis "MPEG Audio Layer 2 (MP2) encoder")
+    (description
+     "TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on
+tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 code and
+portions of LAME.")
+    (license license:lgpl2.1+)))
-- 
2.2.1

Re: [PATCH] gnu: Add twolame.

[Mark H Weaver]

taylanbayirli@gmail.com (Taylan Ulrich "Bayırlı/Kammer") writes:

> From 79a35cc12ebb07b789c08ca943465f11db3e199e Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
>  <taylanbayirli@gmail.com>
> Date: Fri, 20 Feb 2015 21:51:09 +0100
> Subject: [PATCH 4/8] gnu: Add twolame.
>
> * gnu/packages/audio.scm (twolame): New variable.

Looks good to me.  Please push!

    Mark