<!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>[127708] 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/127708">127708</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-11-01 07:47:27 -0700 (Sat, 01 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnuradio:
+ update devel to 95594e06 and next to e1b7ce5a, both 20141031;
+ remove integrated patch.</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="#trunkdportssciencegnuradiofilespatchvolkshufflediff">trunk/dports/science/gnuradio/files/patch-volk-shuffle.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 (127707 => 127708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/Portfile 2014-11-01 14:37:49 UTC (rev 127707)
+++ trunk/dports/science/gnuradio/Portfile 2014-11-01 14:47:27 UTC (rev 127708)
</span><span class="lines">@@ -106,14 +106,14 @@
</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><span class="cx"> name gnuradio-devel
</span><del>- github.setup gnuradio gnuradio 82779dce49e149d9cb5acc4d77937cda59e676bd
- version ${devel_version}_20141023
</del><ins>+ github.setup gnuradio gnuradio 95594e06a9134a00f104b7ba7713bace3fc59fbc
+ version ${devel_version}_20141031
</ins><span class="cx">
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-next
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 7b7e2f39b09b39a9681d3c70049f6859968dac1d \
- sha256 8c921a17d6d0df5ba1081be07ee0a66f137ec45feb2de256d5467d3baef7f2a0
</del><ins>+ rmd160 8a81e304c44bef26221a13a60be4196d7ee78750 \
+ sha256 82bf42b3ec55071d56957632fe7e1f771505a4027d9f85dd3720f6a0101570f9
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -123,14 +123,14 @@
</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><span class="cx"> name gnuradio-next
</span><del>- github.setup gnuradio gnuradio 3f0646e10afb8a1b4dc4a95a9b3922e7222276f1
- version ${next_version}_20141023
</del><ins>+ github.setup gnuradio gnuradio e1b7ce5ae9543199db29e29292ce30a5bae6402b
+ version ${next_version}_20141031
</ins><span class="cx">
</span><span class="cx"> conflicts gnuradio-legacy gnuradio gnuradio-devel
</span><span class="cx">
</span><span class="cx"> checksums \
</span><del>- rmd160 0c1de60a59b7a8fee3226c8af949b6bf8394eaf6 \
- sha256 fd2350e0f60553fb5f49525e93a32ec06a3eb419e7a8fec4f5909bef6f617683
</del><ins>+ rmd160 e67cbd7b82b36bf06f043c611cf7f7926fd34c29 \
+ sha256 b852c7e84fbc31fa38c4ea2bf47b5ffe67a7f3f537fc32a43d2377616f4e33ed
</ins><span class="cx">
</span><span class="cx"> # overload the github livecheck URL with the correct branch
</span><span class="cx">
</span><span class="lines">@@ -165,10 +165,6 @@
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-cmake-expand.devel.diff
</span><span class="cx">
</span><del>- # temporary patch to fix shuffle constants in volk
- patchfiles-append \
- patch-volk-shuffle.diff
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # 3.7 API variants
</span></span></pre></div>
<a id="trunkdportssciencegnuradiofilespatchvolkshufflediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/gnuradio/files/patch-volk-shuffle.diff (127707 => 127708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gnuradio/files/patch-volk-shuffle.diff 2014-11-01 14:37:49 UTC (rev 127707)
+++ trunk/dports/science/gnuradio/files/patch-volk-shuffle.diff 2014-11-01 14:47:27 UTC (rev 127708)
</span><span class="lines">@@ -1,43 +0,0 @@
</span><del>---- volk/kernels/volk/volk_32fc_deinterleave_32f_x2.h.orig
-+++ volk/kernels/volk/volk_32fc_deinterleave_32f_x2.h
-@@ -41,9 +41,6 @@ static inline void volk_32fc_deinterleave_32f_x2_a_avx(float* iBuffer, float* qB
- float* qBufferPtr = qBuffer;
-
- unsigned int number = 0;
-- // Mask for real and imaginary parts
-- int realMask = 0x88;
-- int imagMask = 0xdd;
- const unsigned int eighthPoints = num_points / 8;
- __m256 cplxValue1, cplxValue2, complex1, complex2, iValue, qValue;
- for(;number < eighthPoints; number++){
-@@ -58,9 +55,9 @@ static inline void volk_32fc_deinterleave_32f_x2_a_avx(float* iBuffer, float* qB
- complex2 = _mm256_permute2f128_ps(cplxValue1, cplxValue2, 0x31);
-
- // Arrange in i1i2i3i4 format
-- iValue = _mm256_shuffle_ps(complex1, complex2, realMask);
-+ iValue = _mm256_shuffle_ps(complex1, complex2, 0x88);
- // Arrange in q1q2q3q4 format
-- qValue = _mm256_shuffle_ps(complex1, complex2, imagMask);
-+ qValue = _mm256_shuffle_ps(complex1, complex2, 0xdd);
-
- _mm256_store_ps(iBufferPtr, iValue);
- _mm256_store_ps(qBufferPtr, qValue);
---- volk/kernels/volk/volk_32fc_deinterleave_imag_32f.h.orig
-+++ volk/kernels/volk/volk_32fc_deinterleave_imag_32f.h
-@@ -37,7 +37,6 @@
- static inline void volk_32fc_deinterleave_imag_32f_a_avx(float* qBuffer, const lv_32fc_t* complexVector, unsigned int num_points){
- unsigned int number = 0;
- const unsigned int eighthPoints = num_points / 8;
-- int imagMask = 0xdd;
- const float* complexVectorPtr = (const float*)complexVector;
- float* qBufferPtr = qBuffer;
-
-@@ -54,7 +53,7 @@ static inline void volk_32fc_deinterleave_imag_32f_a_avx(float* qBuffer, const l
- complex2 = _mm256_permute2f128_ps(cplxValue1, cplxValue2, 0x31);
-
- // Arrange in q1q2q3q4 format
-- qValue = _mm256_shuffle_ps(complex1, complex2, imagMask);
-+ qValue = _mm256_shuffle_ps(complex1, complex2, 0xdd);
- //iValue = _mm_shuffle_ps(cplxValue1, cplxValue2, _MM_SHUFFLE(3,1,3,1));
-
- _mm256_store_ps(qBufferPtr, qValue);
</del></span></pre>
</div>
</div>
</body>
</html>