From patchwork Sun Feb 6 16:22:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 37027 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 C101127BBEA; Sun, 6 Feb 2022 16:24:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED,URI_DOTEDU_ENTITY autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2876F27BBE9 for ; Sun, 6 Feb 2022 16:24:12 +0000 (GMT) Received: from localhost ([::1]:37560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGkKh-00051a-4H for patchwork@mira.cbaines.net; Sun, 06 Feb 2022 11:24:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGkKY-000511-DH for guix-patches@gnu.org; Sun, 06 Feb 2022 11:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGkKY-0004lk-3l for guix-patches@gnu.org; Sun, 06 Feb 2022 11:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGkKY-0004OH-10 for guix-patches@gnu.org; Sun, 06 Feb 2022 11:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53820] [PATCH] gnu: Add jtdx Resent-From: "Sheng Yang" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Feb 2022 16:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53820 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "Maxime Devos" , 53820@debbugs.gnu.org Received: via spool by 53820-submit@debbugs.gnu.org id=B53820.164416460916833 (code B ref 53820); Sun, 06 Feb 2022 16:24:01 +0000 Received: (at 53820) by debbugs.gnu.org; 6 Feb 2022 16:23:29 +0000 Received: from localhost ([127.0.0.1]:39709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGkJx-0004NM-1P for submit@debbugs.gnu.org; Sun, 06 Feb 2022 11:23:29 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:48397) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGkJu-0004N7-QE for 53820@debbugs.gnu.org; Sun, 06 Feb 2022 11:23:23 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 9F17D5C00B0; Sun, 6 Feb 2022 11:23:15 -0500 (EST) Received: from imap48 ([10.202.2.98]) by compute4.internal (MEProxy); Sun, 06 Feb 2022 11:23:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= cc:content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; bh=8jdDHCDMhu+VewYEbyNIXGn+dIpFgmLmg+F0ks hnWwU=; b=ZE18w0/71YMjKsCdaiH09qadv2XWX/9pU3xxna+2+IDe9jZslgxXTq /LWxW7lxsVFokrWA4jXig+ZhTC1TctdUoOm7no6iRoisGJRB97KXUCqGB1yRCdFq jJamJ1+Vt2kCxPnOo+j3/w8Vqkw2ek0xix9gEc3jQf0uH62xx7OdJ9aeAi5QZ9OJ i57e1miUHgnL0xvgO1ziAoGOfZ/lIQpvsqCumiR2tA/ELyePNUaYHaSKtyHqHj3f N4O4E6KXT8B8YhTm6Tt93JIO41OkwtkVqwCb3ymeA6XDj+3QZVfK/abPOsPrPR15 s1HaKAL6oZcEgwa4836zjKtHTuBtTgjw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=8jdDHCDMhu+VewYEb yNIXGn+dIpFgmLmg+F0kshnWwU=; b=aKia4gWxWVeGTwOtjk+eW3oSH3LHt6gnU Hx9Oq3Dqu69QL6oN/XKGagGGT2vlHmk2+LBjEl1HKZSQPCmNbCZR/LfE7iQ+WFWB Iv8oFK3EYZl6kfMD471/fPVcbAHsnstVBIrVBNcWixmXtxiPlOggT1frEyKEd+TI Bugl9rV2xX9Xcps7c3R4pjuJbNAYO2KKOhOcUQJBy6iC67rvi3Mcz7UF0PIRhIi2 jUQa2i2SjjxbLl2IVIgOH3nhtPjYUhTcD/GYC4ORlH4bMFhQeEZ19aX/g2INejil 63fGBtqu3gzPpo1iUbRxEUhHZkpUCYIqylPbG6XyHIe0W5Ej9PTeQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrheefgdekkecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefofgggkfgjfhffhffvufgtsehmtderreerredtnecuhfhrohhmpedfufhhvghn ghcujggrnhhgfdcuoehsthihrghnghesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrg htthgvrhhnpeffvddtueehtefhtedvgeevjedvgedvhfffkedtuddvleehvdffledtgedu leegfeenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivg eptdenucfrrghrrghmpehmrghilhhfrhhomhepshhthigrnhhgsehfrghsthhmrghilhdr tghomh X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 62E3F21E006E; Sun, 6 Feb 2022 11:23:15 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.5.0-alpha0-4586-g104bd556f9-fm-20220203.002-g104bd556 Mime-Version: 1.0 Message-Id: In-Reply-To: <12ff0a43-0756-4941-8713-49343ff23475@www.fastmail.com> References: <8d7a5134-a5c4-44b2-a99c-9ad3b1685075@www.fastmail.com> <24e279ff1f4383c945c00eadba28810030c6e245.camel@telenet.be> <12ff0a43-0756-4941-8713-49343ff23475@www.fastmail.com> Date: Sun, 06 Feb 2022 10:22:52 -0600 From: "Sheng Yang" 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 Patch updated. On Sun, Feb 6, 2022, at 09:20, Sheng Yang wrote: >> Have these patches been submitted upstream? If so, can we >> add a link to a web page tracking upstreaming progress, >> such that we can determine when 'jdtx-hamlib' can be removed >> in favour of 'hamlib'? > I don't think those patches are submitted upstream. I checked diff between jtdx-hamlib's master with commit 954d70c143a9a0293371d8def3a7300ce3ca68c4 , which has quite some differences. I am not a developer of either package, so I cannot tell which one/ones is necessary. As it turns out, the configure options seem a lot different from the official one. The following is in the README of jtdx-hamlib: >> $ ../src/configure --prefix=$HOME/hamlib-prefix >> --disable-shared --enable-static >> --without-cxx-binding --disable-winradio >> CFLAGS="-g -O2 -fdata-sections -ffunction-sections" >> LDFLAGS="-Wl,--gc-sections" > While in hamlib and wsjtx-hamlib, the build configuration is: >> (arguments >> `(#:configure-flags '("--disable-static" >> "--with-lua-binding" >> "--with-python-binding" >> "--with-tcl-binding" >> "--with-xml-support"))) > >> Given that it is a fork, doesn't the home page, synopsis and >> description need to be tweaked? >> >> Why define and not define-public? > I basically followed the existing package wsjtx-hamlib. From 4a57cd007013a8bbade90dceccba4ec85207857f Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Sun, 23 Jan 2022 21:46:27 -0600 Subject: [PATCH] gnu: Add jtdx * gnu/packages/radio.scm (jtdx-hamlib): New variable. (jtdx): New variable. --- gnu/packages/radio.scm | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index e487987738..8e7a0017ad 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 João Pedro Simas ;;; Copyright © 2021 Jack Hill +;;; Copyright © 2022 Sheng Yang ;;; ;;; This file is part of GNU Guix. ;;; @@ -1113,6 +1114,30 @@ (define wsjtx-hamlib "--with-tcl-binding" "--with-xml-support"))))) +(define-public jtdx-hamlib + ;; Fork of hamlib with custom patches used by jtdx. + (package + (inherit hamlib) + (name "jtdx-hamlib") + (version "2.2.158") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jtdx-project/jtdxhamlib.git") + (commit "158"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0m9i5k1n6j0nvmsqcy12x2ngqzjvxxlc3jg29igh93hb7lprlkjv")))) + (native-inputs + (modify-inputs (package-native-inputs hamlib) + (prepend autoconf automake libtool texinfo))) + (arguments + `(#:configure-flags '("--disable-shared" + "--enable-static" + "--without-cxx-binding" + "--disable-winradio"))))) + (define-public tlf (package (name "tlf") @@ -1206,6 +1231,47 @@ (define-public wsjtx (home-page "https://www.physics.princeton.edu/pulsar/k1jt/wsjtx.html") (license license:gpl3))) +(define-public jtdx + (package + (name "jtdx") + (version "2.2.158") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jtdx-project/jtdx") + (commit "158"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lw9q7ggh2jlasipl3v5pkbabysjr6baw15lnmg664ah3fwdrvnx")))) + (build-system qt-build-system) + (native-inputs + (list asciidoc gfortran pkg-config qttools ruby-asciidoctor)) + (inputs + (list + boost + fftw + fftwf + jtdx-hamlib + libusb + qtbase-5 + qtwebsockets + qtmultimedia + qtserialport)) + (arguments + `(#:tests? #f)) ; No test suite + (synopsis "Weak-signal ham radio communication program, forked from WSJTX") + (description + "JTDX means \"JT,T10 and FT8 and FT4 modes for DXing\", it is being +developed with main focus on the sensitivity and decoding efficiency, both, in +overcrowded and half empty HF band conditions. + +It is modified WSJT-X software forked from WSJT-X r6462. JTDX supports JT9, +JT65, T10, FT8 and FT4 © digital modes for HF amateur radio communication, +focused on DXing and being shaped by community of DXers.JTDX") + (home-page "https://www.jtdx.tech/en/") + (license license:gpl3))) + (define-public js8call (package (inherit wsjtx) -- 2.34.1