[hamradio-commits] [gr-hpsdr] 04/04: 1.2 upload
Maitland Bottoms
bottoms at moszumanska.debian.org
Mon Sep 4 18:35:15 UTC 2017
This is an automated email from the git hooks/post-receive script.
bottoms pushed a commit to branch debian
in repository gr-hpsdr.
commit a515b96bc4869f1819eb831a1de4da5414aeb024
Author: A. Maitland Bottoms <bottoms at debian.org>
Date: Mon Sep 4 14:30:00 2017 -0400
1.2 upload
---
debian/changelog | 8 +++++
debian/control | 40 ++++++++++++++++------
...hpsdr0.install => libgnuradio-hpsdr1.2.install} | 0
debian/patches/bsd-lacks-linux-ioctls | 38 ++++++++++++++++++++
debian/patches/debian-soname | 2 +-
debian/patches/series | 1 +
debian/watch | 4 +++
7 files changed, 81 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 25aef78..7c4aeaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gr-hpsdr (1.2-1) unstable; urgency=medium
+
+ * New upstream release
+ * build with gnuradio 3.7.11
+ * add watch file
+
+ -- A. Maitland Bottoms <bottoms at debian.org> Mon, 04 Sep 2017 01:11:38 -0400
+
gr-hpsdr (0.0.0.bb77f3c-2) unstable; urgency=medium
* depends upon swig
diff --git a/debian/control b/debian/control
index 0af81ce..a2fb563 100644
--- a/debian/control
+++ b/debian/control
@@ -1,44 +1,62 @@
Source: gr-hpsdr
Section: libdevel
Priority: extra
-Maintainer: A. Maitland Bottoms <bottoms at debian.org>
+Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
+Uploaders: A. Maitland Bottoms <bottoms at debian.org>
Build-Depends: cmake,
debhelper (>= 9.0.0~),
dh-python,
doxygen,
- gnuradio-dev,
+ gnuradio-dev (>= 3.7.11),
libboost-filesystem-dev,
libboost-system-dev,
pkg-config,
python,
python-cheetah,
swig
-Standards-Version: 3.9.6
+Standards-Version: 4.1.0
Homepage: https://github.com/Tom-McDermott/gr-hpsdr
-Vcs-Git: git://anonscm.debian.org/users/bottoms/pkg-gr-hpsdr.git
-Vcs-Browser: http://anonscm.debian.org/cgit/users/bottoms/pkg-gr-hpsdr.git/
+Vcs-Git: git://anonscm.debian.org/pkg-hamradio/gr-hpsdr.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/gr-hpsdr.git/
-Package: libgnuradio-hpsdr0
+Package: libgnuradio-hpsdr1.2
Section: libs
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}, ${shlibs:Depends}
Multi-Arch: same
Recommends: gr-hpsdr
-Description: gnuradio library for HPSDR Hermes / Metis
+Description: gnuradio library for OpenHPSDR protocol 1
+ Hardware supported includes OpenHPSDR Hermes / Metis and Red Pitaya
+ using the OpenHpsdr protocol.
+ .
The modules are compatible with version 3.7 of gnuradio and versions of
- Hermes firmware 1.8 through at least 3.1.
+ Hermes firmware 1.8 through 3.2. (known as OpenHPSDR protocol 1). It
+ is not compatible with the new OpenHPSDR protocol 2.
.
This package contains the shared library.
Package: gr-hpsdr
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: libgnuradio-hpsdr0 (=${binary:Version}),
+Depends: libgnuradio-hpsdr1.2 (=${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Description: gnuradio interface module for HPSDR Hermes / Metis
+Description: gnuradio interface module for OpenHPSDR protocol 1
+ Hardware supported includes OpenHPSDR Hermes / Metis and Red Pitaya
+ using the OpenHpsdr protocol.
+ .
+ hermesNB sources decimated downconverted 48K-to-384K receiver complex
+ stream(s), and sinks one 48k sample rate transmit complex stream.
+ .
+ hermesWB sources raw ADC samples as a vector of floats, with
+ vlen=16384. Each individual vector contains time contiguous
+ samples. However there are large time gaps between vectors. This is
+ how HPSDR produces raw samples, it is due to Ethernet interface rate
+ limitations between HPSDR and the host computer.
+ .
The modules are compatible with version 3.7 of gnuradio and versions of
- Hermes firmware 1.8 through at least 3.1.
+ Hermes firmware 1.8 through at 3.2. (known as OpenHPSDR protocol
+ 1). It is not compatible with the new OpenHPSDR protocol 2.
.
This package contains the header files and grc block definitions.
diff --git a/debian/libgnuradio-hpsdr0.install b/debian/libgnuradio-hpsdr1.2.install
similarity index 100%
rename from debian/libgnuradio-hpsdr0.install
rename to debian/libgnuradio-hpsdr1.2.install
diff --git a/debian/patches/bsd-lacks-linux-ioctls b/debian/patches/bsd-lacks-linux-ioctls
new file mode 100644
index 0000000..6429635
--- /dev/null
+++ b/debian/patches/bsd-lacks-linux-ioctls
@@ -0,0 +1,38 @@
+Description: SIOCGIFHWADDR is not universally available.
+ Do not use it if it not defined.
+Author: A. Maitland Bottoms <bottoms at debian.org>
+
+--- a/lib/metis.cc
++++ b/lib/metis.cc
+@@ -160,6 +160,7 @@
+
+ ip_address=inaddrr(ifr_addr.sa_data).s_addr;
+
++#ifdef SIOCGIFHWADDR
+ if (ioctl(sock, SIOCGIFHWADDR, ifr) < 0) {
+ printf("No %s interface.\n", ifname);
+ return -1;
+@@ -169,7 +170,22 @@
+
+ for(i=0;i<6;i++)
+ hw_address[i]=u[i];
+-
++#else
++ // maybe check if defined(HAVE_GETIFADDRS)
++ ifaddrs* iflist;
++ if (getifaddrs(&iflist) == 0) {
++ for (ifaddrs* cur = iflist; cur; cur = cur->ifa_next) {
++ if ((cur->ifa_addr->sa_family == AF_LINK) &&
++ (strcmp(cur->ifa_name, ifname) == 0) &&
++ cur->ifa_addr) {
++ sockaddr_dl* sdl = (sockaddr_dl*)cur->ifa_addr;
++ memcpy(hw_address, LLADDR(sdl), sdl->sdl_alen);
++ break;
++ }
++ }
++ freeifaddrs(iflist);
++ }
++#endif
+
+ return 0;
+ }
diff --git a/debian/patches/debian-soname b/debian/patches/debian-soname
index bc776c2..ca3e0ef 100644
--- a/debian/patches/debian-soname
+++ b/debian/patches/debian-soname
@@ -8,7 +8,7 @@ Author: A. Maitland Bottoms <bottoms at debian.org>
target_link_libraries(gnuradio-hpsdr ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES})
set_target_properties(gnuradio-hpsdr PROPERTIES DEFINE_SYMBOL "gnuradio_hpsdr_EXPORTS")
+set_target_properties(gnuradio-hpsdr PROPERTIES OUTPUT_NAME gnuradio-hpsdr)
-+set_target_properties(gnuradio-hpsdr PROPERTIES SOVERSION 0 VERSION 0.0.0)
++set_target_properties(gnuradio-hpsdr PROPERTIES SOVERSION 1.2 VERSION 1.2)
########################################################################
# Install built library files
diff --git a/debian/patches/series b/debian/patches/series
index 0b63cb5..25e9b77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
debian-soname
+bsd-lacks-linux-ioctls
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..9c03ef6
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,4 @@
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%gr-hpsdr-$1.tar.gz%" \
+https://github.com/Tom-McDermott/gr-hpsdr/releases \
+(?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gr-hpsdr.git
More information about the pkg-hamradio-commits
mailing list