From nobody Wed Jan 12 01:54:27 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 7D3EF194609A; Wed, 12 Jan 2022 01:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JYVx01XtLz4SXt; Wed, 12 Jan 2022 01:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1287D2416C; Wed, 12 Jan 2022 01:54:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20C1sRbD042274; Wed, 12 Jan 2022 01:54:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20C1sR0O042273; Wed, 12 Jan 2022 01:54:27 GMT (envelope-from git) Date: Wed, 12 Jan 2022 01:54:27 GMT Message-Id: <202201120154.20C1sR0O042273@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Diane Bruce Subject: git: a9e3fd2a07b1 - main - comms/hamlib: Update to 4.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: db X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a9e3fd2a07b1a10441ccd2871ddbac73b5acdc98 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641952468; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XvnyW0bDzt4vXDk6+KSyahi+tyzTAGB7HOgmPnaus34=; b=SH5Yrin6t9vywp/a6yiLThVXZjCz5yjQIqJidE/0tvgB4HOdLoFjkDYhgVQKUiNEwTYXA1 lGSpl59W6+ijuSzGodR+P+10VnqkcE5jjrIFKpCaAdd1b6FKWqKkjfKWcmWIp+ezfyKkD7 sdRr9hCsfXzAtDmxgJhMs4jrO7IKFKnkc4J9VFExFP7NzcYCgJxRODSjTMis16WOcASM6G hsvMbSPeQBgJez1B1KmRoW11GPsP5sdodZJ/ZTMamSjtvaDONm/Zt9QdrDsVGjvHrNj7qc kSCQb5U/InSXcGPBD1zJmwMdAZyxhPjttCuVu4Cv0ki6yzfJXrbh6L4MehKurw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641952468; a=rsa-sha256; cv=none; b=YqJn0x+MOeFRxSl82bLsJaYvFrSiKdwgwgnRBUPVpeYxy3G7jWGBtkk7dA8AjWxQ7j6I7K 6hiFRrxES9+P/F9vlssgAbOJKY8RzxjHJqGTfuabQrzg9sjAKQukynXm5bAi9YIqIuwE0M dST6CefV/Hi/+qs99HIPOMe0UUo/bD6p4Kb92ssQeNaSPVbCeBEmaqLnjupZ2WbLF0fXWK L3khnfZe7BnbSn+UdN6Zl8OiegaHKZ7noBtPpIXp0J1ITKs3Ks4ivJ9/KWOii1HZSfnV0C qDCX5DdA7KMqM4pRM66cb4SATF0ntIL9KGmMscgSv3s5q0AjTK/ZHQzRMfmkzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by db: URL: https://cgit.FreeBSD.org/ports/commit/?id=a9e3fd2a07b1a10441ccd2871ddbac73b5acdc98 commit a9e3fd2a07b1a10441ccd2871ddbac73b5acdc98 Author: Diane Bruce AuthorDate: 2022-01-12 01:06:38 +0000 Commit: Diane Bruce CommitDate: 2022-01-12 01:29:47 +0000 comms/hamlib: Update to 4.4 - Some patches not needed now due to adrian@ patches sent upstream. - Additional changes by @takefu The distribution tarball uses patch applied to the following master branch because the build is broken. https://github.com/Hamlib/Hamlib/commit/baea7e8c9a30ddf051cd04deec1b715856e4ed83#diff-9df9e2c313e694cf242534e90c1187fe119fac8de7c304ae438de0736209953b.patch The error message in build is as follows. hamlibpy_wrap.c:48824:80: error: use of undeclared identifier 'RIG_FUNCTION_SEND_VOICE_MEM'; did you mean 'RIG_FUNCTION_SEND_MORSE'? SWIG_Python_SetConstant(d, "RIG_FUNCTION_SEND_VOICE_MEM",SWIG_From_int((int)(RIG_FUNCTION_SEND_VOICE_MEM))); For a complete log of changes to Hamlib, please visit: http://sourceforge.net/p/hamlib/code/commit_browser Major changes in 4.0 affecting usage Most rig model numbers have changed RIG_LEVEL_VOX has been deprecated and replaced by RIG_LEVEL_VOXDELAY rigctl 'f' command now returns VFO argument too rigctl 'y' and 'Y' command now take/show antenna argument and option. range_list items are undergoing changes towards a different model TBD RTS/DTR PTT sharing is off by default now -- use serial_share=1 option to enable PR: ports/261105 Reported by: takefu@airport.gm --- comms/hamlib/files/patch-include_hamlib_rig.h | 21 +++++++++++++++++++++ comms/hamlib/files/patch-src_misc.c | 21 +++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/comms/hamlib/files/patch-include_hamlib_rig.h b/comms/hamlib/files/patch-include_hamlib_rig.h new file mode 100644 index 000000000000..18d835a4fa79 --- /dev/null +++ b/comms/hamlib/files/patch-include_hamlib_rig.h @@ -0,0 +1,21 @@ +--- include/hamlib/rig.h.orig 2021-12-03 00:09:30 UTC ++++ include/hamlib/rig.h +@@ -1124,8 +1124,8 @@ typedef uint64_t setting_t; + #define RIG_FUNC_TRANSCEIVE CONSTANT_64BIT_FLAG (42) /*!< \c TRANSCEIVE -- Send radio state changes automatically ON/OFF */ + #define RIG_FUNC_SPECTRUM CONSTANT_64BIT_FLAG (43) /*!< \c SPECTRUM -- Spectrum scope data output ON/OFF */ + #define RIG_FUNC_SPECTRUM_HOLD CONSTANT_64BIT_FLAG (44) /*!< \c SPECTRUM_HOLD -- Pause spectrum scope updates ON/OFF */ +-#define RIG_FUNC_BIT45 CONSTANT_64BIT_FLAG (45) /*!< \c available for future RIG_FUNC items */ +-#define RIG_FUNC_BIT46 CONSTANT_64BIT_FLAG (46) /*!< \c available for future RIG_FUNC items */ ++#define RIG_FUNC_SEND_MORSE CONSTANT_64BIT_FLAG (45) /*!< \c SEND_MORSE -- Send specified characters using CW */ ++#define RIG_FUNC_SEND_VOICE_MEM CONSTANT_64BIT_FLAG (46) /*!< \c SEND_VOICE_MEM -- Transmit in SSB message stored in memory */ + #define RIG_FUNC_BIT47 CONSTANT_64BIT_FLAG (47) /*!< \c available for future RIG_FUNC items */ + #define RIG_FUNC_BIT48 CONSTANT_64BIT_FLAG (48) /*!< \c available for future RIG_FUNC items */ + #define RIG_FUNC_BIT49 CONSTANT_64BIT_FLAG (49) /*!< \c available for future RIG_FUNC items */ +@@ -2063,6 +2063,7 @@ enum rig_function_e { + RIG_FUNCTION_SEND_MORSE, + RIG_FUNCTION_STOP_MORSE, + RIG_FUNCTION_WAIT_MORSE, ++ RIG_FUNCTION_SEND_VOICE_MEM, + RIG_FUNCTION_SET_BANK, + RIG_FUNCTION_SET_MEM, + RIG_FUNCTION_GET_MEM, diff --git a/comms/hamlib/files/patch-src_misc.c b/comms/hamlib/files/patch-src_misc.c new file mode 100644 index 000000000000..fca84506597d --- /dev/null +++ b/comms/hamlib/files/patch-src_misc.c @@ -0,0 +1,21 @@ +--- src/misc.c.orig 2021-12-03 00:09:30 UTC ++++ src/misc.c +@@ -884,6 +884,8 @@ static const struct + { RIG_LEVEL_SPECTRUM_AVG, "SPECTRUM_AVG" }, + { RIG_LEVEL_SPECTRUM_ATT, "SPECTRUM_ATT" }, + { RIG_LEVEL_TEMP_METER, "TEMP_METER" }, ++ { RIG_FUNC_SEND_MORSE, "SEND_MORSE" }, ++ { RIG_FUNC_SEND_VOICE_MEM, "SEND_VOICE_MEM" }, + { RIG_LEVEL_NONE, "" }, + }; + +@@ -2254,6 +2256,9 @@ void *HAMLIB_API rig_get_function_ptr(rig_model_t rig_ + + case RIG_FUNCTION_WAIT_MORSE: + return caps->wait_morse; ++ ++ case RIG_FUNCTION_SEND_VOICE_MEM: ++ return caps->send_voice_mem; + + case RIG_FUNCTION_SET_BANK: + return caps->set_bank;