Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:wkazubski:test
gr-ssrptx
gr-ssrptx-update-to-gr37.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File gr-ssrptx-update-to-gr37.patch of Package gr-ssrptx
diff -up gr-ssrptx/CMakeLists.txt.gr37 gr-ssrptx/CMakeLists.txt --- gr-ssrptx/CMakeLists.txt.gr37 2015-02-01 16:21:47.000000000 +0100 +++ gr-ssrptx/CMakeLists.txt 2015-02-17 01:08:05.000000000 +0100 @@ -83,18 +83,10 @@ set(GRC_BLOCKS_DIR ${GR_PKG_DATA_DI ######################################################################## # Find gnuradio build dependencies ######################################################################## -find_package(Gruel) -find_package(GnuradioCore) find_package(CppUnit) find_package(USB) - -if(NOT GRUEL_FOUND) - message(FATAL_ERROR "Gruel required to compile ssrptx") -endif() - -if(NOT GNURADIO_CORE_FOUND) - message(FATAL_ERROR "GnuRadio Core required to compile ssrptx") -endif() +set(GR_REQUIRED_COMPONENTS RUNTIME BLOCKS) #############################MODULY +find_package(Gnuradio "3.7.5" REQUIRED) if(NOT CPPUNIT_FOUND) message(FATAL_ERROR "CppUnit required to compile ssrptx") @@ -108,12 +100,14 @@ endif() # Setup the include and linker paths ######################################################################## include_directories( + ${CMAKE_SOURCE_DIR}/lib ${CMAKE_SOURCE_DIR}/include + ${CMAKE_BINARY_DIR}/lib + ${CMAKE_BINARY_DIR}/include ${Boost_INCLUDE_DIRS} - ${GRUEL_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} - ${LIBUSB_INCLUDE_DIR} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} + ${GNURADIO_ALL_INCLUDE_DIRS} ) link_directories( @@ -124,6 +118,7 @@ link_directories( ${LIBUSB_LIBRARY_DIR} ) + # Set component parameters set(GR_SSRPTX_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include CACHE INTERNAL "" FORCE) set(GR_SSRPTX_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/swig CACHE INTERNAL "" FORCE) diff -up gr-ssrptx/cmake/Modules/FindGnuradioCore.cmake.gr37 gr-ssrptx/cmake/Modules/FindGnuradioCore.cmake --- gr-ssrptx/cmake/Modules/FindGnuradioCore.cmake.gr37 2013-03-25 10:42:36.000000000 +0100 +++ gr-ssrptx/cmake/Modules/FindGnuradioCore.cmake 2015-02-17 00:29:46.000000000 +0100 @@ -1,26 +0,0 @@ -INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core) - -FIND_PATH( - GNURADIO_CORE_INCLUDE_DIRS - NAMES gr_random.h - HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio - ${PC_GNURADIO_CORE_INCLUDEDIR} - PATHS /usr/local/include/gnuradio - /usr/include/gnuradio -) - -FIND_LIBRARY( - GNURADIO_CORE_LIBRARIES - NAMES gnuradio-core - HINTS $ENV{GNURADIO_CORE_DIR}/lib - ${PC_GNURADIO_CORE_LIBDIR} - PATHS /usr/local/lib - /usr/local/lib64 - /usr/lib - /usr/lib64 -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_CORE DEFAULT_MSG GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS) -MARK_AS_ADVANCED(GNURADIO_CORE_LIBRARIES GNURADIO_CORE_INCLUDE_DIRS) diff -up gr-ssrptx/cmake/Modules/FindGnuradioRuntime.cmake.gr37 gr-ssrptx/cmake/Modules/FindGnuradioRuntime.cmake --- gr-ssrptx/cmake/Modules/FindGnuradioRuntime.cmake.gr37 2015-02-17 00:30:48.000000000 +0100 +++ gr-ssrptx/cmake/Modules/FindGnuradioRuntime.cmake 2015-01-02 17:23:51.000000000 +0100 @@ -0,0 +1,36 @@ +INCLUDE(FindPkgConfig) +PKG_CHECK_MODULES(PC_GNURADIO_RUNTIME gnuradio-runtime) + +if(PC_GNURADIO_RUNTIME_FOUND) + # look for include files + FIND_PATH( + GNURADIO_RUNTIME_INCLUDE_DIRS + NAMES gnuradio/top_block.h + HINTS $ENV{GNURADIO_RUNTIME_DIR}/include + ${PC_GNURADIO_RUNTIME_INCLUDE_DIRS} + ${CMAKE_INSTALL_PREFIX}/include + PATHS /usr/local/include + /usr/include + ) + + # look for libs + FIND_LIBRARY( + GNURADIO_RUNTIME_LIBRARIES + NAMES gnuradio-runtime + HINTS $ENV{GNURADIO_RUNTIME_DIR}/lib + ${PC_GNURADIO_RUNTIME_LIBDIR} + ${CMAKE_INSTALL_PREFIX}/lib/ + ${CMAKE_INSTALL_PREFIX}/lib64/ + PATHS /usr/local/lib + /usr/local/lib64 + /usr/lib + /usr/lib64 + ) + + set(GNURADIO_RUNTIME_FOUND ${PC_GNURADIO_RUNTIME_FOUND}) +endif(PC_GNURADIO_RUNTIME_FOUND) + +INCLUDE(FindPackageHandleStandardArgs) +# do not check GNURADIO_RUNTIME_INCLUDE_DIRS, is not set when default include path us used. +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_RUNTIME DEFAULT_MSG GNURADIO_RUNTIME_LIBRARIES) +MARK_AS_ADVANCED(GNURADIO_RUNTIME_LIBRARIES GNURADIO_RUNTIME_INCLUDE_DIRS) diff -up gr-ssrptx/cmake/Modules/FindGruel.cmake.gr37 gr-ssrptx/cmake/Modules/FindGruel.cmake --- gr-ssrptx/cmake/Modules/FindGruel.cmake.gr37 2013-03-25 10:42:36.000000000 +0100 +++ gr-ssrptx/cmake/Modules/FindGruel.cmake 2015-02-17 00:33:12.000000000 +0100 @@ -1,26 +0,0 @@ -INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(PC_GRUEL gruel) - -FIND_PATH( - GRUEL_INCLUDE_DIRS - NAMES gruel/attributes.h - HINTS $ENV{GRUEL_DIR}/include - ${PC_GRUEL_INCLUDEDIR} - PATHS /usr/local/include - /usr/include -) - -FIND_LIBRARY( - GRUEL_LIBRARIES - NAMES gruel - HINTS $ENV{GRUEL_DIR}/lib - ${PC_GRUEL_LIBDIR} - PATHS /usr/local/lib - /usr/local/lib64 - /usr/lib - /usr/lib64 -) - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GRUEL DEFAULT_MSG GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS) -MARK_AS_ADVANCED(GRUEL_LIBRARIES GRUEL_INCLUDE_DIRS) diff -up gr-ssrptx/include/ssrptx/api.h.gr37 gr-ssrptx/include/ssrptx/api.h --- gr-ssrptx/include/ssrptx/api.h.gr37 2013-03-25 10:42:36.000000000 +0100 +++ gr-ssrptx/include/ssrptx/api.h 2015-01-02 19:45:48.000000000 +0100 @@ -22,7 +22,7 @@ #ifndef INCLUDED_SSRPTX_API_H #define INCLUDED_SSRPTX_API_H -#include <gruel/attributes.h> +#include <gnuradio/attributes.h> #ifdef gnuradio_ssrptx_EXPORTS # define SSRPTX_API __GR_ATTR_EXPORT diff -up gr-ssrptx/include/ssrptx/ssrptx.h.gr37 gr-ssrptx/include/ssrptx/ssrptx.h --- gr-ssrptx/include/ssrptx/ssrptx.h.gr37 2013-03-25 10:42:36.000000000 +0100 +++ gr-ssrptx/include/ssrptx/ssrptx.h 2014-12-30 18:52:12.000000000 +0100 @@ -23,7 +23,7 @@ #define INCLUDED_SSRPTX_SSRPTX_H #include <ssrptx/api.h> -#include <gr_sync_block.h> +#include <gnuradio/sync_block.h> namespace gr { namespace ssrptx { @@ -33,7 +33,7 @@ namespace gr { * \ingroup ssrptx * */ - class SSRPTX_API ssrptx : virtual public gr_sync_block + class SSRPTX_API ssrptx : virtual public gr::sync_block { public: typedef boost::shared_ptr<ssrptx> sptr; @@ -46,7 +46,7 @@ namespace gr { * class. ssrptx::ssrptx::make is the public interface for * creating new instances. */ - static sptr make(const int device_id=0, const int frequency=145500000, const float gain = 1.0); + static sptr make(const int device_id=0, const int frequency=102000000, const float gain = 1.0); }; } // namespace ssrptx diff -up gr-ssrptx/lib/CMakeLists.txt.gr37 gr-ssrptx/lib/CMakeLists.txt --- gr-ssrptx/lib/CMakeLists.txt.gr37 2013-03-25 10:42:36.000000000 +0100 +++ gr-ssrptx/lib/CMakeLists.txt 2015-01-02 20:24:49.000000000 +0100 @@ -65,7 +65,7 @@ endif() add_library(gnuradio-ssrptx SHARED ${ssrptx_sources}) -target_link_libraries(gnuradio-ssrptx ${Boost_LIBRARIES} ${GRUEL_LIBRARIES} ${GNURADIO_CORE_LIBRARIES} ${LIBUSB_LIBRARIES}) +target_link_libraries(gnuradio-ssrptx ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_ALL_LIBRARIES}) set_target_properties(gnuradio-ssrptx PROPERTIES DEFINE_SYMBOL "gnuradio_ssrptx_EXPORTS") ######################################################################## @@ -93,8 +93,9 @@ add_executable(test-ssrptx ${test_ssrptx target_link_libraries( test-ssrptx - ${GNURADIO_CORE_LIBRARIES} ${Boost_LIBRARIES} + ${GNURADIO_RUNTIME_LIBRARIES} + ${GNURADIO_ALL_LIBRARIES} ${CPPUNIT_LIBRARIES} ${LIBUSB_LIBRARIES} gnuradio-ssrptx diff -up gr-ssrptx/lib/qa_ssrptx.h.gr37 gr-ssrptx/lib/qa_ssrptx.h --- gr-ssrptx/lib/qa_ssrptx.h.gr37 2013-03-25 10:42:36.000000000 +0100 +++ gr-ssrptx/lib/qa_ssrptx.h 2014-12-30 18:53:19.000000000 +0100 @@ -23,7 +23,7 @@ #ifndef _QA_SSRPTX_H_ #define _QA_SSRPTX_H_ -#include <gruel/attributes.h> +#include <gnuradio/attributes.h> #include <cppunit/TestSuite.h> //! collect all the tests for the gr-filter directory diff -up gr-ssrptx/lib/ssrptx_impl.cc.gr37 gr-ssrptx/lib/ssrptx_impl.cc --- gr-ssrptx/lib/ssrptx_impl.cc.gr37 2013-03-25 10:42:36.000000000 +0100 +++ gr-ssrptx/lib/ssrptx_impl.cc 2015-01-02 19:57:29.000000000 +0100 @@ -24,7 +24,7 @@ #include <stdio.h> -#include <gr_io_signature.h> +#include <gnuradio/io_signature.h> #include "ssrptx_impl.h" #include "sdrtx_standard.h" @@ -42,9 +42,9 @@ namespace gr { * The private constructor */ ssrptx_impl::ssrptx_impl(const int device_id, const int frequency, const float gain) - : gr_sync_block("ssrptx", - gr_make_io_signature(1, 1, sizeof (short) * 2), - gr_make_io_signature(0, 0, 0)) + : gr::sync_block("ssrptx", + gr::io_signature::make(1, 1, sizeof (short) * 2), + gr::io_signature::make(0, 0, 0)) { fprintf(stderr, "device_id=%d, frequency=%d, gain=%.1f\n", device_id, frequency, gain); sdrtx_standard_tx *stx = sdrtx_standard_tx::make (device_id, "txS_1024.ihx"); diff -up gr-ssrptx/lib/test_ssrptx.cc.gr37 gr-ssrptx/lib/test_ssrptx.cc --- gr-ssrptx/lib/test_ssrptx.cc.gr37 2013-03-25 10:42:36.000000000 +0100 +++ gr-ssrptx/lib/test_ssrptx.cc 2014-12-30 18:54:23.000000000 +0100 @@ -23,7 +23,7 @@ #include <cppunit/TextTestRunner.h> #include <cppunit/XmlOutputter.h> -#include <gr_unittests.h> +#include <gnuradio/unittests.h> #include "qa_ssrptx.h" #include <iostream> diff -up gr-ssrptx/swig/CMakeLists.txt.gr37 gr-ssrptx/swig/CMakeLists.txt --- gr-ssrptx/swig/CMakeLists.txt.gr37 2013-03-25 10:42:36.000000000 +0100 +++ gr-ssrptx/swig/CMakeLists.txt 2015-01-02 20:53:24.000000000 +0100 @@ -31,13 +31,10 @@ include(GrPython) ######################################################################## # Setup swig generation ######################################################################## -foreach(incdir ${GNURADIO_CORE_INCLUDE_DIRS}) +foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS}) list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/swig) endforeach(incdir) -foreach(incdir ${GRUEL_INCLUDE_DIRS}) - list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/gruel/swig) -endforeach(incdir) set(GR_SWIG_LIBRARIES gnuradio-ssrptx) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/ssrptx_swig_doc.i) diff -up gr-ssrptx/swig/ssrptx_swig.i.gr37 gr-ssrptx/swig/ssrptx_swig.i --- gr-ssrptx/swig/ssrptx_swig.i.gr37 2013-03-25 10:42:36.000000000 +0100 +++ gr-ssrptx/swig/ssrptx_swig.i 2015-01-02 20:45:45.000000000 +0100 @@ -2,7 +2,7 @@ #define SSRPTX_API -%include "gnuradio.i" // the common stuff +%include "gnuradio/swig/runtime_swig.i" // the common stuff //load generated python docstrings %include "ssrptx_swig_doc.i"
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
