Debian build: moved librtlsdr to external dependenciesv4.12.4

5 files changed, 29 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 569cc68d5..1d0a7bf4a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+sdrangel (4.12.4-1) unstable; urgency=medium
+
+  * Debian build: moved librtlsdr to external libraries
+
+ -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Tue, 17 Dec 2019 19:14:22 +0100
+
 sdrangel (4.12.3-1) unstable; urgency=medium
 
   * Added possibility to specify devices that cannot be discovered automatically
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5294b619..f965b7a93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 # configure version
 set(sdrangel_VERSION_MAJOR "4")
 set(sdrangel_VERSION_MINOR "12")
-set(sdrangel_VERSION_PATCH "3")
+set(sdrangel_VERSION_PATCH "4")
 set(sdrangel_VERSION_SUFFIX "")
 
 # SDRAngel cmake options
diff --git a/debian/changelog b/debian/changelog
index dcca21566..1eca1dc3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sdrangel (4.12.4-1) unstable; urgency=medium
+
+  * Debian build: moved librtlsdr to external libraries
+
+ -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Tue, 17 Dec 2019 19:14:22 +0100
+
 sdrangel (4.12.3-1) unstable; urgency=medium
 
   * Added possibility to specify devices that cannot be discovered automatically
diff --git a/debian/control b/debian/control
index cc746301e..3cca73993 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,7 @@ Build-Depends: debhelper (>= 9),
  libavformat-dev,
  libopus-dev,
  libairspy-dev,
- libhackrf-dev,
- librtlsdr-dev
+ libhackrf-dev
 # TODO:
 #   - more dependencies based on version; newer has more devices
 #   - manage dependencies not present upstream
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 8fdcaaecd..ce14eb7a7 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -20,7 +20,7 @@ set(AIRSPYHF_TAG "1.1.5")
 set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028)
 
 set(PTHREADS4W_TAG "Version-2-11-0-release")
-set(RTLSDR_TAG f68bb2fa772ad94f58c59babd78353667570630b)
+set(RTLSDR_TAG be1d1206bfb6e6c41f7d91b20b77e20f929fa6a7)
 set(RTLSDR_UDEV OFF)
 set(SOAPYSDR_TAG "soapy-sdr-0.7.1")
 set(SOAPYSDR_SDRPLAY_TAG "soapy-sdrplay-0.2.0")
@@ -368,6 +368,20 @@ if (LINUX)
     set(LIBPERSEUS_FOUND ON CACHE INTERNAL "")
     set(LIBPERSEUS_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/perseus/src/perseus" CACHE INTERNAL "")
     set(LIBPERSEUS_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/libperseus-sdr.so" CACHE INTERNAL "")
+
+    # apt install librtlsdr-dev
+    # needs pkgconfig and libusb
+    ExternalProject_Add(rtlsdr
+        GIT_REPOSITORY https://github.com/osmocom/rtl-sdr.git
+        GIT_TAG ${RTLSDR_TAG}
+        PREFIX "${EXTERNAL_BUILD_LIBRARIES}/rtlsdr"
+        CMAKE_ARGS ${DEFAULT_OUTPUT_DIRECTORIES} -DINSTALL_UDEV_RULES=${RTLSDR_UDEV}
+        INSTALL_COMMAND ""
+        TEST_COMMAND ""
+    )
+    set(LIBRTLSDR_FOUND ON CACHE INTERNAL "")
+    set(LIBRTLSDR_INCLUDE_DIR "${EXTERNAL_BUILD_LIBRARIES}/rtlsdr/src/rtlsdr/include" CACHE INTERNAL "")
+    set(LIBRTLSDR_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib/librtlsdr.so" CACHE INTERNAL "")
 endif(LINUX)
 
 if(WIN32 OR APPLE)