[bug#39150] [PATCH 0/2] Add redsea, minor changes to liquid-dsp

[bug#39150] [PATCH 0/2] Add redsea, minor changes to liquid-dsp

[Evan Straw]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1: [PATCH 0/2] Add redsea, minor changes to liquid-dsp --]
[-- Type: text/x-patch, Size: 797 bytes --]

From c7b8d253b5959f7e8b61bd1730249df26f071a29 Mon Sep 17 00:00:00 2001
From: Evan Straw <evan.straw99@gmail.com>
Date: Wed, 15 Jan 2020 23:13:44 -0800
Subject: [PATCH 0/2] Add redsea, minor changes to liquid-dsp

Hi all,
This is a new patch series for the same packages submitted in my earlier bug
(38842). Some things changed since the last patch series and so I decided to
submit a different, modified patch series that includes only the changes that
are relevant now to avoid confusion when applying the patches.

Evan Straw (2):
  gnu: liquid-dsp: Remove unused module imports.
  gnu: Add redsea.

 gnu/packages/ham-radio.scm | 51 +++++++++++++++++++++++++++++++++++++-
 gnu/packages/sdr.scm       |  3 +--
 2 files changed, 51 insertions(+), 3 deletions(-)

-- 
2.20.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#39150] [PATCH 1/2] gnu: liquid-dsp: Remove unused module imports.

[Evan Straw]

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


Made some slight modifications to this package; specifically,
(guix utils) was included although it was not used.

-- Evan


[-- Attachment #1.2: [PATCH 1/2] gnu: liquid-dsp: Remove unused module imports. --]
[-- Type: text/x-patch, Size: 1209 bytes --]

From dc527071eb098130a87f6c9259c0faad5fe88efb Mon Sep 17 00:00:00 2001
From: Evan Straw <evan.straw99@gmail.com>
Date: Wed, 15 Jan 2020 23:06:34 -0800
Subject: [PATCH 1/2] gnu: liquid-dsp: Remove unused module imports.

* gnu/packages/sdr.scm (liquid-dsp): Remove unused module imports.
---
 gnu/packages/sdr.scm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/gnu/packages/sdr.scm b/gnu/packages/sdr.scm
index f6c9050503..563a9b3887 100644
--- a/gnu/packages/sdr.scm
+++ b/gnu/packages/sdr.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Christopher Howard <christopher@librehacker.com>
+;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,11 +20,9 @@
 (define-module (gnu packages sdr)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
-  #:use-module (guix utils)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system gnu)
-  #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages autotools))
 
-- 
2.20.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

[bug#39150] [PATCH 2/2] gnu: Add redsea.

[Evan Straw]

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


Finally, here is the patch for Redsea, which now uses the liquid-dsp
definition in sdr.scm.

-- Evan


[-- Attachment #1.2: [PATCH 2/2] gnu: Add redsea. --]
[-- Type: text/x-patch, Size: 3721 bytes --]

From c7b8d253b5959f7e8b61bd1730249df26f071a29 Mon Sep 17 00:00:00 2001
From: Evan Straw <evan.straw99@gmail.com>
Date: Wed, 15 Jan 2020 23:12:53 -0800
Subject: [PATCH 2/2] gnu: Add redsea.

* gnu/packages/ham-radio.scm (redsea): New variable.
---
 gnu/packages/ham-radio.scm | 51 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ham-radio.scm b/gnu/packages/ham-radio.scm
index 6b3f68cd7d..376191af54 100644
--- a/gnu/packages/ham-radio.scm
+++ b/gnu/packages/ham-radio.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2017, 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
-;;; Copyright © 2019 Evan Straw <evan.straw99@gmail.com>
+;;; Copyright © 2019, 2020 Evan Straw <evan.straw99@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,6 +22,8 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages base)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages libusb)
@@ -29,6 +31,7 @@
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages sdr)
   #:use-module (gnu packages xml)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system gnu)
@@ -127,3 +130,49 @@ satellites, the POES NOAA weather satellite series.  These transmissions are
 on a frequency of 137 MHz.  They can be received using an inexpensive antenna
 and a dedicated receiver.")
     (license license:gpl2+)))
+
+(define-public redsea
+  (package
+    (name "redsea")
+    (version "0.18")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/windytan/redsea")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1y96g0ra2krjb2kypm8s5gdfia45yci4f36klsvyzg8d53v5cwhn"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; The configure.ac file does not explicitly link against libiconv
+         ;; except on Mac OS, causing the build to fail. This phase comments
+         ;; out the original AC_SUBST macro (located inside a conditional) and
+         ;; adds an explicit use of it underneath, so that libiconv is always
+         ;; linked against.
+         (add-after 'unpack 'patch-libiconv
+           (lambda _
+             (substitute* "configure.ac"
+               (("^ +AC_SUBST")
+                "# AC_SUBST")
+               (("esac")
+                "esac\nAC_SUBST([ICONV], [\"-liconv\"])"))
+             #t)))))
+    (inputs
+     `(("libiconv" ,libiconv)
+       ("libsndfile" ,libsndfile)
+       ("liquid-dsp" ,liquid-dsp)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)))
+    (home-page "https://github.com/windytan/redsea")
+    (synopsis "Lightweight RDS to JSON decoder")
+    (description "redsea is a lightweight command-line @dfn{FM Radio Data
+System} (FM-RDS) decoder.  Redsea can be used with any RTL-SDR USB radio stick
+with the rtl_fm tool, or any other @dfn{software-defined radio} (SDR) via
+csdr, for example.  It can also decode raw ASCII bitstream, the hex format
+used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
+    (license license:expat)))
-- 
2.20.1


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

bug#39150: [PATCH 0/2] Add redsea, minor changes to liquid-dsp

[Ludovic Courtès]

Hi Evan,

Evan Straw <evan.straw99@gmail.com> skribis:

> This is a new patch series for the same packages submitted in my earlier bug
> (38842). Some things changed since the last patch series and so I decided to
> submit a different, modified patch series that includes only the changes that
> are relevant now to avoid confusion when applying the patches.
>
> Evan Straw (2):
>   gnu: liquid-dsp: Remove unused module imports.
>   gnu: Add redsea.

Applied both patches, thank you!

Ludo’.