diff options
author | Diane Bruce <db@FreeBSD.org> | 2022-01-12 01:06:38 +0000 |
---|---|---|
committer | Diane Bruce <db@FreeBSD.org> | 2022-01-12 01:29:47 +0000 |
commit | a9e3fd2a07b1a10441ccd2871ddbac73b5acdc98 (patch) | |
tree | 426f191e81dc99ba0673d3d2cc7f40e17346530c | |
parent | 3ef0580b55cacc092002fc78780503c966837523 (diff) | |
download | ports-a9e3fd2a07b1a10441ccd2871ddbac73b5acdc98.tar.gz ports-a9e3fd2a07b1a10441ccd2871ddbac73b5acdc98.zip |
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
-rw-r--r-- | comms/hamlib/files/patch-include_hamlib_rig.h | 21 | ||||
-rw-r--r-- | comms/hamlib/files/patch-src_misc.c | 21 |
2 files changed, 42 insertions, 0 deletions
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; |