diff options
author | nia <nia@pkgsrc.org> | 2021-03-09 08:14:00 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2021-03-09 08:14:00 +0000 |
commit | 77546cd56d426e6705928a429061f8c5463c18c0 (patch) | |
tree | fbad9b7d5640237f8494cd03b8f16208decbd08a /ham | |
parent | d3e4a3651e7501a6c7fef8b6c82c6b1b85639753 (diff) | |
download | pkgsrc-77546cd56d426e6705928a429061f8c5463c18c0.tar.gz |
grig: Fix build. Patches from Debian.
Diffstat (limited to 'ham')
-rw-r--r-- | ham/grig/distinfo | 5 | ||||
-rw-r--r-- | ham/grig/patches/patch-src_rig-daemon-check.c | 26 | ||||
-rw-r--r-- | ham/grig/patches/patch-src_rig-daemon.c | 44 | ||||
-rw-r--r-- | ham/grig/patches/patch-src_rig-data.h | 27 |
4 files changed, 101 insertions, 1 deletions
diff --git a/ham/grig/distinfo b/ham/grig/distinfo index 39135ecc894..35517d9c5b8 100644 --- a/ham/grig/distinfo +++ b/ham/grig/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.10 2016/07/14 12:11:56 mef Exp $ +$NetBSD: distinfo,v 1.11 2021/03/09 08:14:00 nia Exp $ SHA1 (grig-0.8.1.tar.gz) = 6c93486c3d9fd692a4ce70a8274f57ef51238c4f RMD160 (grig-0.8.1.tar.gz) = 01deadaea1ae2e6ed3e27ada07ad4557039ddf8c SHA512 (grig-0.8.1.tar.gz) = 84eda8db5d18324f26f0775483c8272296aad05dd75f0572c01a3c7af6dbd14bff7b98cc6a61fe3c43d25193866be4b3dafdc4e68dfc37217e88b53ca53266f9 Size (grig-0.8.1.tar.gz) = 621728 bytes +SHA1 (patch-src_rig-daemon-check.c) = 04c958c5a9fe5dfcd6db931e0de96f017201a053 +SHA1 (patch-src_rig-daemon.c) = e70633aad4468c3302f2abedf8d92ab27f17f823 +SHA1 (patch-src_rig-data.h) = cb2acfb5fdaa2bda4cc8674ee5977bcb003912ac diff --git a/ham/grig/patches/patch-src_rig-daemon-check.c b/ham/grig/patches/patch-src_rig-daemon-check.c new file mode 100644 index 00000000000..e551d672a01 --- /dev/null +++ b/ham/grig/patches/patch-src_rig-daemon-check.c @@ -0,0 +1,26 @@ +$NetBSD: patch-src_rig-daemon-check.c,v 1.1 2021/03/09 08:14:01 nia Exp $ + +Description: align affected parts for Hamlib4.0 +Author: Ervin Hegedus <airween@gmail.com> +From Debian: +https://sources.debian.org/data/main/g/grig/0.8.1-3/debian/patches/04-hamlib-align.patch + +--- src/rig-daemon-check.c.orig 2010-05-11 19:42:34.000000000 +0000 ++++ src/rig-daemon-check.c +@@ -398,12 +398,12 @@ rig_daemon_check_mode (RIG + */ + if (!found_mode && + ((mode & myrig->state.rx_range_list[i].modes) == mode) && +- (get->freq1 >= myrig->state.rx_range_list[i].start) && +- (get->freq1 <= myrig->state.rx_range_list[i].end)) { ++ (get->freq1 >= myrig->state.rx_range_list[i].startf) && ++ (get->freq1 <= myrig->state.rx_range_list[i].endf)) { + + found_mode = 1; +- get->fmin = myrig->state.rx_range_list[i].start; +- get->fmax = myrig->state.rx_range_list[i].end; ++ get->fmin = myrig->state.rx_range_list[i].startf; ++ get->fmax = myrig->state.rx_range_list[i].endf; + + grig_debug_local (RIG_DEBUG_VERBOSE, + _("%s: Found frequency range for mode %d"), diff --git a/ham/grig/patches/patch-src_rig-daemon.c b/ham/grig/patches/patch-src_rig-daemon.c new file mode 100644 index 00000000000..04b10dff356 --- /dev/null +++ b/ham/grig/patches/patch-src_rig-daemon.c @@ -0,0 +1,44 @@ +$NetBSD: patch-src_rig-daemon.c,v 1.1 2021/03/09 08:14:01 nia Exp $ + +Description: align affected parts for Hamlib4.0 +Author: Ervin Hegedus <airween@gmail.com> +From Debian: +https://sources.debian.org/data/main/g/grig/0.8.1-3/debian/patches/04-hamlib-align.patch + +--- src/rig-daemon.c.orig 2015-12-19 15:14:27.000000000 +0000 ++++ src/rig-daemon.c +@@ -1674,12 +1674,12 @@ rig_daemon_exec_cmd (rig_cmd_t c + is the current frequency within this range? + */ + if (((mode & myrig->state.rx_range_list[i].modes) == mode) && +- (get->freq1 >= myrig->state.rx_range_list[i].start) && +- (get->freq1 <= myrig->state.rx_range_list[i].end)) { ++ (get->freq1 >= myrig->state.rx_range_list[i].startf) && ++ (get->freq1 <= myrig->state.rx_range_list[i].endf)) { + + found_mode = 1; +- get->fmin = myrig->state.rx_range_list[i].start; +- get->fmax = myrig->state.rx_range_list[i].end; ++ get->fmin = myrig->state.rx_range_list[i].startf; ++ get->fmax = myrig->state.rx_range_list[i].endf; + + grig_debug_local (RIG_DEBUG_VERBOSE, + _("%s: Found frequency range for mode %d"), +@@ -2971,7 +2971,7 @@ rig_daemon_exec_cmd (rig_cmd_t c + val.i = set->voxdel; + + /* try to execute command */ +- retcode = rig_set_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOX, val); ++ retcode = rig_set_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOXDELAY, val); + + /* raise anomaly if execution did not succeed */ + if (retcode != RIG_OK) { +@@ -2996,7 +2996,7 @@ rig_daemon_exec_cmd (rig_cmd_t c + value_t val; + + /* try to execute command */ +- retcode = rig_get_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOX, &val); ++ retcode = rig_get_level (myrig, RIG_VFO_CURR, RIG_LEVEL_VOXDELAY, &val); + + /* raise anomaly if execution did not succeed */ + if (retcode != RIG_OK) { diff --git a/ham/grig/patches/patch-src_rig-data.h b/ham/grig/patches/patch-src_rig-data.h new file mode 100644 index 00000000000..ce2d9306678 --- /dev/null +++ b/ham/grig/patches/patch-src_rig-data.h @@ -0,0 +1,27 @@ +$NetBSD: patch-src_rig-data.h,v 1.1 2021/03/09 08:14:01 nia Exp $ + +Description: align affected parts for Hamlib4.0 +Author: Ervin Hegedus <airween@gmail.com> +From Debian: +https://sources.debian.org/data/main/g/grig/0.8.1-3/debian/patches/04-hamlib-align.patch + +--- src/rig-data.h.orig 2008-12-15 01:14:50.000000000 +0000 ++++ src/rig-data.h +@@ -190,7 +190,7 @@ typedef struct { + + #define GRIG_LEVEL_RD (RIG_LEVEL_RFPOWER | RIG_LEVEL_AGC | RIG_LEVEL_SWR | RIG_LEVEL_ALC | \ + RIG_LEVEL_STRENGTH | RIG_LEVEL_ATT | RIG_LEVEL_PREAMP | \ +- RIG_LEVEL_VOX | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \ ++ RIG_LEVEL_VOXDELAY | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \ + RIG_LEVEL_IF | RIG_LEVEL_APF | RIG_LEVEL_NR | RIG_LEVEL_PBT_IN | \ + RIG_LEVEL_PBT_OUT | RIG_LEVEL_CWPITCH | \ + RIG_LEVEL_MICGAIN | RIG_LEVEL_KEYSPD | RIG_LEVEL_NOTCHF | \ +@@ -198,7 +198,7 @@ typedef struct { + RIG_LEVEL_VOXGAIN | RIG_LEVEL_ANTIVOX) + + #define GRIG_LEVEL_WR (RIG_LEVEL_RFPOWER | RIG_LEVEL_AGC | RIG_LEVEL_ATT | RIG_LEVEL_PREAMP | \ +- RIG_LEVEL_VOX | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \ ++ RIG_LEVEL_VOXDELAY | RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_SQL | \ + RIG_LEVEL_IF | RIG_LEVEL_APF | RIG_LEVEL_NR | RIG_LEVEL_PBT_IN | \ + RIG_LEVEL_PBT_OUT | RIG_LEVEL_CWPITCH | \ + RIG_LEVEL_MICGAIN | RIG_LEVEL_KEYSPD | RIG_LEVEL_NOTCHF | \ |