File gr-osmosdr-add-xtrx-support-git20200103-gr38.patch of Package gr-osmosdr

Overview Repositories Revisions Requests Users Attributes Meta

File gr-osmosdr-add-xtrx-support-git20200103-gr38.patch of Package gr-osmosdr (Revision 1185e1c993684edae2c563a0b4fa910b)

Currently displaying revision 1185e1c993684edae2c563a0b4fa910b , Show latest

diff -up gr-osmosdr/CMakeLists.txt.bbbb gr-osmosdr/CMakeLists.txt
--- gr-osmosdr/CMakeLists.txt.bbbb	2020-01-30 23:21:25.992954850 +0100
+++ gr-osmosdr/CMakeLists.txt	2020-02-02 09:11:14.814926934 +0100
@@ -31,10 +31,10 @@ cmake_policy(SET CMP0079 NEW)
 
 #select the release build type by default to get optimization flags
 if(NOT CMAKE_BUILD_TYPE)
-   set(CMAKE_BUILD_TYPE "Release")
+#IGNORE    set(CMAKE_BUILD_TYPE "Release")
    message(STATUS "Build type not specified: defaulting to release.")
 endif(NOT CMAKE_BUILD_TYPE)
-set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
+#IGNORE set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "")
 
 ########################################################################
 # GNURadio setup
@@ -178,6 +178,7 @@ find_package(LibAIRSPYHF)
 find_package(LibbladeRF)
 find_package(SoapySDR NO_MODULE)
 find_package(LibFreeSRP)
+find_package(LibXTRX)
 find_package(Doxygen)
 
     # Python
