[PATCH] gnu: Add libsbsms.

[PATCH] gnu: Add libsbsms.

[Taylan Ulrich Bayırlı/Kammer]

[-- Attachment #1: patch --]
[-- Type: text/x-diff, Size: 2652 bytes --]

From 4a6b86eb106c8dca2f76794eeb417b2fea5d5b26 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:42:48 +0100
Subject: [PATCH 4/9] gnu: Add sbsms.

* gnu/packages/audio.scm (sbsms): 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 e1ad44a..51157d0 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -42,6 +43,7 @@
   #:use-module (gnu packages readline)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages autotools)
   #:use-module (srfi srfi-1))
 
 (define-public aubio
@@ -645,3 +647,37 @@ analysis plugins or audio feature extraction plugins.")
     (license
      (license:x11-style
       "https://code.soundsoftware.ac.uk/projects/vamp-plugin-sdk/repository/entry/COPYING"))))
+
+(define-public libsbsms
+  (package
+    (name "libsbsms")
+    (version "2.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://sourceforge/sbsms/sbsms/" version
+                           "/libsbsms-" version ".tar.gz"))
+       (sha256
+        (base32 "1vmf84iy4dkwxv887grnlsfk43fmhd9gbg26gc2kgcv40sbkvayf"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("automake" ,automake)))
+    (arguments
+     `(#:phases
+       (alist-cons-after
+        'unpack 'fix-ar-lib-path
+        (lambda* (#:key inputs #:allow-other-keys)
+          ;; Originally a symlink to '/usr/local/share/automake-1.12/ar-lib'.
+          (delete-file "ar-lib")
+          (symlink
+           (string-append (assoc-ref inputs "automake") "/share/automake-"
+                          ,(package-version automake) "/ar-lib")
+           "ar-lib"))
+        %standard-phases)))
+    (home-page "http://sbsms.sourceforge.net/")
+    (synopsis "Library for time stretching and pitch scaling of audio")
+    (description
+     "SBSMS (Subband Sinusoidal Modeling Synthesis) is software for time
+stretching and pitch scaling of audio.  This package contains the library.")
+    ;; There is no explicit declaration of a license, but a COPYING file
+    ;; containing gpl2.
+    (license license:gpl2)))
-- 
2.2.1

Re: [PATCH] gnu: Add libsbsms.

[Taylan Ulrich Bayırlı/Kammer]

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

Please ignore the previous one; the commit message was wrong.


[-- Attachment #2: patch --]
[-- Type: text/x-diff, Size: 2660 bytes --]

From 7aed4cd0b6bd365e31fe5fb6de1c7249ca300e15 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:42:48 +0100
Subject: [PATCH 4/9] gnu: Add libsbsms.

* gnu/packages/audio.scm (libsbsms): 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 e1ad44a..51157d0 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -42,6 +43,7 @@
   #:use-module (gnu packages readline)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages autotools)
   #:use-module (srfi srfi-1))
 
 (define-public aubio
@@ -645,3 +647,37 @@ analysis plugins or audio feature extraction plugins.")
     (license
      (license:x11-style
       "https://code.soundsoftware.ac.uk/projects/vamp-plugin-sdk/repository/entry/COPYING"))))
+
+(define-public libsbsms
+  (package
+    (name "libsbsms")
+    (version "2.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://sourceforge/sbsms/sbsms/" version
+                           "/libsbsms-" version ".tar.gz"))
+       (sha256
+        (base32 "1vmf84iy4dkwxv887grnlsfk43fmhd9gbg26gc2kgcv40sbkvayf"))))
+    (build-system gnu-build-system)
+    (native-inputs `(("automake" ,automake)))
+    (arguments
+     `(#:phases
+       (alist-cons-after
+        'unpack 'fix-ar-lib-path
+        (lambda* (#:key inputs #:allow-other-keys)
+          ;; Originally a symlink to '/usr/local/share/automake-1.12/ar-lib'.
+          (delete-file "ar-lib")
+          (symlink
+           (string-append (assoc-ref inputs "automake") "/share/automake-"
+                          ,(package-version automake) "/ar-lib")
+           "ar-lib"))
+        %standard-phases)))
+    (home-page "http://sbsms.sourceforge.net/")
+    (synopsis "Library for time stretching and pitch scaling of audio")
+    (description
+     "SBSMS (Subband Sinusoidal Modeling Synthesis) is software for time
+stretching and pitch scaling of audio.  This package contains the library.")
+    ;; There is no explicit declaration of a license, but a COPYING file
+    ;; containing gpl2.
+    (license license:gpl2)))
-- 
2.2.1

Re: [PATCH] gnu: Add libsbsms.

[Taylan Ulrich Bayırlı/Kammer]

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

>> From 7aed4cd0b6bd365e31fe5fb6de1c7249ca300e15 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:42:48 +0100
> Subject: [PATCH 4/9] gnu: Add libsbsms.
>
> * gnu/packages/audio.scm (libsbsms): 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 e1ad44a..51157d0 100644
> --- a/gnu/packages/audio.scm
> +++ b/gnu/packages/audio.scm
> @@ -1,5 +1,6 @@
>  ;;; GNU Guix --- Functional package management for GNU
>  ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
> +;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -42,6 +43,7 @@
>    #:use-module (gnu packages readline)
>    #:use-module (gnu packages xiph)
>    #:use-module (gnu packages xml)
> +  #:use-module (gnu packages autotools)
>    #:use-module (srfi srfi-1))
>  
>  (define-public aubio
> @@ -645,3 +647,37 @@ analysis plugins or audio feature extraction plugins.")
>      (license
>       (license:x11-style
>        "https://code.soundsoftware.ac.uk/projects/vamp-plugin-sdk/repository/entry/COPYING"))))
> +
> +(define-public libsbsms
> +  (package
> +    (name "libsbsms")
> +    (version "2.0.2")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "mirror://sourceforge/sbsms/sbsms/" version
> +                           "/libsbsms-" version ".tar.gz"))
> +       (sha256
> +        (base32 "1vmf84iy4dkwxv887grnlsfk43fmhd9gbg26gc2kgcv40sbkvayf"))))
> +    (build-system gnu-build-system)
> +    (native-inputs `(("automake" ,automake)))
> +    (arguments
> +     `(#:phases
> +       (alist-cons-after
> +        'unpack 'fix-ar-lib-path
> +        (lambda* (#:key inputs #:allow-other-keys)
> +          ;; Originally a symlink to '/usr/local/share/automake-1.12/ar-lib'.
> +          (delete-file "ar-lib")
> +          (symlink
> +           (string-append (assoc-ref inputs "automake") "/share/automake-"
> +                          ,(package-version automake) "/ar-lib")
> +           "ar-lib"))
> +        %standard-phases)))
> +    (home-page "http://sbsms.sourceforge.net/")
> +    (synopsis "Library for time stretching and pitch scaling of audio")
> +    (description
> +     "SBSMS (Subband Sinusoidal Modeling Synthesis) is software for time
> +stretching and pitch scaling of audio.  This package contains the library.")
> +    ;; There is no explicit declaration of a license, but a COPYING file
> +    ;; containing gpl2.
> +    (license license:gpl2)))

Ping.  Does anyone know a better solution to the ar-lib hack?  Will push
otherwise.

Taylan

Re: [PATCH] gnu: Add libsbsms.

[Ludovic Courtès]

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

> From 7aed4cd0b6bd365e31fe5fb6de1c7249ca300e15 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:42:48 +0100
> Subject: [PATCH 4/9] gnu: Add libsbsms.
>
> * gnu/packages/audio.scm (libsbsms): New variable.

[...]

> +        (lambda* (#:key inputs #:allow-other-keys)
> +          ;; Originally a symlink to '/usr/local/share/automake-1.12/ar-lib'.
> +          (delete-file "ar-lib")
> +          (symlink
> +           (string-append (assoc-ref inputs "automake") "/share/automake-"
> +                          ,(package-version automake) "/ar-lib")
> +           "ar-lib"))

I think it could just run “automake --add-missing” instead, which is
lightly more elegant and future-proof.

Other than that LGTM, thanks!

Ludo’.

Re: [PATCH] gnu: Add libsbsms.

[Taylan Ulrich Bayırlı/Kammer]

ludo@gnu.org (Ludovic Courtès) writes:

>> +        (lambda* (#:key inputs #:allow-other-keys)
>> +          ;; Originally a symlink to '/usr/local/share/automake-1.12/ar-lib'.
>> +          (delete-file "ar-lib")
>> +          (symlink
>> +           (string-append (assoc-ref inputs "automake") "/share/automake-"
>> +                          ,(package-version automake) "/ar-lib")
>> +           "ar-lib"))
>
> I think it could just run “automake --add-missing” instead, which is
> lightly more elegant and future-proof.

That seems to lead to:

configure.ac:119: error: version mismatch.  This is Automake 1.15,
configure.ac:119: but the definition used by this AM_INIT_AUTOMAKE
configure.ac:119: comes from Automake 1.12.  You should recreate
configure.ac:119: aclocal.m4 with aclocal and run automake again.
configure.ac:119: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and its use is discouraged.
configure.ac:119: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead,
configure.ac:119: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.
configure.ac:39: installing './ar-lib'

It works if I just run 'autoreconf -vif'.  Is that fine?

I have to additionally add autoconf and libtool as inputs for that by
the way.

The final result would be:


  (arguments
   `(#:phases
     ;; Do this right after unpack because there's a danling symlink to
     ;; '/usr/local/share/automake-1.12/ar-lib' which causes a "no such
     ;; file or directory" during shebang patching.
     (alist-cons-after
      'unpack 'autoreconf
      (lambda* (#:key inputs #:allow-other-keys)
        (zero? (system* "autoreconf" "-vif")))
      %standard-phases)))


Taylan

Re: [PATCH] gnu: Add libsbsms.

[Ludovic Courtès]

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

> ludo@gnu.org (Ludovic Courtès) writes:
>
>>> +        (lambda* (#:key inputs #:allow-other-keys)
>>> +          ;; Originally a symlink to '/usr/local/share/automake-1.12/ar-lib'.
>>> +          (delete-file "ar-lib")
>>> +          (symlink
>>> +           (string-append (assoc-ref inputs "automake") "/share/automake-"
>>> +                          ,(package-version automake) "/ar-lib")
>>> +           "ar-lib"))
>>
>> I think it could just run “automake --add-missing” instead, which is
>> lightly more elegant and future-proof.
>
> That seems to lead to:
>
> configure.ac:119: error: version mismatch.  This is Automake 1.15,
> configure.ac:119: but the definition used by this AM_INIT_AUTOMAKE
> configure.ac:119: comes from Automake 1.12.  You should recreate
> configure.ac:119: aclocal.m4 with aclocal and run automake again.
> configure.ac:119: warning: The 'AM_PROG_MKDIR_P' macro is deprecated, and its use is discouraged.
> configure.ac:119: You should use the Autoconf-provided 'AC_PROG_MKDIR_P' macro instead,
> configure.ac:119: and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.
> configure.ac:39: installing './ar-lib'
>
> It works if I just run 'autoreconf -vif'.  Is that fine?
>
> I have to additionally add autoconf and libtool as inputs for that by
> the way.

Yes, which is a bit wasteful.

In that case your initial solution is better IMO.

OK to push it, then!

Thank you,
Ludo’.