<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114214] trunk/dports/science/gnuradio</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/114214">114214</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2013-12-02 16:16:08 -0800 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio:
+ update release to 3.7.2.1, which removes the need for a patch;
+ update devel to 258e0f3b and next to 40fee81c, both 20131201.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradioPortfile">trunk/dports/science/gnuradio/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencegnuradiofilespatchvolk_lib_CMakeListstxtdiff">trunk/dports/science/gnuradio/files/patch-volk_lib_CMakeLists.txt.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegnuradioPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gnuradio/Portfile (114213 => 114214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2013-12-02 21:49:15 UTC (rev 114213)
+++ trunk/dports/science/gnuradio/Portfile 2013-12-03 00:16:08 UTC (rev 114214)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> if {${subport} eq ${name}} {
</span><span class="cx">
</span><del>- version 3.7.2
</del><ins>+ version 3.7.2.1
</ins><span class="cx">
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
</span><span class="lines">@@ -34,13 +34,9 @@
</span><span class="cx"> master_sites http://gnuradio.org/releases/gnuradio gnu
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 544dce18b81824437ed9919b4f65d3a3f4f9dceb \
- sha256 b80b42eaa091cb77a168e15b029307856db249d460ff06dfdf292802c19a2669
</del><ins>+ rmd160 14a04753ce6185daa92ebcb6619df9c130a70757 \
+ sha256 8c6b7e1fda31e9228bdd62a137af901b28757d7e1b044de2e985b96e53c83c80
</ins><span class="cx">
</span><del>- # add check for cvtpi32_ps intrinsic
-
- patchfiles-append patch-volk_lib_CMakeLists.txt.diff
-
</del><span class="cx"> livecheck.url http://gnuradio.org/releases/gnuradio/?C=M&O=D
</span><span class="cx"> livecheck.regex >LATEST-IS-(\[^<\]*)<
</span><span class="cx">
</span><span class="lines">@@ -89,13 +85,13 @@
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> 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.
</span><span class="cx">
</span><del>- version 3.7.3_20131127
</del><ins>+ version 3.7.3_20131201
</ins><span class="cx">
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-next
</span><span class="cx">
</span><span class="cx"> fetch.type git
</span><span class="cx"> git.url http://git.gnuradio.org/git/gnuradio.git
</span><del>- git.branch 3b1089fadaff7d87b74d50aad2ac120e1d33d10c
</del><ins>+ git.branch 258e0f3bd296f7ec0e05290faee0a51181b0e675
</ins><span class="cx">
</span><span class="cx"> livecheck.url http://gnuradio.org/cgit/gnuradio.git/log/?h=master
</span><span class="cx"> livecheck.version ${git.branch}
</span><span class="lines">@@ -108,13 +104,13 @@
</span><span class="cx"> long_description ${description}: \
</span><span class="cx"> 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.
</span><span class="cx">
</span><del>- version 3.8.0_20131127
</del><ins>+ version 3.8.0_20131201
</ins><span class="cx">
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-devel
</span><span class="cx">
</span><span class="cx"> fetch.type git
</span><span class="cx"> git.url http://git.gnuradio.org/git/gnuradio.git
</span><del>- git.branch 518e89f7b6cc2ab7716a5930429588185345ce6a
</del><ins>+ git.branch 40fee81c254da16f90b5e79cd9f8bda7cd58ea85
</ins><span class="cx">
</span><span class="cx"> livecheck.url http://gnuradio.org/cgit/gnuradio.git/log/?h=next
</span><span class="cx"> livecheck.version ${git.branch}
</span></span></pre></div>
<a id="trunkdportssciencegnuradiofilespatchvolk_lib_CMakeListstxtdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/gnuradio/files/patch-volk_lib_CMakeLists.txt.diff (114213 => 114214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-volk_lib_CMakeLists.txt.diff 2013-12-02 21:49:15 UTC (rev 114213)
+++ trunk/dports/science/gnuradio/files/patch-volk_lib_CMakeLists.txt.diff 2013-12-03 00:16:08 UTC (rev 114214)
</span><span class="lines">@@ -1,54 +0,0 @@
</span><del>---- volk/lib/CMakeLists.txt.orig
-+++ volk/lib/CMakeLists.txt
-@@ -122,6 +122,7 @@ endmacro(OVERRULE_ARCH)
- # the xgetbv instruction, or {if not cross-compiling and the xgetbv
- # executable does not function correctly}.
- ########################################################################
-+set(HAVE_XGETBV 0)
- if(CPU_IS_x86)
- # check to see if the compiler/linker works with xgetb instruction
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv.c "unsigned long long _xgetbv(unsigned int index) { unsigned int eax, edx; __asm__ __volatile__(\"xgetbv\" : \"=a\"(eax), \"=d\"(edx) : \"c\"(index)); return ((unsigned long long)edx << 32) | eax; } int main (void) { (void) _xgetbv(0); return (0); }")
-@@ -139,17 +140,41 @@ if(CPU_IS_x86)
- if(NOT ${avx_exe_result} EQUAL 0)
- OVERRULE_ARCH(avx "CPU missing xgetbv.")
- else()
-- add_definitions(-DHAVE_XGETBV)
-+ set(HAVE_XGETBV 1)
- endif()
- else()
- # cross compiling and compiler/linker seems to work; assume working
-- add_definitions(-DHAVE_XGETBV)
-+ set(HAVE_XGETBV 1)
- endif()
- file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv
- ${CMAKE_CURRENT_BINARY_DIR}/test_xgetbv.c)
- endif()
-
- ########################################################################
-+# eliminate AVX if cvtpi32_ps intrinsic fails on Apple
-+########################################################################
-+
-+if(${HAVE_XGETBV} AND APPLE)
-+ # check to see if the compiler/linker works with cvtpi32_ps instrinsic
-+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_cvtpi32_ps.c "#include <immintrin.h>\nint main (void) {__m128 __a; __m64 __b; __m128 foo = _mm_cvtpi32_ps(__a, __b); return (0); }")
-+ execute_process(COMMAND ${CMAKE_C_COMPILER} -mavx -o
-+ ${CMAKE_CURRENT_BINARY_DIR}/test_cvtpi32_ps
-+ ${CMAKE_CURRENT_BINARY_DIR}/test_cvtpi32_ps.c
-+ OUTPUT_QUIET ERROR_QUIET
-+ RESULT_VARIABLE avx_compile_result)
-+ if(NOT ${avx_compile_result} EQUAL 0)
-+ OVERRULE_ARCH(avx "Compiler missing cvtpi32_ps instrinsic")
-+ set(HAVE_XGETBV 0)
-+ endif()
-+ file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/test_cvtpi32_ps
-+ ${CMAKE_CURRENT_BINARY_DIR}/test_cvtpi32_ps.c)
-+endif()
-+
-+if(${HAVE_XGETBV})
-+ add_definitions(-DHAVE_XGETBV)
-+endif()
-+
-+########################################################################
- # implement overruling in the ORC case,
- # since ORC always passes flag detection
- ########################################################################
</del></span></pre>
</div>
</div>
</body>
</html>