development/gnuradio: Updated for version 3.7.13.2.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

4 files changed, 10 insertions, 98 deletions

diff --git a/development/gnuradio/cxx_abi.patch b/development/gnuradio/cxx_abi.patch
deleted file mode 100644
index 80cb562a4a..0000000000
--- a/development/gnuradio/cxx_abi.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnuradio-3.7.10.1.orig/volk/CMakeLists.txt	2017-02-03 09:52:01.876198540 -0800
-+++ gnuradio-3.7.10.1/volk/CMakeLists.txt	2017-02-03 09:48:17.651151087 -0800
-@@ -27,7 +27,6 @@
- 
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
--add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
- 
- set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) #allows this to be a sub-project
- set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) #allows this to be a sub-project
diff --git a/development/gnuradio/gnuradio-cppunit.patch b/development/gnuradio/gnuradio-cppunit.patch
deleted file mode 100644
index 01f58f396d..0000000000
--- a/development/gnuradio/gnuradio-cppunit.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0ac65fe..71378aa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -62,7 +62,7 @@ ENDIF()
- # set(CMAKE_CXX_STANDARD 98)
- 
- IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
--    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
-+#    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
- ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
- ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-@@ -72,7 +72,7 @@ ELSE()
- ENDIF()
- 
- IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
--    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
-+#    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
- ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
- ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
-diff --git a/gnuradio-runtime/lib/math/qa_fxpt.h b/gnuradio-runtime/lib/math/qa_fxpt.h
-index 58a6f02..6020e47 100644
---- a/gnuradio-runtime/lib/math/qa_fxpt.h
-+++ b/gnuradio-runtime/lib/math/qa_fxpt.h
-@@ -25,6 +25,7 @@
- 
- #include <cppunit/extensions/HelperMacros.h>
- #include <cppunit/TestCase.h>
-+#include <memory>
- 
- class qa_fxpt : public CppUnit::TestCase
- {
-diff --git a/gnuradio-runtime/lib/math/qa_fxpt_nco.h b/gnuradio-runtime/lib/math/qa_fxpt_nco.h
-index 1b2cdae..1755904 100644
---- a/gnuradio-runtime/lib/math/qa_fxpt_nco.h
-+++ b/gnuradio-runtime/lib/math/qa_fxpt_nco.h
-@@ -25,6 +25,7 @@
- 
- #include <cppunit/extensions/HelperMacros.h>
- #include <cppunit/TestCase.h>
-+#include <memory>
- 
- class qa_fxpt_nco : public CppUnit::TestCase
- {
-diff --git a/gnuradio-runtime/lib/math/qa_fxpt_vco.h b/gnuradio-runtime/lib/math/qa_fxpt_vco.h
-index 72693f3..76e0b6d 100644
---- a/gnuradio-runtime/lib/math/qa_fxpt_vco.h
-+++ b/gnuradio-runtime/lib/math/qa_fxpt_vco.h
-@@ -25,6 +25,7 @@
- 
- #include <cppunit/extensions/HelperMacros.h>
- #include <cppunit/TestCase.h>
-+#include <memory>
- 
- class qa_fxpt_vco : public CppUnit::TestCase
- {
-diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
-index 13b25ea..8a3d65d 100644
---- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h
-+++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h
-@@ -68,7 +68,7 @@ namespace gr {
-         bool set_frame_size(unsigned int frame_size){return false;};
- 
-       private:
--        static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR;
-+        static const float D_LLR_FACTOR;
-         unsigned int d_frozen_bit_counter;
- 
-       protected:
-
diff --git a/development/gnuradio/gnuradio.SlackBuild b/development/gnuradio/gnuradio.SlackBuild
index b32e7457c6..0c395d8a07 100644
--- a/development/gnuradio/gnuradio.SlackBuild
+++ b/development/gnuradio/gnuradio.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for gnuradio
 
 # Copyright 2013 Georgi Kolev, Bulgaria
-# Copyright 2015, 2016, 2017 Panagiotis Nikolaou, Culver City, CA
+# Copyright 2015-2018 Panagiotis Nikolaou, Culver City, CA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,8 +24,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=gnuradio
-VERSION=${VERSION:-3.7.11}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-3.7.13.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -61,7 +61,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -73,17 +73,11 @@ find -L . \
 # install docs in the right place
 sed -i "s|\${GR_DATA_DIR}/doc|doc|" CMakeLists.txt
 
-# Fix build with boost
-# https://github.com/gnuradio/volk/commit/e5fec2aaacc8a130bcff84f1f3bbd9718250f029
-patch -p1 < $CWD/cxx_abi.patch
-
-patch -p1 < $CWD/gnuradio-cppunit.patch
-
 mkdir -p build
 cd build
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11 -fpermissive" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc \
     -DLIB_SUFFIX=$LIBDIRSUFFIX \
@@ -98,7 +92,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING README README.hacking $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README.md README.hacking CHANGELOG.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/gnuradio/gnuradio.info b/development/gnuradio/gnuradio.info
index 569cdc2d5a..0ad250abb3 100644
--- a/development/gnuradio/gnuradio.info
+++ b/development/gnuradio/gnuradio.info
@@ -1,10 +1,10 @@
 PRGNAM="gnuradio"
-VERSION="3.7.11"
+VERSION="3.7.13.2"
 HOMEPAGE="https://gnuradio.org"
-DOWNLOAD="https://gnuradio.org/releases/gnuradio/gnuradio-3.7.11.tar.gz"
-MD5SUM="7b7b871237ae6fc109d203f78c4654ef"
+DOWNLOAD="https://master.dl.sourceforge.net/project/slackbuildsdirectlinks/gnuradio/v3.7.13.2.tar.gz"
+MD5SUM="34a81827c589823d1a0de8a45b7fd22f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="python-cheetah"
+REQUIRES="Mako six python-cheetah"
 MAINTAINER="Panagiotis Nikolaou"
 EMAIL="hostmaster@slackonly.com"