[122427] trunk/dports/science/gnuradio
michaelld at macports.org
michaelld at macports.org
Tue Jul 22 13:04:48 PDT 2014
Revision: 122427
https://trac.macports.org/changeset/122427
Author: michaelld at macports.org
Date: 2014-07-22 13:04:48 -0700 (Tue, 22 Jul 2014)
Log Message:
-----------
gnuradio: update gnuradio-devel to d09b971d and next to ad17b61b, both 20140721.
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-07-22 19:09:37 UTC (rev 122426)
+++ trunk/dports/science/gnuradio/Portfile 2014-07-22 20:04:48 UTC (rev 122427)
@@ -93,15 +93,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 c98699ee1492e3899fad68e54537953f7d440b10
- version 3.7.4_20140629
+ github.setup gnuradio gnuradio d09b971d01f4e65eff80065796d724d88168866d
+ version 3.7.4_20140721
name gnuradio-devel
conflicts gnuradio-legacy gnuradio gnuradio-next
checksums \
- rmd160 d51d266b61225c85314c12df58ee597ddded7ead \
- sha256 49a96f45a6f8fe52c2eb9bcf0150724b0060e7e9a4e11ca90954425d29b6148e
+ rmd160 ad4f426e7a27056808358a7a22f494d0c5279a90 \
+ sha256 7ebef46c99b1d193197a95a9e6063db2b2c7a0f1821eb42ea05b535e68f254f6
}
@@ -110,15 +110,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 877c507ae03447625fb6979e37a5a24e152f8462
- version 3.8.0_20140629
+ github.setup gnuradio gnuradio ad17b61b2bea012b30078e0b0a691696df17cd8a
+ version 3.8.0_20140721
name gnuradio-next
conflicts gnuradio-legacy gnuradio gnuradio-devel
checksums \
- rmd160 22c6f449292dc7527ba8612e9ce48ad887ef638d \
- sha256 e02270e73c97d1a2fde5628de1b769fcdbcdca429644010eebd7d7d1fbde529e
+ rmd160 d35116bc9aa3c94b2f8ba5045f0193f099abfff7 \
+ sha256 8f2678dfb09a9538308889d570b6ce3b31bc778167a87339fcfea68ec90dd269
# overload the github livecheck URL with the correct branch
Modified: trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff
===================================================================
--- trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-07-22 19:09:37 UTC (rev 122426)
+++ trunk/dports/science/gnuradio/files/patch-cmake-expand.devel.diff 2014-07-22 20:04:48 UTC (rev 122427)
@@ -1,14 +1,5 @@
--- cmake/Modules/GrMiscUtils.cmake.orig
+++ cmake/Modules/GrMiscUtils.cmake
-@@ -333,7 +333,7 @@ set(CMAKE_REQUIRED_LIBRARIES -lpthread)
- } " HAVE_PTHREAD_SETSCHEDPARAM
- )
- GR_ADD_COND_DEF(HAVE_PTHREAD_SETSCHEDPARAM)
--
-+
- CHECK_CXX_SOURCE_COMPILES("
- #include <sched.h>
- int main(){
@@ -345,3 +345,210 @@ set(CMAKE_REQUIRED_LIBRARIES -lpthread)
GR_ADD_COND_DEF(HAVE_SCHED_SETSCHEDULER)
endmacro(GR_CHECK_LINUX_SCHED_AVAIL)
@@ -233,7 +224,8 @@
########################################################################
-# generate helper scripts to expand templated files
--########################################################################
++# Invoke macro to generate various headers
+ ########################################################################
-include(GrPython)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
@@ -261,7 +253,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}
@@ -277,8 +269,7 @@
-
-########################################################################
-# Invoke macro to generate various sources
-+# Invoke macro to generate various headers
- #######################################################################
+-#######################################################################
-expand_h(noise_source_X s i f c)
-expand_h(fastnoise_source_X s i f c)
-expand_h(sig_source_X s i f c)
@@ -987,7 +978,8 @@
########################################################################
-# generate helper scripts to expand templated files
--########################################################################
++# Invoke macro to generate various headers
+ ########################################################################
-include(GrPython)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/generate_helper.py "
@@ -1015,7 +1007,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}
@@ -1031,8 +1023,7 @@
-
-########################################################################
-# Invoke macro to generate various sources
-+# Invoke macro to generate various headers
- #######################################################################
+-#######################################################################
-expand_h(encoder_XX bb bs bi ss si ii)
-expand_h(sccc_encoder_XX bb bs bi ss si ii)
-expand_h(pccc_encoder_XX bb bs bi ss si ii)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140722/346cf9df/attachment.html>
More information about the macports-changes
mailing list