Update to 3.7.8

USE_GCC=yes causes the build to fail on systems where clang and libc++ are
used by default (see bug 202143, for example). This essentially means
comms/gnuradio currently only builds on 9.x. The problem is caused by the
fact that on 10.x and later boost is likely built using clang and libc++,
but USE_GCC=yes forces gnuradio to be built with GCC and libstdc++. Ports
r392951 mentioned USE_GCC=yes was added because "clang's builtins were
conflicting with gnuradio", which does not seem to happen in my tests at least.

PR:		ports/203500
Submitted by:	takefu@airport.fm

4 files changed, 30 insertions, 15 deletions

diff --git a/comms/gnuradio/files/patch-CMakeLists.txt b/comms/gnuradio/files/patch-CMakeLists.txt
index a1b04f8084ea..d37e7b58742b 100644
--- a/comms/gnuradio/files/patch-CMakeLists.txt
+++ b/comms/gnuradio/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2015-05-12 09:39:44 UTC
+--- CMakeLists.txt.orig	2015-07-25 20:27:13 UTC
 +++ CMakeLists.txt
 @@ -29,6 +29,11 @@ cmake_minimum_required(VERSION 2.6)
  project(gnuradio CXX C)
@@ -15,7 +15,7 @@
 @@ -144,6 +149,14 @@ string(REPLACE "\n" " \\n" COMPILER_INFO
  ########################################################################
  include(GrPlatform) #define LIB_SUFFIX
- set(GR_RUNTIME_DIR      bin)
+ set(GR_RUNTIME_DIR     bin CACHE PATH "Path to install all binaries")
 +########################################################################
 +# FreeBSD libdata vs. lib
 +#
@@ -24,10 +24,10 @@
 +else()
 +set(GR_PKGCONFIG_DIR      lib${LIB_SUFFIX})
 +endif()
- set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
- set(GR_INCLUDE_DIR      include)
- set(GR_DATA_DIR         share)
-@@ -228,6 +241,42 @@ add_custom_target(uninstall
+ set(GR_LIBRARY_DIR     lib${LIB_SUFFIX} CACHE PATH "Path to install libraries")
+ set(GR_INCLUDE_DIR     include CACHE PATH "Path to install header files")
+ set(GR_DATA_DIR        share CACHE PATH "Base location for data")
+@@ -229,6 +242,42 @@ add_custom_target(uninstall
  include(GrBoost)
  
  ########################################################################
@@ -70,7 +70,7 @@
  # Enable python component
  ########################################################################
  find_package(PythonLibs 2)
-@@ -353,11 +402,13 @@ GR_LOGGING()
+@@ -354,11 +403,13 @@ GR_LOGGING()
  ########################################################################
  # Distribute the README file
  ########################################################################
diff --git a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
index c16a36bae8c4..87f5240ea285 100644
--- a/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
+++ b/comms/gnuradio/files/patch-docs_doxygen_Doxyfile.in
@@ -5,7 +5,7 @@
  # set the path where dot can find it.
  
 -DOT_FONTPATH           =
-+DOT_FONTPATH           =	/usr/local/share/fonts/freefont-ttf
++DOT_FONTPATH           =	%%PREFIX%%/share/fonts/freefont-ttf
  
  # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
  # will generate a graph for each documented class showing the direct and
diff --git a/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc b/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc
new file mode 100644
index 000000000000..85f071c00f16
--- /dev/null
+++ b/comms/gnuradio/files/patch-gr-dtv__lib__dvbt__dvbt_reed_solomon.cc
@@ -0,0 +1,11 @@
+--- gr-dtv/lib/dvbt/dvbt_reed_solomon.cc.orig	2015-08-05 18:54:39 UTC
++++ gr-dtv/lib/dvbt/dvbt_reed_solomon.cc
+@@ -42,7 +42,7 @@ namespace gr {
+       d_p = p; d_m = m;
+ 
+       //maximum number of elements in the GF(p^m)
+-      int q = powl(p, m);
++      int q = pow(p, m);
+ 
+       d_gf_exp = new unsigned char[q];
+       if (d_gf_exp == NULL) {
diff --git a/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c b/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c
index 98d3a38a0c10..a64dee1728d0 100644
--- a/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c
+++ b/comms/gnuradio/files/patch-volk_tmpl_volk__cpu.tmpl.c
@@ -1,10 +1,13 @@
---- volk/tmpl/volk_cpu.tmpl.c.orig	2015-05-12 09:39:44 UTC
+--- volk/tmpl/volk_cpu.tmpl.c.orig	2015-07-09 02:00:33 UTC
 +++ volk/tmpl/volk_cpu.tmpl.c
-@@ -36,7 +36,31 @@ struct VOLK_CPU volk_cpu;
-     #if defined(HAVE_CPUID_H)
-         #include <cpuid.h>
-     #else
--        #include "gcc_x86_cpuid.h"
+@@ -34,7 +34,35 @@ struct VOLK_CPU volk_cpu;
+ 
+ //implement get cpuid for gcc compilers using a system or local copy of cpuid.h
+ #if defined(__GNUC__)
+-    #include <cpuid.h>
++    #if defined(HAVE_CPUID_H)
++        #include <cpuid.h>
++    #else
 +	#ifdef __FreeBSD__
 +#if __i386__
 +#define __cpuid(__level, __eax, __ebx, __ecx, __edx) \
@@ -30,6 +33,7 @@
 +	#else
 +	        #include "gcc_x86_cpuid.h"
 +	#endif
-     #endif
++    #endif
      #define cpuid_x86(op, r) __get_cpuid(op, (unsigned int *)r+0, (unsigned int *)r+1, (unsigned int *)r+2, (unsigned int *)r+3)
  
+     /* Return Intel AVX extended CPU capabilities register.