[127708] trunk/dports/science/gnuradio
michaelld at macports.org
michaelld at macports.org
Sat Nov 1 07:47:28 PDT 2014
Revision: 127708
https://trac.macports.org/changeset/127708
Author: michaelld at macports.org
Date: 2014-11-01 07:47:27 -0700 (Sat, 01 Nov 2014)
Log Message:
-----------
gnuradio:
+ update devel to 95594e06 and next to e1b7ce5a, both 20141031;
+ remove integrated patch.
Modified Paths:
--------------
trunk/dports/science/gnuradio/Portfile
Removed Paths:
-------------
trunk/dports/science/gnuradio/files/patch-volk-shuffle.diff
Modified: trunk/dports/science/gnuradio/Portfile
===================================================================
--- 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)
@@ -106,14 +106,14 @@
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.
name gnuradio-devel
- github.setup gnuradio gnuradio 82779dce49e149d9cb5acc4d77937cda59e676bd
- version ${devel_version}_20141023
+ github.setup gnuradio gnuradio 95594e06a9134a00f104b7ba7713bace3fc59fbc
+ version ${devel_version}_20141031
conflicts gnuradio-legacy gnuradio gnuradio-next
checksums \
- rmd160 7b7e2f39b09b39a9681d3c70049f6859968dac1d \
- sha256 8c921a17d6d0df5ba1081be07ee0a66f137ec45feb2de256d5467d3baef7f2a0
+ rmd160 8a81e304c44bef26221a13a60be4196d7ee78750 \
+ sha256 82bf42b3ec55071d56957632fe7e1f771505a4027d9f85dd3720f6a0101570f9
}
@@ -123,14 +123,14 @@
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.
name gnuradio-next
- github.setup gnuradio gnuradio 3f0646e10afb8a1b4dc4a95a9b3922e7222276f1
- version ${next_version}_20141023
+ github.setup gnuradio gnuradio e1b7ce5ae9543199db29e29292ce30a5bae6402b
+ version ${next_version}_20141031
conflicts gnuradio-legacy gnuradio gnuradio-devel
checksums \
- rmd160 0c1de60a59b7a8fee3226c8af949b6bf8394eaf6 \
- sha256 fd2350e0f60553fb5f49525e93a32ec06a3eb419e7a8fec4f5909bef6f617683
+ rmd160 e67cbd7b82b36bf06f043c611cf7f7926fd34c29 \
+ sha256 b852c7e84fbc31fa38c4ea2bf47b5ffe67a7f3f537fc32a43d2377616f4e33ed
# overload the github livecheck URL with the correct branch
@@ -165,10 +165,6 @@
patchfiles-append \
patch-cmake-expand.devel.diff
- # temporary patch to fix shuffle constants in volk
- patchfiles-append \
- patch-volk-shuffle.diff
-
}
# 3.7 API variants
Deleted: trunk/dports/science/gnuradio/files/patch-volk-shuffle.diff
===================================================================
--- 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)
@@ -1,43 +0,0 @@
---- 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);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141101/2b06a6dd/attachment-0001.html>
More information about the macports-changes
mailing list