[packages/gnuradio] - updated to 3.7.13.4

[baggins]

commit 921f46a9c1943b8a3787dced322b854bd8ae2562
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Mar 30 11:10:09 2019 +0100

    - updated to 3.7.13.4

 gnuradio.spec      | 12 +++++++++---
 link.patch         | 14 +++++++-------
 qwt-includes.patch | 10 ++++++++++
 3 files changed, 26 insertions(+), 10 deletions(-)
---
diff --git a/gnuradio.spec b/gnuradio.spec
index fc27f8f..cbd2717 100644
--- a/gnuradio.spec
+++ b/gnuradio.spec
@@ -5,15 +5,16 @@
 
 Summary:	Software defined radio framework
 Name:		gnuradio
-Version:	3.7.9.2
-Release:	3
+Version:	3.7.13.4
+Release:	1
 License:	GPL v3
 Group:		Applications/Engineering
 Source0:	http://gnuradio.org/releases/gnuradio/%{name}-%{version}.tar.gz
-# Source0-md5:	ec5532a438ae3169069a9909499fa19b
+# Source0-md5:	b38d9cfa7cb4dcb97f5d19ebcabe8dcb
 Patch0:		link.patch
 Patch1:		gsl.patch
 Patch2:		libexec.patch
+Patch3:		qwt-includes.patch
 URL:		http://www.gnuradio.org/
 BuildRequires:	Qt3Support >= 4.8
 BuildRequires:	QtCLucene-devel >= 4.8
@@ -130,6 +131,7 @@ GNU Radio examples.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__mkdir_p} build
@@ -305,6 +307,10 @@ rm -rf $RPM_BUILD_ROOT
 %{py_sitedir}/gnuradio/wxgui/forms
 %{py_sitedir}/gnuradio/wxgui/plotter
 
+%dir %{py_sitedir}/gnuradio/zeromq
+%attr(755,root,root) %{py_sitedir}/gnuradio/zeromq/*.so
+%{py_sitedir}/gnuradio/zeromq/*.py*
+
 %{py_sitedir}/grc_gnuradio
 %dir %{py_sitedir}/pmt
 %attr(755,root,root) %{py_sitedir}/pmt/_pmt_swig.so
diff --git a/link.patch b/link.patch
index 0b4d137..926370a 100644
--- a/link.patch
+++ b/link.patch
@@ -4,7 +4,7 @@ diff -ur gnuradio-3.7.9.2.orig/gnuradio-runtime/lib/CMakeLists.txt gnuradio-3.7.
 @@ -154,7 +154,7 @@
  
  #need to link with librt on ubuntu 11.10 for shm_*
- if(LINUX)
+ if((LINUX) OR (CMAKE_SYSTEM_NAME STREQUAL "kFreeBSD"))
 -    list(APPEND gnuradio_runtime_libs rt)
 +    list(APPEND gnuradio_runtime_libs rt pthread)
  endif()
@@ -43,15 +43,15 @@ diff -ur gnuradio-3.7.9.2.orig/volk/lib/CMakeLists.txt gnuradio-3.7.9.2/volk/lib
      add_library(volk SHARED $<TARGET_OBJECTS:volk_obj>)
 -    target_link_libraries(volk ${volk_libraries})
 +    target_link_libraries(volk ${volk_libraries} m)
- 
-     #Configure target properties
-     set_target_properties(volk_obj PROPERTIES COMPILE_FLAGS "-fPIC")
+     target_include_directories(volk
+         PUBLIC ${PROJECT_BINARY_DIR}/include
+         PUBLIC ${PROJECT_SOURCE_DIR}/include
 @@ -563,7 +563,7 @@
  else()
      #create the volk runtime library
      add_library(volk SHARED ${volk_sources})
 -    target_link_libraries(volk ${volk_libraries})
 +    target_link_libraries(volk ${volk_libraries} m)
-     set_target_properties(volk PROPERTIES SOVERSION ${LIBVER})
-     set_target_properties(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS")
- 
+     include_directories(volk
+         PUBLIC ${PROJECT_BINARY_DIR}/include
+         PUBLIC ${PROJECT_SOURCE_DIR}/include
diff --git a/qwt-includes.patch b/qwt-includes.patch
new file mode 100644
index 0000000..fbd75ee
--- /dev/null
+++ b/qwt-includes.patch
@@ -0,0 +1,10 @@
+--- gnuradio-3.7.13.4/cmake/Modules/FindQwt.cmake~	2018-07-15 18:09:20.000000000 +0200
++++ gnuradio-3.7.13.4/cmake/Modules/FindQwt.cmake	2019-03-30 10:40:11.744273836 +0100
+@@ -15,6 +15,7 @@
+   /usr/local/include/qwt
+   /usr/include/qwt6
+   /usr/include/qwt-qt4
++  /usr/include/qt4/qwt
+   /usr/include/qwt
+   /usr/include/qwt5
+   /opt/local/include/qwt
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gnuradio.git/commitdiff/921f46a9c1943b8a3787dced322b854bd8ae2562