media-radio/grig: drop 0.8.1-r1

Signed-off-by: Thomas Beierlein <tomjbe@gentoo.org>
This commit is contained in:
Thomas Beierlein
2025-05-05 14:19:56 +02:00
parent 79094ed6f9
commit dd03cb96bb
5 changed files with 0 additions and 342 deletions
-1
View File
@@ -1,2 +1 @@
DIST grig-0.8.1.tar.gz 621728 BLAKE2B 096ac037d3e5871e32bbb80669e2bafdf061c28c420362e26aea9f01f2e399a4cb769e65aa8261b0726444d08006495de13c62ca9d9e094c44fd8cb28b36a3f1 SHA512 84eda8db5d18324f26f0775483c8272296aad05dd75f0572c01a3c7af6dbd14bff7b98cc6a61fe3c43d25193866be4b3dafdc4e68dfc37217e88b53ca53266f9
DIST grig-0.9.0.tar.gz 636750 BLAKE2B 41332da0c1a9f1f938e94ad4624e2614e84829ca36d272566eeac16935de34a0b3d19c67163bda3d7c35b78158d1adb750f247709a8fa4978a45ff1daac0f7b9 SHA512 95ec5be163aaaa405ce4712f445e327fc18a0350e8a827bbed5ef0bbe22f28643e02bf352ab67dbbc4e25a1444f6097b96f31f2aba9069b47173c7450ba5d90a
@@ -1,79 +0,0 @@
Picked up from Debians grig-0.8.1-3
Description: align affected parts for Hamlib4.0
Author: Ervin Hegedus <airween@gmail.com>
--- grig-0.8.1.orig/src/rig-daemon.c
+++ grig-0.8.1/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) {
--- grig-0.8.1.orig/src/rig-daemon-check.c
+++ grig-0.8.1/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"),
--- grig-0.8.1.orig/src/rig-data.h
+++ grig-0.8.1/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 | \
@@ -1,203 +0,0 @@
diff --git a/src/rig-daemon-check.c b/src/rig-daemon-check.c
index 932a84c..07045bd 100644
--- a/src/rig-daemon-check.c
+++ b/src/rig-daemon-check.c
@@ -884,7 +884,7 @@ rig_daemon_check_level (RIG *myrig,
if (has_get->att || has_set->att) {
int i = 0;
- while ((i < MAXDBLSTSIZ) && (myrig->state.attenuator[i] != 0)) {
+ while ((i < HAMLIB_MAXDBLSTSIZ) && (myrig->state.attenuator[i] != 0)) {
rig_data_set_att_data (i, myrig->state.attenuator[i]);
i++;
}
@@ -895,7 +895,7 @@ rig_daemon_check_level (RIG *myrig,
if (has_get->preamp || has_set->preamp) {
int i = 0;
- while ((i < MAXDBLSTSIZ) && (myrig->state.preamp[i] != 0)) {
+ while ((i < HAMLIB_MAXDBLSTSIZ) && (myrig->state.preamp[i] != 0)) {
rig_data_set_preamp_data (i, myrig->state.preamp[i]);
i++;
}
diff --git a/src/rig-daemon.c b/src/rig-daemon.c
index 0070283..c8e0ee5 100644
--- a/src/rig-daemon.c
+++ b/src/rig-daemon.c
@@ -537,7 +537,7 @@ rig_daemon_start (int rigid,
}
/* configure and open rig device */
- strncpy (myrig->state.rigport.pathname, rigport, FILPATHLEN);
+ strncpy (myrig->state.rigport.pathname, rigport, HAMLIB_FILPATHLEN);
g_free (rigport);
/* set speed if any special whishes */
diff --git a/src/rig-data.c b/src/rig-data.c
index cc76268..1858a8d 100644
--- a/src/rig-data.c
+++ b/src/rig-data.c
@@ -64,10 +64,10 @@ grig_cmd_avail_t has_get; /*!< Flags to indicate reading capabilities. */
/** \brief List of attenuator values (absolute values). */
-static int att[MAXDBLSTSIZ];
+static int att[HAMLIB_MAXDBLSTSIZ];
/** \brief List of preamp values. */
-static int preamp[MAXDBLSTSIZ];
+static int preamp[HAMLIB_MAXDBLSTSIZ];
/** \brief Bit field of available VFO's */
static int vfo_list;
@@ -116,7 +116,7 @@ rig_data_set_vfos (int vfos)
void
rig_data_set_att_data (int index, int data)
{
- if ((index >= 0) && (index < MAXDBLSTSIZ))
+ if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ))
att[index] = data;
}
@@ -132,7 +132,7 @@ rig_data_set_att_data (int index, int data)
int
rig_data_get_att_data (int index)
{
- if ((index >= 0) && (index < MAXDBLSTSIZ)) {
+ if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ)) {
return att[index];
}
else {
@@ -158,7 +158,7 @@ rig_data_get_att_index (int data)
return -1;
/* scan through the array */
- while ((i < MAXDBLSTSIZ) && (att[i] != 0)) {
+ while ((i < HAMLIB_MAXDBLSTSIZ) && (att[i] != 0)) {
if (att[i] == data) {
return i;
}
@@ -182,7 +182,7 @@ rig_data_get_att_index (int data)
void
rig_data_set_preamp_data (int index, int data)
{
- if ((index >= 0) && (index < MAXDBLSTSIZ))
+ if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ))
preamp[index] = data;
}
@@ -198,7 +198,7 @@ rig_data_set_preamp_data (int index, int data)
int
rig_data_get_preamp_data (int index)
{
- if ((index >= 0) && (index < MAXDBLSTSIZ)) {
+ if ((index >= 0) && (index < HAMLIB_MAXDBLSTSIZ)) {
return preamp[index];
}
else {
@@ -225,7 +225,7 @@ rig_data_get_preamp_index (int data)
return -1;
/* scan through the array */
- while ((i < MAXDBLSTSIZ) && (preamp[i] != 0)) {
+ while ((i < HAMLIB_MAXDBLSTSIZ) && (preamp[i] != 0)) {
if (preamp[i] == data) {
return i;
}
diff --git a/src/rig-gui-buttons.c b/src/rig-gui-buttons.c
index ae95f4d..6873447 100644
--- a/src/rig-gui-buttons.c
+++ b/src/rig-gui-buttons.c
@@ -283,10 +283,10 @@ rig_gui_buttons_create_att_selector ()
/* add ATT OFF ie. 0 dB */
gtk_combo_box_append_text (GTK_COMBO_BOX (att), _("ATT OFF"));
- /* note: MAXDBLSTSIZ is defined in hamlib; it is the max size of the
+ /* note: HAMLIB_MAXDBLSTSIZ is defined in hamlib; it is the max size of the
ATT and preamp arrays.
*/
- while ((i < MAXDBLSTSIZ) && rig_data_get_att_data (i)) {
+ while ((i < HAMLIB_MAXDBLSTSIZ) && rig_data_get_att_data (i)) {
text = g_strdup_printf ("-%d dB", rig_data_get_att_data (i));
gtk_combo_box_append_text (GTK_COMBO_BOX (att), text);
@@ -343,10 +343,10 @@ rig_gui_buttons_create_preamp_selector ()
/* add ATT OFF ie. 0 dB */
gtk_combo_box_append_text (GTK_COMBO_BOX (preamp), _("PREAMP OFF"));
- /* note: MAXDBLSTSIZ is defined in hamlib; it is the max size of the
+ /* note: HAMLIB_MAXDBLSTSIZ is defined in hamlib; it is the max size of the
ATT and preamp arrays.
*/
- while ((i < MAXDBLSTSIZ) && rig_data_get_preamp_data (i)) {
+ while ((i < HAMLIB_MAXDBLSTSIZ) && rig_data_get_preamp_data (i)) {
text = g_strdup_printf ("%d dB", rig_data_get_preamp_data (i));
gtk_combo_box_append_text (GTK_COMBO_BOX (preamp), text);
diff --git a/src/rig-gui-info.c b/src/rig-gui-info.c
index 53733bf..d73ef2d 100644
--- a/src/rig-gui-info.c
+++ b/src/rig-gui-info.c
@@ -714,7 +714,7 @@ rig_gui_info_create_tunstep_frame ()
/* Create a table with enough rows to show the
max possible number of unique tuning steps.
*/
- table = gtk_table_new (TSLSTSIZ, 2, FALSE);
+ table = gtk_table_new (HAMLIB_TSLSTSIZ, 2, FALSE);
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), _("<b>STEP</b>"));
@@ -746,7 +746,7 @@ rig_gui_info_create_tunstep_frame ()
}
*/
/* for each available tuning ste */
- for (i = 0; i < TSLSTSIZ; i++) {
+ for (i = 0; i < HAMLIB_TSLSTSIZ; i++) {
gboolean firsthit = TRUE; /* indicates whether found mode is the first one
for the current tuning step. */
@@ -757,7 +757,7 @@ rig_gui_info_create_tunstep_frame ()
*/
if (myrig->caps->tuning_steps[i].ts == 0) {
- i = TSLSTSIZ;
+ i = HAMLIB_TSLSTSIZ;
}
/* otherwise continue */
@@ -853,7 +853,7 @@ rig_gui_info_create_frontend_frame ()
text = g_strdup ("");
/* loop over all available preamp values and concatenate them into a label */
- for (i = 0; i < MAXDBLSTSIZ; i++) {
+ for (i = 0; i < HAMLIB_MAXDBLSTSIZ; i++) {
data = rig_data_get_preamp_data (i);
@@ -861,7 +861,7 @@ rig_gui_info_create_frontend_frame ()
reached the terminator
*/
if (data == 0) {
- i = MAXDBLSTSIZ;
+ i = HAMLIB_MAXDBLSTSIZ;
}
else {
if (i > 0) {
@@ -900,7 +900,7 @@ rig_gui_info_create_frontend_frame ()
text = g_strdup ("");
/* loop over all available attenuator values and concatenate them into a label */
- for (i = 0; i < MAXDBLSTSIZ; i++) {
+ for (i = 0; i < HAMLIB_MAXDBLSTSIZ; i++) {
data = rig_data_get_att_data (i);
@@ -908,7 +908,7 @@ rig_gui_info_create_frontend_frame ()
reached the terminator
*/
if (data == 0) {
- i = MAXDBLSTSIZ;
+ i = HAMLIB_MAXDBLSTSIZ;
}
else {
if (i > 0) {
@@ -1,17 +0,0 @@
Hamlib 4.5 dropped rig_get_split macro
see Bug 883773
diff --git a/src/rig-daemon.c b/src/rig-daemon.c
index ddd922f..1a86a5e 100644
--- a/src/rig-daemon.c
+++ b/src/rig-daemon.c
@@ -2283,7 +2283,8 @@ rig_daemon_exec_cmd (rig_cmd_t cmd,
case RIG_CMD_GET_SPLIT:
if (has_get->split) {
- retcode = rig_get_split (myrig, RIG_VFO_RX, &get->split);
+ vfo_t tx_vfo;
+ retcode = rig_get_split_vfo (myrig, RIG_VFO_RX, &get->split, &tx_vfo);
/* raise anomaly if execution did not succeed */
if (retcode != RIG_OK) {
-42
View File
@@ -1,42 +0,0 @@
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit desktop
DESCRIPTION="A tool for controlling amateur radios"
HOMEPAGE="http://groundstation.sourceforge.net/grig/"
SRC_URI="https://downloads.sourceforge.net/groundstation/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
DEPEND="
dev-libs/glib:2
x11-libs/gtk+:2
>=media-libs/hamlib-4:="
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}"/grig-0.8.1-hamlib4.patch
"${FILESDIR}"/grig-0.8.1-hamlib45.patch
"${FILESDIR}"/grig-0.8.1-hamlib46.patch )
src_prepare() {
# prepare for media-radio/hamlib-4.2 change of API
if has_version '>=media-libs/hamlib-4.2' ; then
eapply -p1 "${FILESDIR}"/${P}-hamlib42.patch
fi
default
}
src_configure() {
econf --enable-hardware
}
src_install() {
default
make_desktop_entry ${PN} "GRig" "/usr/share/pixmaps/grig/grig-logo.png" "HamRadio"
rm -rf "${ED}/usr/share/grig" || die "cleanup docs failed"
}