diff --git a/1e6bce288f284fba4db4ab376dbbd0edcaa065f3.patch b/1e6bce288f284fba4db4ab376dbbd0edcaa065f3.patch new file mode 100644 index 0000000..bd7b47d --- /dev/null +++ b/1e6bce288f284fba4db4ab376dbbd0edcaa065f3.patch @@ -0,0 +1,54 @@ +From 1e6bce288f284fba4db4ab376dbbd0edcaa065f3 Mon Sep 17 00:00:00 2001 +From: Michael Black W9MDB +Date: Thu, 24 Dec 2020 23:15:42 -0600 +Subject: [PATCH] Add C4FM mode to flrig.c + https://github.com/Hamlib/Hamlib/issues/478 + +--- + rigs/dummy/flrig.c | 5 ++++- + rigs/dummy/flrig.h | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c +index 5dc4f823..b4df56df 100644 +--- a/rigs/dummy/flrig.c ++++ b/rigs/dummy/flrig.c +@@ -55,7 +55,8 @@ + RIG_MODE_RTTY | RIG_MODE_RTTYR |\ + RIG_MODE_PKTLSB | RIG_MODE_PKTUSB |\ + RIG_MODE_SSB | RIG_MODE_LSB | RIG_MODE_USB |\ +- RIG_MODE_FM | RIG_MODE_WFM | RIG_MODE_FMN |RIG_MODE_PKTFM ) ++ RIG_MODE_FM | RIG_MODE_WFM | RIG_MODE_FMN | RIG_MODE_PKTFM |\ ++ RIG_MODE_C4FM) + + #define FLRIG_LEVELS (RIG_LEVEL_AF | RIG_LEVEL_RF | RIG_LEVEL_MICGAIN | RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER_METER | RIG_LEVEL_RFPOWER_METER_WATTS) + +@@ -207,6 +208,7 @@ static struct s_modeMap modeMap[] = + {RIG_MODE_CWR, NULL}, + {RIG_MODE_RTTY, NULL}, + {RIG_MODE_RTTYR, NULL}, ++ {RIG_MODE_C4FM, NULL}, + {0, NULL} + }; + +@@ -906,6 +908,7 @@ static int flrig_open(RIG *rig) + else if (streq(p, "W-FM")) { modeMapAdd(&modes, RIG_MODE_WFM, p); } + else if (streq(p, "WFM")) { modeMapAdd(&modes, RIG_MODE_WFM, p); } + else if (streq(p, "UCW")) { modeMapAdd(&modes, RIG_MODE_CW, p); } ++ else if (streq(p, "C4FM")) { modeMapAdd(&modes, RIG_MODE_C4FM, p); } + else { rig_debug(RIG_DEBUG_ERR, "%s: Unknown mode (new?) for this rig='%s'\n", __func__, p); } + } + +diff --git a/rigs/dummy/flrig.h b/rigs/dummy/flrig.h +index ad0e0f74..b46ceeb7 100644 +--- a/rigs/dummy/flrig.h ++++ b/rigs/dummy/flrig.h +@@ -28,7 +28,7 @@ + #include + #endif + +-#define BACKEND_VER "20201217" ++#define BACKEND_VER "20201224" + + #define EOM "\r" + #define TRUE 1 diff --git a/hamlib.spec b/hamlib.spec index ae9a797..4c956e2 100644 --- a/hamlib.spec +++ b/hamlib.spec @@ -27,6 +27,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. Patch0: hamlib-4.0-perl_install.patch # -lpython is not needed, https://github.com/Hamlib/Hamlib/issues/253 Patch1: hamlib-4.0-drop-libpython.patch +# Patch for flrig advertising C4FM mode not currently understood by hamlib +Patch2: https://github.com/Hamlib/Hamlib/commit/1e6bce288f284fba4db4ab376dbbd0edcaa065f3.patch BuildRequires: automake autoconf libtool @@ -44,7 +46,7 @@ BuildRequires: libtool-ltdl-devel BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: perl(ExtUtils::MakeMaker) -BuildRequires: make +BuildRequires: make # Filter provides from private libraries. %{?perl_default_filter} @@ -131,7 +133,7 @@ export PYTHON=%{__python2} %endif # Only run if we're working with a git checkout -%if 0%{?githash}1 +%if 0%{?githash} autoreconf -fi %endif