From patchwork Sun Mar 21 22:40:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 28003 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BA55627BC59; Sun, 21 Mar 2021 22:41:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E519C27BC58 for ; Sun, 21 Mar 2021 22:41:25 +0000 (GMT) Received: from localhost ([::1]:56122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lO6lB-0007Ue-19 for patchwork@mira.cbaines.net; Sun, 21 Mar 2021 18:41:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lO6ko-0007Tb-0d for guix-patches@gnu.org; Sun, 21 Mar 2021 18:41:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44068) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lO6kn-0002sp-P3 for guix-patches@gnu.org; Sun, 21 Mar 2021 18:41:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lO6kn-0003rl-Mb for guix-patches@gnu.org; Sun, 21 Mar 2021 18:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#46842] [PATCH] gnu: gnuradio: Updated to 3.9.0.0. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Mar 2021 22:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46842 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: =?utf-8?b?Sm/Do28=?= Pedro Simas Cc: 46842@debbugs.gnu.org Received: via spool by 46842-submit@debbugs.gnu.org id=B46842.161636642814809 (code B ref 46842); Sun, 21 Mar 2021 22:41:01 +0000 Received: (at 46842) by debbugs.gnu.org; 21 Mar 2021 22:40:28 +0000 Received: from localhost ([127.0.0.1]:55614 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lO6kF-0003qm-Ik for submit@debbugs.gnu.org; Sun, 21 Mar 2021 18:40:28 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lO6kD-0003qZ-0t for 46842@debbugs.gnu.org; Sun, 21 Mar 2021 18:40:25 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:45324) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lO6k7-0002cO-9w; Sun, 21 Mar 2021 18:40:19 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=39354 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lO6k5-0006Zv-TS; Sun, 21 Mar 2021 18:40:19 -0400 From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <20210301035622.9778-1-jpsimas@gmail.com> <87eegyrhjz.fsf@gnu.org> <87lfatwd9k.fsf_-_@gnu.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 1 Germinal an 229 de la =?utf-8?q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Sun, 21 Mar 2021 23:40:14 +0100 In-Reply-To: (" =?utf-8?b?Sm/Do28=?= Pedro Simas"'s message of "Fri, 12 Mar 2021 23:53:01 +0000") Message-ID: <878s6g167l.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, João Pedro Simas skribis: > Hi, > Sorry, this took a bit more time than I expected, but now I think I've > figured it out. > > About the bundled copy of volk, it was removed in this commit > https://github.com/gnuradio/gnuradio/commit/80c04479da962d048d41165081b026aafdaa0316, > that is included in 3.9.0.0. I've also removed the: >> '("-DENABLE_INTERNAL_VOLK=OFF") > configure-flag because the env var is not used anymore in gnuradio. OK. > I've also added the urls of the issues concerning the tests, but, in the > end, I found that one of the tests (qa_dtv) was failing due to sdl not > being included as an input and there, so I've included it, and that there's > another test that fails, but intermittently (qa_packet_headerparser_b) so I > disabled it in addition to the original one (qa_header_payload_demux). > > I also realized I had forgotten to add a change to the patch file related > to the lines that patch the references to codec2 inside a swig file that > was removed in 3.9, because swig was replaced with pybind11. I've added > that too. > > Finally, I wrote the changelog in the commit log. The updated patch file is > attached. The patch LGTM but I got this one ‘qa_dtv’ test failure on x86_64: --8<---------------cut here---------------start------------->8--- 222/241 Test #226: qa_cvsd_vocoder .............................. Passed 1.18 sec Start 230: qa_ulaw_vocoder 223/241 Test #228: qa_g723_24_vocoder ........................... Passed 0.93 sec Start 231: qa_codec2_vocoder 224/241 Test #218: qa_dtv .......................................***Failed 3.73 sec F ====================================================================== FAIL: test_000 (__main__.test_dtv) ---------------------------------------------------------------------- Traceback (most recent call last): File "/tmp/guix-build-gnuradio-3.9.0.0.drv-0/gnuradio-3.9.0.0/gr-dtv/python/dtv/qa_dtv.py", line 171, in test_000 self.assertFloatTuplesAlmostEqual(out_data, expected_data, 5) File "/tmp/guix-build-gnuradio-3.9.0.0.drv-0/gnuradio-3.9.0.0/gnuradio-runtime/python/gnuradio/gr_unittest.py", line 96, in assertFloatTuplesAlmostEqual return all([ File "/tmp/guix-build-gnuradio-3.9.0.0.drv-0/gnuradio-3.9.0.0/gnuradio-runtime/python/gnuradio/gr_unittest.py", line 97, in self.assertAlmostEqual(x, y, places, msg) AssertionError: -0.0002739299 != -0.0011434406 within 5 places (0.0008695107 difference) ---------------------------------------------------------------------- Ran 1 test in 2.559s FAILED (failures=1) --8<---------------cut here---------------end--------------->8--- Does that ring a bell? Attached is a variant of the patch where I adjusted indentation to follow our conventions. BTW, please send patches as attachments in the future (this one had been mangled on its way). Thanks, Ludo’. PS: Please keep the bug Cc’d. From 069a988e65e28764b3cbab137aa7b1a90464d69f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o?= Date: Fri, 12 Mar 2021 19:42:02 -0300 Subject: [PATCH] gnu: gnuradio: Update to 3.9.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/radio.scm (gnuradio): Update to 3.9.0.0. - Replace swig with pybind11. - Remove sections related to removing/deleting the included copy of volk, as it is not included anymore. - Add sdl as an input to prevent the test "qa_dtv" from failing. - Disable broken tests. Signed-off-by: Ludovic Courtès --- gnu/packages/radio.scm | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 3378b36adb..df63ff6868 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -67,6 +67,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 +287,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 +338,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 +350,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 +365,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") (("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 -- 2.31.0