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>master
parent
65c46e79e0
commit
083809229b
|
@ -6,6 +6,7 @@
|
||||||
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
|
;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org>
|
||||||
;;; Copyright © 2020 Charlie Ritter <chewzerita@posteo.net>
|
;;; Copyright © 2020 Charlie Ritter <chewzerita@posteo.net>
|
||||||
;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; 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.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -67,6 +68,7 @@
|
||||||
#:use-module (gnu packages qt)
|
#:use-module (gnu packages qt)
|
||||||
#:use-module (gnu packages readline)
|
#:use-module (gnu packages readline)
|
||||||
#:use-module (gnu packages ruby)
|
#:use-module (gnu packages ruby)
|
||||||
|
#:use-module (gnu packages sdl)
|
||||||
#:use-module (gnu packages sphinx)
|
#:use-module (gnu packages sphinx)
|
||||||
#:use-module (gnu packages swig)
|
#:use-module (gnu packages swig)
|
||||||
#:use-module (gnu packages tcl)
|
#:use-module (gnu packages tcl)
|
||||||
|
@ -286,32 +288,26 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
|
||||||
(define-public gnuradio
|
(define-public gnuradio
|
||||||
(package
|
(package
|
||||||
(name "gnuradio")
|
(name "gnuradio")
|
||||||
(version "3.8.0.0")
|
(version "3.9.0.0")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "https://www.gnuradio.org/releases/gnuradio/"
|
(uri (string-append "https://www.gnuradio.org/releases/gnuradio/"
|
||||||
"gnuradio-" version ".tar.xz"))
|
"gnuradio-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "0aw55gf5549b0fz2qdi7vplcmaf92bj34h40s34b2ycnqasv900r"))
|
(base32 "1jvm9xd0l2pz1fww4zii6hl7ccnvy256nrf70ljb594n7j9j49ha"))))
|
||||||
(modules '((guix build utils)))
|
|
||||||
(snippet
|
|
||||||
'(begin
|
|
||||||
;; Delete bundled volk to use the shared one.
|
|
||||||
(delete-file-recursively "volk")
|
|
||||||
#t))))
|
|
||||||
(build-system cmake-build-system)
|
(build-system cmake-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("doxygen" ,doxygen)
|
`(("doxygen" ,doxygen)
|
||||||
("ghostscript" ,ghostscript)
|
("ghostscript" ,ghostscript)
|
||||||
("orc" ,orc)
|
("orc" ,orc)
|
||||||
("pkg-config" ,pkg-config)
|
("pkg-config" ,pkg-config)
|
||||||
|
("pybind11" ,pybind11)
|
||||||
("python-cheetah" ,python-cheetah)
|
("python-cheetah" ,python-cheetah)
|
||||||
("python-mako" ,python-mako)
|
("python-mako" ,python-mako)
|
||||||
("python-pyzmq" ,python-pyzmq)
|
("python-pyzmq" ,python-pyzmq)
|
||||||
("python-scipy" ,python-scipy)
|
("python-scipy" ,python-scipy)
|
||||||
("python-sphinx" ,python-sphinx)
|
("python-sphinx" ,python-sphinx)
|
||||||
("swig" ,swig)
|
|
||||||
("texlive" ,(texlive-union (list texlive-amsfonts
|
("texlive" ,(texlive-union (list texlive-amsfonts
|
||||||
texlive-latex-amsmath
|
texlive-latex-amsmath
|
||||||
;; TODO: Add newunicodechar.
|
;; TODO: Add newunicodechar.
|
||||||
|
@ -343,6 +339,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
|
||||||
("python-pyyaml" ,python-pyyaml)
|
("python-pyyaml" ,python-pyyaml)
|
||||||
("qtbase" ,qtbase)
|
("qtbase" ,qtbase)
|
||||||
("qwt" ,qwt)
|
("qwt" ,qwt)
|
||||||
|
("sdl" ,sdl)
|
||||||
("volk" ,volk)
|
("volk" ,volk)
|
||||||
("zeromq" ,zeromq)))
|
("zeromq" ,zeromq)))
|
||||||
(arguments
|
(arguments
|
||||||
|
@ -354,8 +351,6 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
|
||||||
#:imported-modules (,@%cmake-build-system-modules
|
#:imported-modules (,@%cmake-build-system-modules
|
||||||
(guix build glib-or-gtk-build-system)
|
(guix build glib-or-gtk-build-system)
|
||||||
(guix build python-build-system))
|
(guix build python-build-system))
|
||||||
#:configure-flags
|
|
||||||
'("-DENABLE_INTERNAL_VOLK=OFF")
|
|
||||||
#:phases
|
#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
(add-after 'unpack 'fix-paths
|
(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"
|
(substitute* "cmake/Modules/GrPython.cmake"
|
||||||
(("dist-packages")
|
(("dist-packages")
|
||||||
"site-packages"))
|
"site-packages"))
|
||||||
(substitute* '("gr-vocoder/swig/vocoder_swig.i"
|
(substitute* '("gr-vocoder/include/gnuradio/vocoder/codec2.h"
|
||||||
"gr-vocoder/include/gnuradio/vocoder/codec2.h"
|
|
||||||
"gr-vocoder/include/gnuradio/vocoder/freedv_api.h")
|
"gr-vocoder/include/gnuradio/vocoder/freedv_api.h")
|
||||||
(("<codec2/")
|
(("<codec2/")
|
||||||
"<"))
|
"<"))
|
||||||
|
@ -384,6 +378,19 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).")
|
||||||
"/bin/Xvfb :1 &"))
|
"/bin/Xvfb :1 &"))
|
||||||
(setenv "DISPLAY" ":1")
|
(setenv "DISPLAY" ":1")
|
||||||
#t))
|
#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
|
(add-after 'install 'wrap-python
|
||||||
(assoc-ref python:%standard-phases 'wrap))
|
(assoc-ref python:%standard-phases 'wrap))
|
||||||
(add-after 'wrap-python 'wrap-glib-or-gtk
|
(add-after 'wrap-python 'wrap-glib-or-gtk
|
||||||
|
|
Reference in New Issue