[120306] trunk/dports/science/gnuradio

michaelld at macports.org michaelld at macports.org
Thu May 22 08:58:03 PDT 2014


Revision: 120306
          https://trac.macports.org/changeset/120306
Author:   michaelld at macports.org
Date:     2014-05-22 08:58:03 -0700 (Thu, 22 May 2014)
Log Message:
-----------
gnuradio:
+ update devel to cba2d184 and next to c38322be, both 20140520;
+ add +zeromq variant and make it a default variant;
+ update cmake-expand patch for recent changes.

Modified Paths:
--------------
    trunk/dports/science/gnuradio/Portfile
    trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff

Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- trunk/dports/science/gnuradio/Portfile	2014-05-22 14:20:43 UTC (rev 120305)
+++ trunk/dports/science/gnuradio/Portfile	2014-05-22 15:58:03 UTC (rev 120306)
@@ -94,15 +94,15 @@
     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.
 
-    github.setup        gnuradio gnuradio 432e3b75300a400e2e99dbe7e9aea58b6b2855b1
-    version             3.7.4_20140509
+    github.setup        gnuradio gnuradio cba2d184e2abb8a52353929a34b562ea4f9bd031
+    version             3.7.4_20140520
     name                gnuradio-devel
 
     conflicts           gnuradio-legacy gnuradio gnuradio-next
 
     checksums \
-        rmd160 01b3d29156e65cac97b8ee5763ffcd6d46f6aa5c \
-        sha256 46b6af83ee25ff4e09c82ad28de5111766f8c59022063dabbe5e8533dd7d1431
+        rmd160 673aa98e4a5cc9b2340c56bfacddafacca7755bc \
+        sha256 0d8e006c086a9421798aa7d2b481e147d3b5919e44645689ceda50620610c9c2
 
 }
 
@@ -111,15 +111,15 @@
     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.
 
-    github.setup        gnuradio gnuradio 980669478a12667471366f7ddbe51fbf826f593b
-    version             3.8.0_20140509
+    github.setup        gnuradio gnuradio c38322bea953f6c33b530ea3b171eb3bcc39d916
+    version             3.8.0_20140520
     name                gnuradio-next
 
     conflicts           gnuradio-legacy gnuradio gnuradio-devel
 
     checksums \
-        rmd160 bdd5b2b9d3db5d5c2d91f2ddc374b1bc00bb19ce \
-        sha256 7810abf3a37234a85079886908c239b9b99757e30de584ef6f6cc359aa438601
+        rmd160 c0ef14a81db958e22743a78d2d4ff1352b4327e8 \
+        sha256 01cb26c48b1f95152d2eb4c49881148db6ec03b13be499f558a0a729e99f4775
 
     # overload the github livecheck URL with the correct branch
 
@@ -242,7 +242,7 @@
 # (and, for next, except +ctrlport and +performance_counters);
 
 default_variants +docs +grc +qtgui +wxgui +uhd +orc +wavelet \
-    +jack +portaudio +swig +sdl
+    +jack +portaudio +swig +sdl +zeromq
 
 # set Python variants
 
@@ -587,3 +587,20 @@
         -DSDL_INCLUDE_DIR=
 
 }
+
+variant zeromq description "Install GNU Radio with support for the ZeroMQ lightweight messaging kernel" {
+
+    depends_lib-append \
+        port:cppzmq
+
+    configure.args-append \
+        -DENABLE_GR_ZEROMQ=ON
+
+}
+
+if {![variant_isset sdl]} {
+
+    configure.args-append \
+        -DENABLE_GR_ZEROMQ=OFF
+
+}

Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff	2014-05-22 14:20:43 UTC (rev 120305)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff	2014-05-22 15:58:03 UTC (rev 120306)
@@ -371,7 +371,7 @@
  # Setup library
 --- gr-blocks/include/gnuradio/blocks/CMakeLists.txt.orig
 +++ gr-blocks/include/gnuradio/blocks/CMakeLists.txt
-@@ -18,80 +18,38 @@
+@@ -18,80 +18,37 @@
  # Boston, MA 02110-1301, USA.
  
  ########################################################################
