[hamradio-commits] [soapyrtlsdr] 01/05: Imported Upstream version 0.2.2
Andreas E. Bombe
aeb at moszumanska.debian.org
Sun Sep 11 23:31:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
aeb pushed a commit to branch master
in repository soapyrtlsdr.
commit dcac7e51cfa46cfc79b46d4dd7c66212be41bebe
Author: Andreas Bombe <aeb at debian.org>
Date: Mon Sep 12 00:41:33 2016 +0200
Imported Upstream version 0.2.2
---
Changelog.txt | 6 ++++++
Streaming.cpp | 23 +++++++++++------------
debian/changelog | 6 ++++++
debian/control | 29 +++++++++++++++++++++--------
debian/rules | 5 -----
debian/soapysdr0.5-2-module-rtlsdr.install | 1 +
6 files changed, 45 insertions(+), 25 deletions(-)
diff --git a/Changelog.txt b/Changelog.txt
index 8e481e0..4daf2de 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,9 @@
+Release 0.2.2 (2016-09-01)
+==========================
+
+- Update debian files for SoapySDR module ABI format
+- Fix build failure on all big endian architectures
+
Release 0.2.1 (2016-04-25)
==========================
diff --git a/Streaming.cpp b/Streaming.cpp
index 18f0306..134a218 100644
--- a/Streaming.cpp
+++ b/Streaming.cpp
@@ -174,10 +174,17 @@ SoapySDR::Stream *SoapyRTLSDR::setupStream(
for (unsigned int i = 0; i <= 0xffff; i++)
{
# if (__BYTE_ORDER == __LITTLE_ENDIAN)
+ float re = ((i & 0xff) - 127.4f) * (1.0f / 128.0f);
+ float im = ((i >> 8) - 127.4f) * (1.0f / 128.0f);
+#else
+ float re = ((i >> 8) - 127.4f) * (1.0f / 128.0f);
+ float im = ((i & 0xff) - 127.4f) * (1.0f / 128.0f);
+#endif
+
std::complex<float> v32f, vs32f;
- v32f.real((float(i & 0xff) - 127.4f) * (1.0f / 128.0f));
- v32f.imag((float(i >> 8) - 127.4f) * (1.0f / 128.0f));
+ v32f.real(re);
+ v32f.imag(im);
_lut_32f.push_back(v32f);
vs32f.real(v32f.imag());
@@ -186,21 +193,13 @@ SoapySDR::Stream *SoapyRTLSDR::setupStream(
std::complex<int16_t> v16i, vs16i;
- v16i.real(int16_t((float(SHRT_MAX) * ((float(i & 0xff) - 127.4f) * (1.0f / 128.0f)))));
- v16i.imag(int16_t((float(SHRT_MAX) * ((float(i >> 8) - 127.4f) * (1.0f / 128.0f)))));
+ v16i.real(int16_t((float(SHRT_MAX) * re)));
+ v16i.imag(int16_t((float(SHRT_MAX) * im)));
_lut_16i.push_back(v16i);
vs16i.real(vs16i.imag());
vs16i.imag(vs16i.real());
_lut_swap_16i.push_back(vs16i);
-
-#else // BIG_ENDIAN
-#error TODO
- // tmp_swap.imag = tmp.real = (float(i >> 8) - 127.4f) * (1.0f/128.0f);
- // tmp_swap.real = tmp.imag = (float(i & 0xff) - 127.4f) * (1.0f/128.0f);
- // _lut.push_back(tmp);
- // _lut_swap.push_back(tmp_swap);
-#endif
}
}
diff --git a/debian/changelog b/debian/changelog
index 52761de..553e101 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+soapyrtlsdr (0.2.2) unstable; urgency=low
+
+ * Release 0.2.2 (2016-09-01)
+
+ -- Josh Blum <josh at pothosware.com> Thu, 01 Sep 2016 21:23:34 -0700
+
soapyrtlsdr (0.2.1) unstable; urgency=low
* Release 0.2.1 (2016-04-25)
diff --git a/debian/control b/debian/control
index 2d51eff..37f5f68 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: soapyrtlsdr
-Section: libs
+Section: hamradio
Priority: optional
Maintainer: Charles J. Cliffe <cj at cubicproductions.com>
Uploaders: Josh Blum <josh at pothosware.com>
@@ -8,16 +8,29 @@ Build-Depends:
cmake,
libsoapysdr-dev,
librtlsdr-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.8
Homepage: https://github.com/pothosware/SoapyRTLSDR/wiki
Vcs-Git: https://github.com/pothosware/SoapyRTLSDR.git
Vcs-Browser: https://github.com/pothosware/SoapyRTLSDR
-Package: soapysdr-rtlsdr
-Section: libs
+Package: soapysdr0.5-2-module-rtlsdr
Architecture: any
-Conflicts: soapyosmo-rtlsdr
-Replaces: soapyosmo-rtlsdr
+Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Soapy RTL-SDR - RTL-SDR device support for Soapy SDR.
- A Soapy module that supports RTL-SDR devices within the Soapy API.
+Description: RTL-SDR device support for SoapySDR
+ The Soapy RTL-SDR project provides a SoapySDR hardware support module.
+ Using this, any program using SoapySDR to interface to software
+ defined radio hardware can make use of low cost DVB-T/DAB+ USB dongles
+ based on the Realtek RTL2832U chip as receivers.
+
+Package: soapysdr-module-rtlsdr
+Architecture: all
+Depends: soapysdr0.5-2-module-rtlsdr, ${misc:Depends}
+Description: RTL-SDR device support for SoapySDR (default version)
+ The Soapy RTL-SDR project provides a SoapySDR hardware support module.
+ Using this, any program using SoapySDR to interface to software
+ defined radio hardware can make use of low cost DVB-T/DAB+ USB dongles
+ based on the Realtek RTL2832U chip as receivers.
+ .
+ This is an empty dependency package that pulls in the RTL-SDR module
+ for the default version of libsoapysdr.
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index f7d5e49..de8f7cc
--- a/debian/rules
+++ b/debian/rules
@@ -2,15 +2,10 @@
# -*- makefile -*-
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-export DEB_HOST_MULTIARCH
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-
%:
dh $@ --buildsystem=cmake --parallel
diff --git a/debian/soapysdr0.5-2-module-rtlsdr.install b/debian/soapysdr0.5-2-module-rtlsdr.install
new file mode 100644
index 0000000..f1d0181
--- /dev/null
+++ b/debian/soapysdr0.5-2-module-rtlsdr.install
@@ -0,0 +1 @@
+usr/lib/*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/soapyrtlsdr.git
More information about the pkg-hamradio-commits
mailing list