From cec97b2e8d6fcba18c29338afa9829ca6b882006 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Tue, 19 Jul 2022 13:35:52 +0100
Subject: [PATCH 1/3] Externals: Update rtlsdr to latest version

---
 external/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 7096a0b02..d57c89977 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -21,7 +21,7 @@ set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028)
 set(MIRISDR_TAG "v2.0.0")
 
 set(PTHREADS4W_TAG "Version-2-11-0-release")
-set(RTLSDR_TAG be1d1206bfb6e6c41f7d91b20b77e20f929fa6a7)
+set(RTLSDR_TAG 5e73f90f1d85d8db2e583f3dbf1cff052d71d59b)
 set(RTLSDR_UDEV OFF)
 set(SOAPYSDR_TAG "soapy-sdr-0.7.1")
 set(SOAPYSDR_SDRPLAY_TAG "soapy-sdrplay-0.2.0")
@@ -1036,7 +1036,7 @@ if (LINUX)
                 PREFIX "${EXTERNAL_BUILD_LIBRARIES}/rtlsdr"
                 CMAKE_ARGS ${COMMON_CMAKE_ARGS} -DDETACH_KERNEL_DRIVER=ON -DINSTALL_UDEV_RULES=${RTLSDR_UDEV}
                 BUILD_BYPRODUCTS "${LIBRTLSDR_LIBRARIES}"
-                BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> -- rtlsdr_shared
+                BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> -- rtlsdr
                 INSTALL_COMMAND ""
                 TEST_COMMAND ""
                 )
@@ -1077,11 +1077,11 @@ if (WIN32 OR APPLE)
                 CMAKE_ARGS ${COMMON_CMAKE_ARGS}
                 -DINSTALL_UDEV_RULES=${RTLSDR_UDEV}
                 -DLIBUSB_LIBRARIES=${LIBUSB_LIBRARIES}
-                -DLIBUSB_INCLUDE_DIR=${RTLSDR_LIBUSB_INCLUDE}
+                -DCMAKE_C_FLAGS=-I${RTLSDR_LIBUSB_INCLUDE}
                 -DTHREADS_PTHREADS_INCLUDE_DIR=${PTHREADS4W_INCLUDE_DIR}
                 -DTHREADS_PTHREADS_WIN32_LIBRARY=${PTHREADS4W_LIBRARIES}
                 BUILD_BYPRODUCTS "${LIBRTLSDR_LIBRARIES}"
-                BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> -- rtlsdr_shared
+                BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> -- rtlsdr
                 INSTALL_COMMAND ""
                 TEST_COMMAND ""
                 )

From 94a2132475b15170bc84f2d5e8455d3462c5cedf Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Tue, 19 Jul 2022 14:25:02 +0100
Subject: [PATCH 2/3] Try to fix windows build

---
 external/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index d57c89977..f3f5cd6d9 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -1077,7 +1077,7 @@ if (WIN32 OR APPLE)
                 CMAKE_ARGS ${COMMON_CMAKE_ARGS}
                 -DINSTALL_UDEV_RULES=${RTLSDR_UDEV}
                 -DLIBUSB_LIBRARIES=${LIBUSB_LIBRARIES}
-                -DCMAKE_C_FLAGS=-I${RTLSDR_LIBUSB_INCLUDE}
+                -DLIBUSB_INCLUDE_DIRS=${RTLSDR_LIBUSB_INCLUDE}
                 -DTHREADS_PTHREADS_INCLUDE_DIR=${PTHREADS4W_INCLUDE_DIR}
                 -DTHREADS_PTHREADS_WIN32_LIBRARY=${PTHREADS4W_LIBRARIES}
                 BUILD_BYPRODUCTS "${LIBRTLSDR_LIBRARIES}"

From c44ead4e1131f6594cc53c27a6b047be85c67df4 Mon Sep 17 00:00:00 2001
From: Jon Beniston <jon@beniston.com>
Date: Tue, 19 Jul 2022 15:17:09 +0100
Subject: [PATCH 3/3] Disable pkg-config when building rtlsdr library, so that
 LIBUSB_INCLUDE_DIRS is used

---
 external/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index f3f5cd6d9..a2785a77a 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -1067,6 +1067,8 @@ if (WIN32 OR APPLE)
         if (WIN32)
             set(LIBRTLSDR_LIBRARIES "${SDRANGEL_BINARY_LIB_DIR}/rtlsdr.lib" CACHE INTERNAL "")
             set(RTLSDR_LIBUSB_INCLUDE "${LIBUSB_INCLUDE_DIR}/libusb-1.0")
+            # Disable pkg-config to allow LIBUSB_INCLUDE_DIRS to be used
+            set(DISABLE_PKGCONFIG "-DCMAKE_DISABLE_FIND_PACKAGE_PkgConfig=ON")
         endif ()
         # needs pkgconfig and libusb
         ExternalProject_Add(rtlsdr
@@ -1080,6 +1082,7 @@ if (WIN32 OR APPLE)
                 -DLIBUSB_INCLUDE_DIRS=${RTLSDR_LIBUSB_INCLUDE}
                 -DTHREADS_PTHREADS_INCLUDE_DIR=${PTHREADS4W_INCLUDE_DIR}
                 -DTHREADS_PTHREADS_WIN32_LIBRARY=${PTHREADS4W_LIBRARIES}
+                ${DISABLE_PKGCONFIG}
                 BUILD_BYPRODUCTS "${LIBRTLSDR_LIBRARIES}"
                 BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> -- rtlsdr
                 INSTALL_COMMAND ""