[hamradio-commits] [soapysdr] 01/11: New upstream version 0.5.4
Andreas E. Bombe
aeb at moszumanska.debian.org
Fri Jan 6 18:57:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
aeb pushed a commit to branch master
in repository soapysdr.
commit 03229b621d0b772a8d370398f7e2a2b4c12a7017
Author: Andreas Bombe <aeb at debian.org>
Date: Fri Jan 6 17:42:35 2017 +0100
New upstream version 0.5.4
---
CMakeLists.txt | 15 +++++++---
Changelog.txt | 8 ++++++
apps/CMakeLists.txt | 3 ++
apps/SoapySDRUtil.1 | 54 +++++++++++++++++++++++++++++++++++
debian/changelog | 6 ++++
debian/control | 74 +++++++++++++++++++++++++++++++++++-------------
debian/rules | 8 ++----
debian/soapysdr.manpages | 1 +
lib/Modules.in.cpp | 8 +++++-
9 files changed, 146 insertions(+), 31 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f22ee2f..3f06553 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ enable_testing()
# gather version information
# packagers may specify -DSOAPY_SDR_EXTVER="foo" to replace the git hash
########################################################################
-set(SOAPY_SDR_LIBVER "0.5.3")
+set(SOAPY_SDR_LIBVER "0.5.4")
if (NOT SOAPY_SDR_EXTVER)
include(${PROJECT_SOURCE_DIR}/cmake/GetGitRevisionDescription.cmake)
@@ -28,9 +28,16 @@ set(SOAPY_SDR_VERSION "${SOAPY_SDR_LIBVER}-${SOAPY_SDR_EXTVER}")
#SOAPY_SDR_ROOT is compiled into the library to locate the install base.
#By default, the SOAPY_SDR_ROOT is set to the CMAKE_INSTALL_PREFIX.
#However users may overload this by specifying -DSOAPY_SDR_ROOT=<path>.
-if(NOT SOAPY_SDR_ROOT)
- file(TO_CMAKE_PATH ${CMAKE_INSTALL_PREFIX} SOAPY_SDR_ROOT)
-endif(NOT SOAPY_SDR_ROOT)
+set(SOAPY_SDR_ROOT "${CMAKE_INSTALL_PREFIX}" CACHE PATH
+ "Installation root for SoapySDR::getRootPath()")
+file(TO_CMAKE_PATH "${SOAPY_SDR_ROOT}" SOAPY_SDR_ROOT)
+
+#SOAPY_SDR_ROOT_ENV is the name of the environment variable
+#which tells SoapySDR where to find the root installation.
+#By default, the environment variable SOAPY_SDR_ROOT is used.
+#Example: set -DSOAPY_SDR_ROOT_ENV=SNAP for snappy packages.
+set(SOAPY_SDR_ROOT_ENV "SOAPY_SDR_ROOT" CACHE STRING
+ "Environment variable for SoapySDR::getRootPath()")
########################################################################
# select the release build type by default to get optimization flags
diff --git a/Changelog.txt b/Changelog.txt
index 1d895cf..dc7cddd 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,13 @@
This this the changelog file for the SoapySDR project.
+Release 0.5.4 (2016-11-29)
+==========================
+
+- Added man page for SoapySDRUtil executable
+- Dynamic root environment variable to support snappy packages
+- Windows: disable graphical error pop-ups when DLLs are not found
+- Debian: replaced recommends with soapysdr-modules-all metapackage
+
Release 0.5.3 (2016-09-01)
==========================
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 7706a55..124eca1 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -12,3 +12,6 @@ endif ()
add_executable(SoapySDRUtil ${SOAPY_SDR_UTIL_SOURCES})
target_link_libraries(SoapySDRUtil SoapySDR)
install(TARGETS SoapySDRUtil DESTINATION bin)
+
+#install man pages for the application executable
+install(FILES SoapySDRUtil.1 DESTINATION share/man/man1)
diff --git a/apps/SoapySDRUtil.1 b/apps/SoapySDRUtil.1
new file mode 100644
index 0000000..77a1a34
--- /dev/null
+++ b/apps/SoapySDRUtil.1
@@ -0,0 +1,54 @@
+.\" SoapySDRUtil.1 - manpage for SoapySDRUtil
+.\"
+.\"
+.TH SOAPYSDRUTIL 1 2016\-10\-28 "SoapySDR 0.5.4"
+.SH NAME
+\fBSoapySDRUtil\fR \- query and change module information of SoapySDR
+.\" ----------------------------------------------------------------------------
+.SH SYNOPSIS
+\fBSoapySDRUtil\fR [\fIOPTIONS\fR]
+.\" ----------------------------------------------------------------------------
+.SH DESCRIPTION
+SoapySDRUtil is a command line application that provides basic
+diagnostic utility for SoapySDR by printing installation information,
+available modules, discovered devices, and tests on instantiated devices.
+.\" ----------------------------------------------------------------------------
+.SH OPTIONS
+.TP
+\fB\-\-info\fR
+Print general information on the library, list all found hardware support
+modules and available factories.
+.TP
+\fB\-\-find\fR[="\fISPEC\fR"]
+Discover available devices, restricted to those matching the \fISPEC\fR if
+given.
+If no matching devices are found it will exit with exit status 1.
+.TP
+\fB\-\-make\fR[="\fISPEC\fR"]
+Open and close device matching \fISPEC\fR if possible.
+If \fISPEC\fR is not given, the first discovered device is opened.
+.TP
+\fB\-\-probe\fR[="\fISPEC\fR"]
+Show detailed information on all devices or the devices matching \fISPEC\fR if
+given.
+.TP
+\fB\-\-check\fR=\fINAME\fR
+Check and print if driver module named \fINAME\fR is present.
+If it is not found it will exit with exit status 1.
+.\" ----------------------------------------------------------------------------
+.SH HOMEPAGE
+SoapySDRUtil is part of the
+.UR https://github.com/pothosware/SoapySDR/wiki
+SoapySDR project
+.UE .
+.\" ----------------------------------------------------------------------------
+.SH AUTHORS
+The SoapySDR library, including SoapySDRUtil, was written mostly by
+.MT josh at pothosware.com
+Josh Blum
+.ME .
+.\"
+.\"This man page was originally written for the Debian project by
+.\".MT aeb at debian.org
+.\"Andreas Bombe
+.\".ME .
diff --git a/debian/changelog b/debian/changelog
index cbddbe0..34cb1a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+soapysdr (0.5.4-ppa1) unstable; urgency=low
+
+ * Release 0.5.4 (2016-11-29)
+
+ -- Josh Blum <josh at pothosware.com> Tue, 29 Nov 2016 15:12:11 -0500
+
soapysdr (0.5.3) unstable; urgency=low
* Release 0.5.3 (2016-09-01)
diff --git a/debian/control b/debian/control
index 377e45b..ddd69a9 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends:
python-dev,
python3,
python3-dev
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Homepage: https://github.com/pothosware/SoapySDR/wiki
Vcs-Git: https://github.com/pothosware/SoapySDR.git
Vcs-Browser: https://github.com/pothosware/SoapySDR
@@ -21,8 +21,12 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Soapy SDR - shared library
- Vendor and platform neutral SDR support library.
+Description: software defined radio interface library
+ SoapySDR is a library providing a common interface to SDR (software
+ defined radio) hardware. Support for different hardware is added through
+ external modules.
+ .
+ This package contains the shared library.
Package: libsoapysdr-dev
Section: libdevel
@@ -30,25 +34,26 @@ Architecture: any
Depends:
libsoapysdr0.5-2 (= ${binary:Version}),
${misc:Depends}
-Description: Soapy SDR - development files
- Vendor and platform neutral SDR support library.
+Description: SoapySDR library development files
+ SoapySDR is a library providing a common interface to SDR (software
+ defined radio) hardware. Support for different hardware is added through
+ external modules.
+ .
+ This package contains the development files for the library.
Package: soapysdr
-Section: comm
Architecture: any
-Recommends:
- soapysdr-remote,
- soapysdr-rtlsdr,
- soapysdr-hackrf,
- soapysdr-bladerf,
- soapysdr-uhd,
- soapysdr-osmo
Depends:
libsoapysdr0.5-2 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
-Description: Soapy SDR - runtime application
- Vendor and platform neutral SDR support library.
+Description: software defined radio interface library tools
+ SoapySDR is a library providing a common interface to SDR (software
+ defined radio) hardware. Support for different hardware is added through
+ external modules.
+ .
+ This package contains the SoapySDRUtil command line utility which can
+ list available modules and hardware.
Package: python-soapysdr
Section: python
@@ -59,8 +64,12 @@ Depends:
${shlibs:Depends},
${misc:Depends}
Recommends: python-numpy
-Description: Soapy SDR - python bindings
- Vendor and platform neutral SDR support library.
+Description: SoapySDR Python 2 bindings
+ SoapySDR is a library providing a common interface to SDR (software
+ defined radio) hardware. Support for different hardware is added through
+ external modules.
+ .
+ This package contains the Python 2 bindings for the library.
Package: python3-soapysdr
Section: python
@@ -70,6 +79,31 @@ Depends:
python3,
${shlibs:Depends},
${misc:Depends}
-Recommends: python-numpy
-Description: Soapy SDR - python3 bindings
- Vendor and platform neutral SDR support library.
+Recommends: python3-numpy
+Description: SoapySDR Python 3 bindings
+ SoapySDR is a library providing a common interface to SDR (software
+ defined radio) hardware. Support for different hardware is added through
+ external modules.
+ .
+ This package contains the Python 3 bindings for the library.
+
+Package: soapysdr-modules-all
+Architecture: all
+Depends:
+ soapysdr-module-airspy,
+ soapysdr-module-bladerf,
+ soapysdr-module-hackrf,
+ soapysdr-module-redpitaya,
+ soapysdr-module-remote,
+ soapysdr-module-rtlsdr,
+ soapysdr-module-rfspace,
+ soapysdr-module-osmosdr,
+ soapysdr-module-mirisdr,
+ soapysdr-module-uhd,
+ ${misc:Depends}
+Description: software defined radio hardware support modules
+ SoapySDR is a library providing a common interface to SDR (software
+ defined radio) hardware. Support for different hardware is added through
+ external modules.
+ .
+ This is a metapackage for several common hardware support modules.
diff --git a/debian/rules b/debian/rules
index 54955ab..197b73b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,15 +5,11 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
# extract the last section of the changelog version for extra info
-DEB_VERSION_EXTVER ?= $(shell dpkg-parsechangelog | grep ^Version: | rev | cut -d'-' -f1 | rev)
+DEB_VERSION ?= $(shell dpkg-parsechangelog -S Version)
# 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
@@ -21,7 +17,7 @@ override_dh_auto_configure:
dh_auto_configure -- \
-DCMAKE_AUTOSET_INSTALL_RPATH=FALSE \
-DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \
- -DSOAPY_SDR_EXTVER="$(DEB_VERSION_EXTVER)"
+ -DSOAPY_SDR_EXTVER="$(DEB_VERSION)"
override_dh_installchangelogs:
dh_installchangelogs Changelog.txt
diff --git a/debian/soapysdr.manpages b/debian/soapysdr.manpages
new file mode 100644
index 0000000..2a6901f
--- /dev/null
+++ b/debian/soapysdr.manpages
@@ -0,0 +1 @@
+apps/SoapySDRUtil.1
diff --git a/lib/Modules.in.cpp b/lib/Modules.in.cpp
index 12a0a8a..a03f101 100644
--- a/lib/Modules.in.cpp
+++ b/lib/Modules.in.cpp
@@ -39,7 +39,7 @@ std::string getEnvImpl(const char *name)
std::string SoapySDR::getRootPath(void)
{
- const std::string rootPathEnv = getEnvImpl("SOAPY_SDR_ROOT");
+ const std::string rootPathEnv = getEnvImpl("@SOAPY_SDR_ROOT_ENV@");
if (not rootPathEnv.empty()) return rootPathEnv;
// Get the path to the current dynamic linked library.
@@ -216,7 +216,13 @@ std::string SoapySDR::loadModule(const std::string &path)
//load the module
#ifdef _MSC_VER
+
+ //SetThreadErrorMode() - disable error pop-ups when DLLs are not found
+ DWORD oldMode;
+ SetThreadErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX, &oldMode);
HMODULE handle = LoadLibrary(path.c_str());
+ SetThreadErrorMode(oldMode, nullptr);
+
getModuleLoading().clear();
if (handle == NULL) return "LoadLibrary() failed: " + GetLastErrorMessage();
#else
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/soapysdr.git
More information about the pkg-hamradio-commits
mailing list