[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: gnu: gnuradio: Update to 3.9.0.0.
From: |
guix-commits |
Subject: |
01/05: gnu: gnuradio: Update to 3.9.0.0. |
Date: |
Wed, 24 Mar 2021 07:03:55 -0400 (EDT) |
glv pushed a commit to branch master
in repository guix.
commit 083809229bf199399c33b072056be77dbfd75555
Author: João Pedro Simas <jpsimas@gmail.com>
AuthorDate: Fri Mar 12 19:42:02 2021 -0300
gnu: gnuradio: Update to 3.9.0.0.
* gnu/packages/radio.scm (gnuradio): Update to 3.9.0.0.
[source]: Remove snippet deleting the included copy of volk,
as it is not included anymore.
[native-inputs]: Replace swig with pybind11.
[inputs]: Add sdl (for dtv).
[arguments]: Remove 'configure-flags". Disable broken tests.
Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
---
gnu/packages/radio.scm | 33 ++++++++++++++++++++-------------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 3378b36..233af9c 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -6,6 +6,7 @@
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2020 Charlie Ritter <chewzerita@posteo.net>
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2021 João Pedro Simas <jpsimas@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -67,6 +68,7 @@
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
#:use-module (gnu packages ruby)
+ #:use-module (gnu packages sdl)
#:use-module (gnu packages sphinx)
#:use-module (gnu packages swig)
#:use-module (gnu packages tcl)
@@ -286,32 +288,26 @@ used by RDS Spy, and audio files containing
@dfn{multiplex} signals (MPX).")
(define-public gnuradio
(package
(name "gnuradio")
- (version "3.8.0.0")
+ (version "3.9.0.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.gnuradio.org/releases/gnuradio/"
"gnuradio-" version ".tar.xz"))
(sha256
- (base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- ;; Delete bundled volk to use the shared one.
- (delete-file-recursively "volk")
- #t))))
+ (base32 "1jvm9xd0l2pz1fww4zii6hl7ccnvy256nrf70ljb594n7j9j49ha"))))
(build-system cmake-build-system)
(native-inputs
`(("doxygen" ,doxygen)
("ghostscript" ,ghostscript)
("orc" ,orc)
("pkg-config" ,pkg-config)
+ ("pybind11" ,pybind11)
("python-cheetah" ,python-cheetah)
("python-mako" ,python-mako)
("python-pyzmq" ,python-pyzmq)
("python-scipy" ,python-scipy)
("python-sphinx" ,python-sphinx)
- ("swig" ,swig)
("texlive" ,(texlive-union (list texlive-amsfonts
texlive-latex-amsmath
;; TODO: Add newunicodechar.
@@ -343,6 +339,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex}
signals (MPX).")
("python-pyyaml" ,python-pyyaml)
("qtbase" ,qtbase)
("qwt" ,qwt)
+ ("sdl" ,sdl)
("volk" ,volk)
("zeromq" ,zeromq)))
(arguments
@@ -354,8 +351,6 @@ used by RDS Spy, and audio files containing @dfn{multiplex}
signals (MPX).")
#:imported-modules (,@%cmake-build-system-modules
(guix build glib-or-gtk-build-system)
(guix build python-build-system))
- #:configure-flags
- '("-DENABLE_INTERNAL_VOLK=OFF")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
@@ -371,8 +366,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex}
signals (MPX).")
(substitute* "cmake/Modules/GrPython.cmake"
(("dist-packages")
"site-packages"))
- (substitute* '("gr-vocoder/swig/vocoder_swig.i"
- "gr-vocoder/include/gnuradio/vocoder/codec2.h"
+ (substitute* '("gr-vocoder/include/gnuradio/vocoder/codec2.h"
"gr-vocoder/include/gnuradio/vocoder/freedv_api.h")
(("<codec2/")
"<"))
@@ -384,6 +378,19 @@ used by RDS Spy, and audio files containing
@dfn{multiplex} signals (MPX).")
"/bin/Xvfb :1 &"))
(setenv "DISPLAY" ":1")
#t))
+ (replace 'check
+ (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
+ (invoke "ctest" "-j" (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")
+ "--output-on-failure"
+ ;;disable broken tests
+ "-E" (string-join
+ '(;;
https://github.com/gnuradio/gnuradio/issues/3871
+ "qa_header_payload_demux"
+ ;;
https://github.com/gnuradio/gnuradio/issues/4348
+ "qa_packet_headerparser_b")
+ "|"))))
(add-after 'install 'wrap-python
(assoc-ref python:%standard-phases 'wrap))
(add-after 'wrap-python 'wrap-glib-or-gtk