From 4d08ff55a5bf2a2d308b3ee8fe52738ff393009a Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 7 Nov 2009 21:04:33 +0000 Subject: [PATCH] rebuild with usrp backend --- hamlib-1.2.10-usrp.patch | 11 +++++++++++ hamlib.spec | 18 ++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 hamlib-1.2.10-usrp.patch diff --git a/hamlib-1.2.10-usrp.patch b/hamlib-1.2.10-usrp.patch new file mode 100644 index 0000000..6638eeb --- /dev/null +++ b/hamlib-1.2.10-usrp.patch @@ -0,0 +1,11 @@ +--- hamlib-1.2.10/kit/usrp_impl.cc 2009-11-03 00:17:44.000000000 +0200 ++++ hamlib-1.2.10-mod/kit/usrp_impl.cc 2009-11-07 19:17:08.000000000 +0200 +@@ -82,7 +82,7 @@ + int which_board = 0; + int decim = 125; + +- priv->urx = usrp_standard_rx::make (which_board, decim, 1, -1, usrp_standard_rx::FPGA_MODE_NORMAL); ++ priv->urx = usrp_standard_rx::make (which_board, decim, 1, -1, usrp_standard_rx::FPGA_MODE_NORMAL).get(); + if (priv->urx == 0) + return -RIG_EIO; + diff --git a/hamlib.spec b/hamlib.spec index 441aa07..979fabb 100644 --- a/hamlib.spec +++ b/hamlib.spec @@ -2,7 +2,7 @@ Name: hamlib Version: 1.2.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Run-time library to control radio transceivers and receivers Group: System Environment/Libraries @@ -11,19 +11,20 @@ URL: http://hamlib.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz #Install python and perl bindings into proper dirs Patch0: hamlib-1.2.10-bindings.patch +Patch1: hamlib-1.2.10-usrp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, swig, gd-devel, libxml2-devel, tcl-devel -BuildRequires: libusb-devel, pkgconfig -BuildRequires: doxygen +BuildRequires: libusb-devel, pkgconfig, boost-devel +BuildRequires: doxygen, gnuradio-devel, usrp-devel #for perl BuildRequires: perl(ExtUtils::MakeMaker) %description -Hamlib provides a standardised programming interface that applications +Hamlib provides a standardised programming interface that applications can use to send the appropriate commands to a radio. - + Also included in the package is a simple radio control program 'rigctl', which lets one control a radio transceiver or receiver, either from command line interface or in a text-oriented interactive interface. @@ -91,6 +92,7 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts. %prep %setup -q %patch0 -p1 +%patch1 -p1 -b .usrp %build %configure \ @@ -98,7 +100,8 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts. --with-rigmatrix \ --enable-tcl-binding \ --with-python-binding \ - --with-perl-binding + --with-perl-binding \ + --with-usrp # Build libs, drivers, and programs, won't build with smpflags make @@ -206,6 +209,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/hamlibtcl* %changelog +* Sat Nov 07 2009 Lucian Langa - 1.2.10-2 +- build with usrp backend + * Sat Nov 07 2009 Lucian Langa - 1.2.10-1 - new upstream release