Update Windows cross-build to rtlsdr-2.0.2 (closes #3349)

Author: zuckschwerdt

.ci/scripts/do_sysroot.sh

@@ -2,8 +2,8 @@
 
 set -e
 
-libusb_ver=1.0.25
-rtlsdr_ver=0.6.0
+libusb_ver=1.0.29
+rtlsdr_ver=2.0.2
 pothos_ver=2021.07.25-vc16
 
 [ "$(uname)" = "Darwin" ] && export tools=/opt/local
@@ -15,7 +15,7 @@ sed=$(command -v gsed || :)
 sed="${sed:-sed}"
 
 # from https://libusb.info/
-if [ ! -e libusb/include/libusb-1.0/libusb.h ]
+if [ ! -e libusb/include/libusb.h ]
 then
     [ -e libusb-${libusb_ver}.7z ] || curl -L -O https://github.com/libusb/libusb/releases/download/v${libusb_ver}/libusb-${libusb_ver}.7z
     mkdir -p libusb
@@ -31,23 +31,23 @@ sysroot64static=$(pwd)/sysroot64static
 
 mkdir -p sysroot{32,64}{,static}/usr/{include,lib,bin}
 
-cp libusb/include/libusb-1.0/libusb.h $sysroot32/usr/include
-cp libusb/include/libusb-1.0/libusb.h $sysroot64/usr/include
-cp libusb/include/libusb-1.0/libusb.h $sysroot32static/usr/include
-cp libusb/include/libusb-1.0/libusb.h $sysroot64static/usr/include
+cp libusb/include/libusb.h $sysroot32/usr/include
+cp libusb/include/libusb.h $sysroot64/usr/include
+cp libusb/include/libusb.h $sysroot32static/usr/include
+cp libusb/include/libusb.h $sysroot64static/usr/include
 
 cp libusb/MinGW32/static/libusb-1.0.a $sysroot32static/usr/lib
 cp libusb/MinGW64/static/libusb-1.0.a $sysroot64static/usr/lib
 
 cp libusb/MinGW32/dll/libusb-1.0.dll $sysroot32/usr/bin
-cp libusb/MinGW32/dll/libusb-1.0.dll.a $sysroot32/usr/lib
+cp libusb/MinGW32/static/libusb-1.0.dll.a $sysroot32/usr/lib
 cp libusb/MinGW64/dll/libusb-1.0.dll $sysroot64/usr/bin
-cp libusb/MinGW64/dll/libusb-1.0.dll.a $sysroot64/usr/lib
+cp libusb/MinGW64/static/libusb-1.0.dll.a $sysroot64/usr/lib
 
 if [ ! -d rtl-sdr-${rtlsdr_ver} ]
 then
     # or git clone https://github.com/osmocom/rtl-sdr.git
-    [ -e rtl-sdr-${rtlsdr_ver}.tar.gz ] || curl -L -o rtl-sdr-${rtlsdr_ver}.tar.gz https://github.com/osmocom/rtl-sdr/archive/${rtlsdr_ver}.tar.gz
+    [ -e rtl-sdr-${rtlsdr_ver}.tar.gz ] || curl -L -o rtl-sdr-${rtlsdr_ver}.tar.gz https://github.com/osmocom/rtl-sdr/archive/v${rtlsdr_ver}.tar.gz
     tar xzf rtl-sdr-${rtlsdr_ver}.tar.gz
 fi
 
@@ -56,15 +56,22 @@ cd rtl-sdr-${rtlsdr_ver}
 if [ ! -e $sysroot32/usr/lib/librtlsdr.a ]
 then
     export CMAKE_SYSROOT=$sysroot32 ; echo $CMAKE_SYSROOT
-    mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake .. && make && make install ; cd ..
+    cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake \
+        -DLIBUSB_LIBRARIES=$sysroot32/usr/lib/libusb-1.0.dll.a \
+        -DLIBUSB_INCLUDE_DIRS=$sysroot32/usr/include \
+        -B build-tmp && cmake --build build-tmp && cmake --install build-tmp
     rm -rf build-tmp
     mv $sysroot32/usr/lib/librtlsdr_static.a $sysroot32/usr/lib/librtlsdr.a
 fi
 
 if [ ! -e $sysroot32static/usr/lib/librtlsdr.a ]
 then
     export CMAKE_SYSROOT=$sysroot32static ; echo $CMAKE_SYSROOT
-    mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake -DBUILD_SHARED_LIBS:BOOL=OFF .. && make && make install ; cd ..
+    cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake \
+        -DLIBUSB_LIBRARIES=$sysroot32static/usr/lib/libusb-1.0.a \
+        -DLIBUSB_INCLUDE_DIRS=$sysroot32static/usr/include \
+        -DBUILD_SHARED_LIBS:BOOL=OFF \
+        -B build-tmp && cmake --build build-tmp && cmake --install build-tmp
     rm -rf build-tmp
     mv $sysroot32static/usr/lib/librtlsdr_static.a $sysroot32static/usr/lib/librtlsdr.a
     rm $sysroot32static/usr/lib/librtlsdr.dll.a
@@ -74,15 +81,22 @@ fi
 if [ ! -e $sysroot64/usr/lib/librtlsdr.a ]
 then
     export CMAKE_SYSROOT=$sysroot64 ; echo $CMAKE_SYSROOT
-    mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake .. && make && make install ; cd ..
+    cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake \
+        -DLIBUSB_LIBRARIES=$sysroot64/usr/lib/libusb-1.0.dll.a \
+        -DLIBUSB_INCLUDE_DIRS=$sysroot64/usr/include \
+        -B build-tmp && cmake --build build-tmp && cmake --install build-tmp
     rm -rf build-tmp
     mv $sysroot64/usr/lib/librtlsdr_static.a $sysroot64/usr/lib/librtlsdr.a
 fi
 
 if [ ! -e $sysroot64static/usr/lib/librtlsdr.a ]
 then
     export CMAKE_SYSROOT=$sysroot64static ; echo $CMAKE_SYSROOT
-    mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake -DBUILD_SHARED_LIBS:BOOL=OFF .. && make && make install ; cd ..
+    cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake \
+        -DLIBUSB_LIBRARIES=$sysroot64static/usr/lib/libusb-1.0.a \
+        -DLIBUSB_INCLUDE_DIRS=$sysroot64static/usr/include \
+        -DBUILD_SHARED_LIBS:BOOL=OFF \
+        -B build-tmp && cmake --build build-tmp && cmake --install build-tmp
     rm -rf build-tmp
     mv $sysroot64static/usr/lib/librtlsdr_static.a $sysroot64static/usr/lib/librtlsdr.a
     rm $sysroot64static/usr/lib/librtlsdr.dll.a
@@ -109,7 +123,7 @@ fi
 # build rtl_433
 
 export CMAKE_SYSROOT=$sysroot32 ; echo $CMAKE_SYSROOT
-mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake $source_dir && make && make install ; cd ..
+cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake -S $source_dir -B build-tmp && cmake --build build-tmp && cmake --install build-tmp
 rm -rf build-tmp
 # Non-static 32-bit binary from w64 compiler is broken with
 # missing libgcc_s_sjlj-1.dll, libwinpthread-1.dll
@@ -119,16 +133,16 @@ rm -rf build-tmp
 mv $sysroot32/usr/bin/rtl_433.exe $sysroot32/usr/bin/rtl_433_32bit_nonstatic_broken.exe
 
 export CMAKE_SYSROOT=$sysroot32static ; echo $CMAKE_SYSROOT
-mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake $source_dir && make && make install ; cd ..
+cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-i686.cmake -S $source_dir -B build-tmp && cmake --build build-tmp && cmake --install build-tmp
 rm -rf build-tmp
 mv $sysroot32static/usr/bin/rtl_433.exe $sysroot32static/usr/bin/rtl_433_32bit_static.exe
 
 export CMAKE_SYSROOT=$sysroot64 ; echo $CMAKE_SYSROOT
-mkdir build-tmp ; cd build-tmp ; cmake -DENABLE_SOAPYSDR=ON -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake $source_dir && make && make install ; cd ..
+cmake -DENABLE_SOAPYSDR=ON -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake -S $source_dir -B build-tmp && cmake --build build-tmp && cmake --install build-tmp
 rm -rf build-tmp
 
 export CMAKE_SYSROOT=$sysroot64static ; echo $CMAKE_SYSROOT
-mkdir build-tmp ; cd build-tmp ; cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake $source_dir && make && make install ; cd ..
+cmake -DCMAKE_TOOLCHAIN_FILE=$source_dir/cmake/Toolchain-gcc-mingw-w64-x86-64.cmake -S $source_dir -B build-tmp && cmake --build build-tmp && cmake --install build-tmp
 rm -rf build-tmp
 mv $sysroot64static/usr/bin/rtl_433.exe $sysroot64static/usr/bin/rtl_433_64bit_static.exe
 

cmake/Toolchain-gcc-mingw-w64-i686.cmake

@@ -1,5 +1,5 @@
 # CMAKE_SYSROOT and CMAKE_STAGING_PREFIX need 3.0
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 
 # Linux, Windows, or Darwin
 SET(CMAKE_SYSTEM_NAME Windows)

cmake/Toolchain-gcc-mingw-w64-x86-64.cmake

@@ -1,5 +1,5 @@
 # CMAKE_SYSROOT and CMAKE_STAGING_PREFIX need 3.0
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.10)
 
 # Linux, Windows, or Darwin
 SET(CMAKE_SYSTEM_NAME Windows)