Skip to content
Permalink
Browse files

gnuradio:

+ update release to 3.7.3;
+ update devel to 69dcaa75 and next to aedd3caf, both 20140308;
+ remove integrated patch;
+ update release patch.

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@117735 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
michaelld committed Mar 10, 2014
1 parent 4effe54 commit 71e26b2cfaa979c530f58cdf82c57bccf7280d23
@@ -22,8 +22,7 @@ dist_subdir gnuradio

if {${subport} eq ${name}} {

version 3.7.2.1
revision 2
version 3.7.3

long_description ${description}: \
This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
@@ -35,8 +34,8 @@ if {${subport} eq ${name}} {
master_sites http://gnuradio.org/releases/gnuradio gnu

checksums \
rmd160 14a04753ce6185daa92ebcb6619df9c130a70757 \
sha256 8c6b7e1fda31e9228bdd62a137af901b28757d7e1b044de2e985b96e53c83c80
rmd160 f4f8d707694ac8524025ccd4cfb3e47fd3a17204 \
sha256 1c71d1819a67bac4148c619fc2a7d2c0ea0b0d08aa4660a11d65ab7b713b5231

patchfiles-append \
patch-cmake-expand.release.diff
@@ -89,13 +88,13 @@ subport gnuradio-devel {
long_description ${description}: \
This port is kept up with the GNU Radio GIT 'master' branch, which is typically updated daily to weekly. This version of GNU Radio generally contains fixes to, and its API is compatible with, the current GNU Radio release, and will be incorporated in an upcoming release. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.

version 3.7.3_20140307
version 3.7.4_20140308

conflicts gnuradio-legacy gnuradio gnuradio-next

fetch.type git
git.url http://git.gnuradio.org/git/gnuradio.git
git.branch 24dc96ad6c445f905af9bc3eba1c56e97e3c429d
git.branch 69dcaa75b629af4ebc465a073f54af84b7c75a11

livecheck.url http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=master
livecheck.version ${git.branch}
@@ -108,13 +107,13 @@ subport gnuradio-next {
long_description ${description}: \
This port is kept up with the GNU Radio GIT 'next' branch, which is typically updated daily to weekly. This version of GNU Radio represents the next major release of GNU Radio, and hence its API is likely to be different than that provided by either gnuradio or gnuradio-devel. This port may or not compile or function correctly, as it represents a work in progress. If it does not work, check back in a few days. Or try deactivating the currently active gnuradio port, cleaning any current builds, and trying again.

version 3.8.0_20140307
version 3.8.0_20140308

conflicts gnuradio-legacy gnuradio gnuradio-devel

fetch.type git
git.url http://git.gnuradio.org/git/gnuradio.git
git.branch 06dab56378a89e39e14ff8ebf66745eee0955b31
git.branch aedd3caf18f161a22323fc6533463ec554e94c37

livecheck.url http://gnuradio.org/cgit/cgit.cgi/gnuradio/log/?h=next
livecheck.version ${git.branch}
@@ -151,10 +150,6 @@ if {${subport} ne "gnuradio-legacy"} {

patchfiles-append patch-cmake-expand.devel.diff

# temporary patch to fix Doxygen building

patchfiles-append patch-CMakeLists.txt.devel.diff

}
}

This file was deleted.

@@ -371,15 +371,15 @@
# Setup library
--- gr-blocks/include/gnuradio/blocks/CMakeLists.txt.orig
+++ gr-blocks/include/gnuradio/blocks/CMakeLists.txt
@@ -18,79 +18,36 @@
@@ -18,80 +18,38 @@
# Boston, MA 02110-1301, USA.

########################################################################
-# generate helper scripts to expand templated files
+# Invoke macro to generate various headers
########################################################################
-include(GrPython)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
-#!${PYTHON_EXECUTABLE}
-
@@ -422,6 +422,7 @@
-########################################################################
-# Invoke macro to generate various sources
-########################################################################
-expand_h(abs_XX ss ii ff)
-expand_h(add_XX ss ii cc)
-expand_h(add_const_XX bb ss ii ff cc)
-expand_h(add_const_vXX bb ss ii ff cc)
@@ -450,6 +451,7 @@
-expand_h(vector_sink_X b s i f c)
-expand_h(vector_source_X b s i f c)
+include(GrMiscUtils)
+GR_EXPAND_X_H(blocks abs_XX ss ii ff)
+GR_EXPAND_X_H(blocks add_XX ss ii cc)
+GR_EXPAND_X_H(blocks add_const_XX bb ss ii ff cc)
+GR_EXPAND_X_H(blocks add_const_vXX bb ss ii ff cc)
@@ -482,7 +484,7 @@
${generated_includes}
--- gr-blocks/lib/CMakeLists.txt.orig
+++ gr-blocks/lib/CMakeLists.txt
@@ -23,100 +23,36 @@
@@ -23,101 +23,37 @@
include(${CMAKE_CURRENT_SOURCE_DIR}/ConfigChecks.cmake)

########################################################################
@@ -553,6 +555,7 @@
-########################################################################
# Invoke macro to generate various sources
########################################################################
-expand_cc_h_impl(abs_XX ss ii ff)
-expand_cc_h_impl(add_XX ss ii cc)
-expand_cc_h_impl(add_const_XX bb ss ii ff cc)
-expand_cc_h_impl(add_const_vXX bb ss ii ff cc)
@@ -581,6 +584,7 @@
-expand_cc_h_impl(vector_sink_X b s i f c)
-expand_cc_h_impl(vector_source_X b s i f c)
+include(GrMiscUtils)
+GR_EXPAND_X_CC_H_IMPL(blocks abs_XX ss ii ff)
+GR_EXPAND_X_CC_H_IMPL(blocks add_XX ss ii cc)
+GR_EXPAND_X_CC_H_IMPL(blocks add_const_XX bb ss ii ff cc)
+GR_EXPAND_X_CC_H_IMPL(blocks add_const_vXX bb ss ii ff cc)
@@ -857,7 +861,7 @@
- string(REGEX REPLACE "X+" ${sig} name ${root})
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
- endforeach(sig)
-
-
- #create a command to generate the files
- add_custom_command(
- OUTPUT ${expanded_files_h}
@@ -924,7 +928,7 @@
- list(APPEND expanded_files_cc ${CMAKE_CURRENT_BINARY_DIR}/${name}.cc)
- list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/${name}.h)
- endforeach(sig)
-
-
- #create a command to generate the source files
- add_custom_command(
- OUTPUT ${expanded_files_cc}
@@ -942,15 +946,15 @@
- ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
- ${root} ${root}.h.t ${ARGN}
- )
-
-
- #make source files depends on headers to force generation
- set_source_files_properties(${expanded_files_cc}
- PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
- )
-
-
- #install rules for the generated cc files
- list(APPEND generated_sources ${expanded_files_cc})
- list(APPEND generated_headers ${expanded_files_h})
- list(APPEND generated_sources ${expanded_files_cc})
- list(APPEND generated_headers ${expanded_files_h})
-endmacro(expand_cc)
-
-########################################################################

0 comments on commit 71e26b2

Please sign in to comment.
You can’t perform that action at this time.