Skip to content

Commit

Permalink
update gnuradio v3.7.9.2
Browse files Browse the repository at this point in the history
  • Loading branch information
guruofquality committed May 4, 2016
1 parent 0ad657a commit 719ddbe
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 36 deletions.
6 changes: 2 additions & 4 deletions BuildGNURadio.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
############################################################

set(VOLK_BRANCH v1.2.2)
set(GNURADIO_BRANCH v3.7.9)
set(GR_RUNTIME_BRANCH gr-runtime-v3.7.9)
set(GNURADIO_BRANCH v3.7.9.2)
set(GR_RUNTIME_BRANCH master)
set(GR_POTHOS_BRANCH master)
set(GROSMOSDR_BRANCH master)
set(GRRDS_BRANCH master)
Expand Down Expand Up @@ -55,7 +55,6 @@ ExternalProject_Add(GNURadio
GIT_REPOSITORY https://github.com/gnuradio/gnuradio.git
GIT_TAG ${GNURADIO_BRANCH}
PATCH_COMMAND ${GIT_PATCH_HELPER} --git ${GIT_EXECUTABLE}
${PROJECT_SOURCE_DIR}/patches/gnuradio_fix_use_swig.diff
${PROJECT_SOURCE_DIR}/patches/gnuradio_dtv_use_alloca.diff
${PROJECT_SOURCE_DIR}/patches/gnuradio_fix_codec2_public_defs.diff
${PROJECT_SOURCE_DIR}/patches/gnuradio_fix_codec2_fdmdv_round.diff
Expand All @@ -68,7 +67,6 @@ ExternalProject_Add(GNURadio
${PROJECT_SOURCE_DIR}/patches/gnuradio_fec_dllr_factor.diff
${PROJECT_SOURCE_DIR}/patches/gnuradio_dtv_use_gr_aligned.diff
${PROJECT_SOURCE_DIR}/patches/gnuradio_fec_ldpc_config_h.diff
${PROJECT_SOURCE_DIR}/patches/gnuradio_grc_windows_paths.diff
CMAKE_GENERATOR ${CMAKE_GENERATOR}
CMAKE_ARGS
-Wno-dev
Expand Down
2 changes: 0 additions & 2 deletions patches/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
| GNURadio | gnuradio_fix_codec2_public_defs.diff | https://github.com/pothosware/gnuradio/issues/10 |
| GNURadio | gnuradio_fix_filter_truncation.diff | https://github.com/pothosware/gnuradio/issues/7 |
| GNURadio | gnuradio_fix_pfb_clock_sync_fff.diff | https://github.com/pothosware/gnuradio/issues/8 |
| GNURadio | gnuradio_fix_use_swig.diff | http://gnuradio.org/redmine/issues/799 |
| GNURadio | gnuradio_portaudio_add_io_h.diff | https://github.com/pothosware/gnuradio/issues/21 |
| GNURadio | gnuradio_udp_source_linger.diff | https://github.com/pothosware/gnuradio/issues/23 |
| GNURadio | gnuradio_fix_msvc14.diff | Adds MSVC14 version string to CMake build |
| GNURadio | gnuradio_config_msvc_math.diff | https://github.com/pothosware/gnuradio/issues/24 |
| GNURadio | gnuradio_fec_dllr_factor.diff | https://github.com/pothosware/gnuradio/issues/26 |
| GNURadio | gnuradio_dtv_use_gr_aligned.diff | https://github.com/pothosware/gnuradio/issues/25 |
| GNURadio | gnuradio_fec_ldpc_config_h.diff | https://github.com/pothosware/gnuradio/issues/24 |
| GNURadio | gnuradio_grc_windows_paths.diff | https://github.com/pothosware/gnuradio/issues/27 |
| UHD | uhd_fix_gain_group_floor_round.diff | https://github.com/EttusResearch/uhd/issues/31 |
| gr-rds | gr_rds_msvc_fixes.diff | Minor MSVC patches for encoder_impl.cc |
| zeromq | zeromq_readme_docs_path.diff | Do not install readme docs into the top directory |
4 changes: 2 additions & 2 deletions patches/gnuradio_fec_dllr_factor.diff
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ index b0ecb85..c160f4b 100644
bool set_frame_size(unsigned int frame_size){return false;};

private:
- static const float D_LLR_FACTOR = -2.19722458f;
+ static const float D_LLR_FACTOR;
- static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR = -2.19722458f;
+ static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR;
unsigned int d_frozen_bit_counter;

protected:
Expand Down
13 changes: 0 additions & 13 deletions patches/gnuradio_fix_use_swig.diff

This file was deleted.

15 changes: 0 additions & 15 deletions patches/gnuradio_grc_windows_paths.diff

This file was deleted.

0 comments on commit 719ddbe

Please sign in to comment.