[141042] trunk/dports/science/volk

[michaelld at macports.org]

Revision: 141042
          https://trac.macports.org/changeset/141042
Author:   michaelld at macports.org
Date:     2015-10-08 09:39:41 -0700 (Thu, 08 Oct 2015)
Log Message:
-----------
volk-devel: update to f0b72239 (20151007), removing integrated patch.

Modified Paths:
--------------
    trunk/dports/science/volk/Portfile

Removed Paths:
-------------
    trunk/dports/science/volk/files/patch-kernels_volk_volk_32fc_s32fc_x2_rotator_32fc.h.diff

Modified: trunk/dports/science/volk/Portfile
===================================================================
--- trunk/dports/science/volk/Portfile	2015-10-08 14:30:57 UTC (rev 141041)
+++ trunk/dports/science/volk/Portfile	2015-10-08 16:39:41 UTC (rev 141042)
@@ -36,18 +36,15 @@
 
 subport volk-devel {
 
-    github.setup    gnuradio volk 015b1e271ac32e100e50670fa1be6d2d4b1294c1
-    version         20151006
+    github.setup    gnuradio volk f0b722392950bf7ede7b32f5ff60019bce7a8592
+    version         20151007
     checksums       \
-        rmd160 4f2253819bbe2cf8c059c6f4ea40a12586979c30 \
-        sha256 f4fd95c3f919130d71020d5e3e8e48af678a10b53f671789ddb4b3748bacab38
+        rmd160 04d7cd2dcc0b024e800d27acefbe32cc2617ed84 \
+        sha256 711476600679dc71cc44b6953de9a5fff9c11a5efd1dbd1c6af7bdeea30184cc
     conflicts       volk
     long_description ${long_description} ${subport} \
 provides the Volk GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
 
-    # temporary patch to fix avx rotator build issue
-    patchfiles-append patch-kernels_volk_volk_32fc_s32fc_x2_rotator_32fc.h.diff
-
 }
 
 # override githib PortGroup homepage setting

Deleted: trunk/dports/science/volk/files/patch-kernels_volk_volk_32fc_s32fc_x2_rotator_32fc.h.diff
===================================================================
--- trunk/dports/science/volk/files/patch-kernels_volk_volk_32fc_s32fc_x2_rotator_32fc.h.diff	2015-10-08 14:30:57 UTC (rev 141041)
+++ trunk/dports/science/volk/files/patch-kernels_volk_volk_32fc_s32fc_x2_rotator_32fc.h.diff	2015-10-08 16:39:41 UTC (rev 141042)
@@ -1,36 +0,0 @@
---- kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h.orig
-+++ kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h
-@@ -411,11 +411,11 @@ static inline void volk_32fc_s32fc_x2_rotator_32fc_a_avx(lv_32fc_t* outVector, c
-         cPtr += 4;
-     }
-     if (i) {
--        tmp1 = _mm_mul_ps(phase_Val, phase_Val);
--        tmp2 = _mm_hadd_ps(tmp1, tmp1);
--        tmp1 = _mm_shuffle_ps(tmp2, tmp2, 0xD8);
--        tmp2 = _mm_sqrt_ps(tmp1);
--        phase_Val = _mm_div_ps(phase_Val, tmp2);
-+        tmp1 = _mm256_mul_ps(phase_Val, phase_Val);
-+        tmp2 = _mm256_hadd_ps(tmp1, tmp1);
-+        tmp1 = _mm256_shuffle_ps(tmp2, tmp2, 0xD8);
-+        tmp2 = _mm256_sqrt_ps(tmp1);
-+        phase_Val = _mm256_div_ps(phase_Val, tmp2);
-     }
- 
-     _mm256_storeu_ps((float*)phase_Ptr, phase_Val);
-@@ -517,11 +517,11 @@ static inline void volk_32fc_s32fc_x2_rotator_32fc_u_avx(lv_32fc_t* outVector, c
-         cPtr += 4;
-     }
-     if (i) {
--        tmp1 = _mm_mul_ps(phase_Val, phase_Val);
--        tmp2 = _mm_hadd_ps(tmp1, tmp1);
--        tmp1 = _mm_shuffle_ps(tmp2, tmp2, 0xD8);
--        tmp2 = _mm_sqrt_ps(tmp1);
--        phase_Val = _mm_div_ps(phase_Val, tmp2);
-+        tmp1 = _mm256_mul_ps(phase_Val, phase_Val);
-+        tmp2 = _mm256_hadd_ps(tmp1, tmp1);
-+        tmp1 = _mm256_shuffle_ps(tmp2, tmp2, 0xD8);
-+        tmp2 = _mm256_sqrt_ps(tmp1);
-+        phase_Val = _mm256_div_ps(phase_Val, tmp2);
-     }
- 
-     _mm256_storeu_ps((float*)phase_Ptr, phase_Val);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151008/4c901597/attachment.html>