@@ -251,7 +252,7 @@ endif(DOXYGEN_FOUND)
 # Create uninstall target
 ########################################################################
 configure_file(
-    ${CMAKE_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
 @ONLY)
 
diff -up gr-osmosdr/grc/gen_osmosdr_blocks.py.bbbb gr-osmosdr/grc/gen_osmosdr_blocks.py
--- gr-osmosdr/grc/gen_osmosdr_blocks.py.bbbb	2020-01-30 23:21:25.996954531 +0100
+++ gr-osmosdr/grc/gen_osmosdr_blocks.py	2020-02-02 09:11:14.782929524 +0100
@@ -173,7 +173,8 @@ documentation: |-
    * Great Scott Gadgets HackRF through libhackrf
    * Nuand LLC bladeRF through libbladeRF library
    * Ettus USRP Devices through Ettus UHD library
-   * Fairwaves UmTRX through Fairwaves' fork of UHD
+   * Fairwaves XTRX through libxtrx
+   * Fairwaves UmTRX through Fairwaves' module for UHD
    * Red Pitaya SDR transceiver (http://bazaar.redpitaya.com)
    * FreeSRP through libfreesrp library
 
@@ -214,6 +215,7 @@ documentation: |-
     hackrf=0[,buffers=32][,bias=0|1][,bias_tx=0|1]
     bladerf=0[,tamer=internal|external|external_1pps][,smb=25e6]
     uhd[,serial=...][,lo_offset=0][,mcr=52e6][,nchan=2][,subdev='\\\\'B:0 A:0\\\\''] ...
+    xtrx
 
   Num Channels:
   Selects the total number of channels in this multi-device configuration. Required when specifying multiple device arguments.
diff -up gr-osmosdr/lib/CMakeLists.txt.bbbb gr-osmosdr/lib/CMakeLists.txt
--- gr-osmosdr/lib/CMakeLists.txt.bbbb	2020-01-30 23:21:25.996954531 +0100
+++ gr-osmosdr/lib/CMakeLists.txt	2020-02-02 09:11:14.814926934 +0100
@@ -250,6 +250,14 @@ if(ENABLE_FREESRP)
 endif(ENABLE_FREESRP)
 
 ########################################################################
+# Setup XTRX component
+########################################################################
+GR_REGISTER_COMPONENT("XTRX SDR" ENABLE_XTRX LIBXTRX_FOUND)
+if(ENABLE_XTRX)
+    add_subdirectory(xtrx)
+endif(ENABLE_XTRX)
+
+########################################################################
 # Setup configuration file
 ########################################################################
 add_definitions(-DHAVE_CONFIG_H=1)
diff -up gr-osmosdr/lib/config.h.in.bbbb gr-osmosdr/lib/config.h.in
--- gr-osmosdr/lib/config.h.in.bbbb	2020-01-30 23:21:25.996954531 +0100
+++ gr-osmosdr/lib/config.h.in	2020-02-02 09:11:14.782929524 +0100
@@ -20,6 +20,7 @@
 #cmakedefine ENABLE_SOAPY
 #cmakedefine ENABLE_REDPITAYA
 #cmakedefine ENABLE_FREESRP
+#cmakedefine ENABLE_XTRX
 
 //provide NAN define for MSVC older than VC12
 #if defined(_MSC_VER) && (_MSC_VER < 1800)
diff -up gr-osmosdr/lib/sink_impl.cc.bbbb gr-osmosdr/lib/sink_impl.cc
--- gr-osmosdr/lib/sink_impl.cc.bbbb	2019-10-20 12:44:58.038497787 +0200
+++ gr-osmosdr/lib/sink_impl.cc	2020-02-02 09:11:14.782929524 +0100
@@ -48,6 +48,9 @@
 #ifdef ENABLE_FREESRP
 #include <freesrp_sink_c.h>
 #endif
+#ifdef ENABLE_XTRX
+#include "xtrx_sink_c.h"
+#endif
 #ifdef ENABLE_FILE
 #include "file_sink_c.h"
 #endif
@@ -99,6 +102,9 @@ sink_impl::sink_impl( const std::string
 #ifdef ENABLE_FREESRP
   dev_types.push_back("freesrp");
 #endif
+#ifdef ENABLE_XTRX
+  dev_types.push_back("xtrx");
+#endif
 #ifdef ENABLE_FILE
   dev_types.push_back("file");
 #endif
@@ -147,6 +153,9 @@ sink_impl::sink_impl( const std::string
     BOOST_FOREACH( std::string dev, freesrp_sink_c::get_devices() )
       dev_list.push_back( dev );
 #endif
+#ifdef ENABLE_XTRX
+	BOOST_FOREACH( std::string dev, xtrx_sink_c::get_devices() )
+#endif
 #ifdef ENABLE_FILE
     BOOST_FOREACH( std::string dev, file_sink_c::get_devices() )
       dev_list.push_back( dev );
@@ -209,6 +218,12 @@ sink_impl::sink_impl( const std::string
       block = sink; iface = sink.get();
     }
 #endif
+#ifdef ENABLE_XTRX
+    if ( dict.count("xtrx") ) {
+      xtrx_sink_c_sptr sink = make_xtrx_sink_c( arg );
+      block = sink; iface = sink.get();
+    }
+#endif
 #ifdef ENABLE_FILE
     if ( dict.count("file") ) {
       file_sink_c_sptr sink = make_file_sink_c( arg );
diff -up gr-osmosdr/lib/source_impl.cc.bbbb gr-osmosdr/lib/source_impl.cc
--- gr-osmosdr/lib/source_impl.cc.bbbb	2020-01-30 23:21:25.996954531 +0100
+++ gr-osmosdr/lib/source_impl.cc	2020-02-02 09:11:14.782929524 +0100
@@ -95,6 +95,10 @@
 #ifdef ENABLE_FREESRP
 #include <freesrp_source_c.h>
 #endif
+#ifdef ENABLE_XTRX
+#include <xtrx_source_c.h>
+#endif
+
 
 #include "arg_helpers.h"
 #include "source_impl.h"
@@ -173,6 +177,9 @@ source_impl::source_impl( const std::str
 #ifdef ENABLE_FREESRP
   dev_types.push_back("freesrp");
 #endif
+#ifdef ENABLE_XTRX
+  dev_types.push_back("xtrx");
+#endif
   std::cerr << "gr-osmosdr "
             << GR_OSMOSDR_VERSION << " (" << GR_OSMOSDR_LIBVER << ") "
             << "gnuradio " << gr::version() << std::endl;
@@ -256,6 +263,10 @@ source_impl::source_impl( const std::str
     BOOST_FOREACH( std::string dev, freesrp_source_c::get_devices() )
       dev_list.push_back( dev );
 #endif
+#ifdef ENABLE_XTRX
+    BOOST_FOREACH( std::string dev, xtrx_source_c::get_devices() )
+      dev_list.push_back( dev );
+#endif
 
 //    std::cerr << std::endl;
 //    BOOST_FOREACH( std::string dev, dev_list )
@@ -393,6 +404,13 @@ source_impl::source_impl( const std::str
       block = src; iface = src.get();
     }
 #endif
+
+#ifdef ENABLE_XTRX
+    if ( dict.count("xtrx") ) {
+      xtrx_source_c_sptr src = make_xtrx_source_c( arg );
+      block = src; iface = src.get();
+    }
+#endif
 
     if ( iface != NULL && long(block.get()) != 0 ) {
       _devs.push_back( iface );
diff -up gr-osmosdr/lib/xtrx/CMakeLists.txt.bbbb gr-osmosdr/lib/xtrx/CMakeLists.txt
--- gr-osmosdr/lib/xtrx/CMakeLists.txt.bbbb	2020-02-02 09:11:14.814926934 +0100
+++ gr-osmosdr/lib/xtrx/CMakeLists.txt	2020-02-02 09:57:29.132770182 +0100
@@ -21,19 +21,18 @@
 # This file included, use CMake directory variables
 ########################################################################
 
-include_directories(
+target_include_directories(gnuradio-osmosdr PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${LIBXTRX_INCLUDE_DIRS}
 )
 
-set(xtrx_srcs
+target_link_libraries(gnuradio-osmosdr
+    ${LIBXTRX_LIBRARIES}
+)
+
+list(APPEND gr_osmosdr_srcs
     ${CMAKE_CURRENT_SOURCE_DIR}/xtrx_obj.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/xtrx_source_c.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/xtrx_sink_c.cc
 )
-
-########################################################################
-# Append gnuradio-osmosdr library sources
-########################################################################
-list(APPEND gr_osmosdr_srcs ${xtrx_srcs})
-list(APPEND gr_osmosdr_libs ${LIBXTRX_LIBRARIES})
+set(gr_osmosdr_srcs ${gr_osmosdr_srcs} PARENT_SCOPE)
diff -up gr-osmosdr/README.bbbb gr-osmosdr/README
--- gr-osmosdr/README.bbbb	2019-10-20 12:44:58.022499052 +0200
+++ gr-osmosdr/README	2020-02-02 09:11:14.782929524 +0100
@@ -15,7 +15,8 @@ as well supports:
  * Great Scott Gadgets HackRF through libhackrf
  * Nuand LLC bladeRF through libbladeRF library
  * Ettus USRP Devices through Ettus UHD library
- * Fairwaves UmTRX through Fairwaves' fork of UHD
+ * Fairwaves UmTRX through Fairwaves' module for UHD
+ * Fairwaves XTRX through libxtrx
  * Red Pitaya SDR transceiver (http://bazaar.redpitaya.com)
  * FreeSRP through libfreesrp
 
@@ -39,7 +40,7 @@ please do a "make uninstall" first to pr
 
 Building with cmake:
 
-git clone git://git.osmocom.org/gr-osmosdr
+git clone https://github.com/xtrx-sdr/gr-osmosdr
 cd gr-osmosdr/
 mkdir build
 cd build/

Places

File gr-osmosdr-add-xtrx-support-git20200103-gr38.patch of Package gr-osmosdr (Revision 1185e1c993684edae2c563a0b4fa910b)

Places