@@ -379,7 +379,7 @@
 +# Invoke macro to generate various headers
  ########################################################################
 -include(GrPython)
- 
+-
 -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
 -#!${PYTHON_EXECUTABLE}
 -
@@ -405,7 +405,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}
@@ -519,7 +519,7 @@
 -    list(APPEND expanded_files_h_impl ${CMAKE_CURRENT_BINARY_DIR}/${name}_impl.h)
 -    list(APPEND expanded_files_h ${CMAKE_CURRENT_BINARY_DIR}/../include/${name}.h)
 -  endforeach(sig)
--  
+-
 -  #create a command to generate the _impl.cc files
 -  add_custom_command(
 -    OUTPUT ${expanded_files_cc_impl}
@@ -528,7 +528,7 @@
 -    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
 -    ${root} ${root}_impl.cc.t ${ARGN}
 -  )
--  
+-
 -  #create a command to generate the _impl.h files
 -  add_custom_command(
 -    OUTPUT ${expanded_files_h_impl}
@@ -537,19 +537,19 @@
 -    ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py
 -    ${root} ${root}_impl.h.t ${ARGN}
 -  )
--  
+-
 -  #make _impl.cc source files depend on headers to force generation
 -  set_source_files_properties(${expanded_files_cc_impl}
 -    PROPERTIES OBJECT_DEPENDS "${expanded_files_h_impl}"
 -  )
--  
+-
 -  #make _impl.h source files depend on headers to force generation
 -  set_source_files_properties(${expanded_files_h_impl}
 -    PROPERTIES OBJECT_DEPENDS "${expanded_files_h}"
 -  )
 -
 -  #install rules for the generated cc files
--  list(APPEND generated_sources ${expanded_files_cc_impl})  
+-  list(APPEND generated_sources ${expanded_files_cc_impl})
 -endmacro(expand_cc_h_impl)
 -
 -########################################################################
@@ -617,11 +617,9 @@
  # Setup the include and linker paths
 --- gr-digital/include/gnuradio/digital/CMakeLists.txt.orig
 +++ gr-digital/include/gnuradio/digital/CMakeLists.txt
-@@ -17,54 +17,12 @@
- # the Free Software Foundation, Inc., 51 Franklin Street,
+@@ -18,53 +18,10 @@
  # Boston, MA 02110-1301, USA.
  
-+#################################################################
  ########################################################################
 -# generate helper scripts to expand templated files
 -########################################################################
@@ -652,7 +650,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}
@@ -683,8 +681,7 @@
  
  ########################################################################
 -# generate helper scripts to expand templated files
-+# Invoke macro to generate various sources and headers
- ########################################################################
+-########################################################################
 -include(GrPython)
 -
 -file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
@@ -713,7 +710,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}
@@ -731,28 +728,28 @@
 -    ${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)
 -
 -
 -########################################################################
--# Invoke macro to generate various sources
--########################################################################
+ # Invoke macro to generate various sources
+ ########################################################################
 -expand_cc(chunks_to_symbols_XX_impl     bf bc sf sc if ic)
 +include(GrMiscUtils)
 +GR_EXPAND_X_CC_H(digital chunks_to_symbols_XX_impl     bf bc sf sc if ic)
  
  ########################################################################
  # Setup library
-@@ -200,7 +140,6 @@ list(APPEND digital_libs
+@@ -203,7 +143,6 @@ list(APPEND digital_libs
      ${LOG4CPP_LIBRARIES}
  )
  
@@ -795,7 +792,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}
@@ -824,8 +821,8 @@
  install(FILES
 -    ${generated_includes}
      api.h
-     decode_ccsds_27_fb.h
-     encode_ccsds_27_bb.h
+     generic_decoder.h
+     generic_encoder.h
 --- gr-filter/include/gnuradio/filter/CMakeLists.txt.orig
 +++ gr-filter/include/gnuradio/filter/CMakeLists.txt
 @@ -18,56 +18,13 @@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140522/aea84f2e/attachment-0001.html>


More information about the macports-changes mailing list