[gnuradio/f20] Workaround for volk memalign (by volk-memalign-fix patch)

[Jaroslav Škarvada]

commit a1a75f2a39a51d1d0a5d263dbcdb80ff5ae84de9
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Jan 26 13:42:51 2015 +0100

    Workaround for volk memalign (by volk-memalign-fix patch)
    
      Resolves: rhbz#1185710

 gnuradio-3.7.3-volk-memalign-fix.patch |   14 ++++++++++++++
 gnuradio.spec                          |   10 +++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/gnuradio-3.7.3-volk-memalign-fix.patch b/gnuradio-3.7.3-volk-memalign-fix.patch
new file mode 100644
index 0000000..df99efc
--- /dev/null
+++ b/gnuradio-3.7.3-volk-memalign-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/volk/lib/volk_malloc.c b/volk/lib/volk_malloc.c
+index b2b77dd..e913ffc 100644
+--- a/volk/lib/volk_malloc.c
++++ b/volk/lib/volk_malloc.c
+@@ -54,7 +54,8 @@
+ 
+ // Otherwise, test if we are a POSIX or X/Open system
+ // This only has a restriction that alignment be a power of 2.
+-#if _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
++//#if _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600
++#if 0
+ 
+ void *volk_malloc(size_t size, size_t alignment)
+ {
diff --git a/gnuradio.spec b/gnuradio.spec
index aa369a7..8c0f773 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -19,7 +19,7 @@
 
 Name:		gnuradio
 Version:	3.7.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Software defined radio framework
 
 Group:		Applications/Engineering
@@ -50,6 +50,8 @@ Requires:	numpy, wxPython, scipy, portaudio, python-lxml
 Requires:	pygtk2, python-cheetah, PyQt4, PyQwt, PyOpenGL
 Obsoletes:	usrp < 3.3.0-1
 Obsoletes:	grc < 0.80-1
+# rhbz#1185710, workaround from upstream
+Patch0:		gnuradio-3.7.3-volk-memalign-fix.patch
 
 %description
 GNU Radio is a collection of software that when combined with minimal
@@ -88,6 +90,8 @@ GNU Radio examples
 %prep
 %setup -q
 
+%patch0 -p1 -b .volk-memalign-fix
+
 #force regeneration of cached moc output files
 find . -name "*_moc.cc" -exec rm {} \;
 
@@ -174,6 +178,10 @@ rm -rf %{buildroot}
 %{_datadir}/gnuradio/examples
 
 %changelog
+* Mon Jan 26 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 3.7.3-3
+- Workaround for volk memalign (by volk-memalign-fix patch)
+  Resolves: rhbz#1185710
+
 * Tue Oct  7 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 3.7.3-2
 - Added PyOpenGL requirement
   Resolves: rhbz#1049770