diff -Nru sonic-visualiser-3.1.1/debian/changelog sonic-visualiser-3.1.1/debian/changelog
--- sonic-visualiser-3.1.1/debian/changelog	2018-08-21 20:37:33.000000000 +0000
+++ sonic-visualiser-3.1.1/debian/changelog	2018-12-28 00:29:57.000000000 +0000
@@ -1,3 +1,11 @@
+sonic-visualiser (3.1.1-1+rpi1) buster-staging; urgency=medium
+
+  * Replace c++11 with c++14 and gnu++11 with gnu++14 to allow build with new capnp.
+  * Fix clean target.
+  * Use sed to replace gnu++11 with c++11 in generated Makefiles too.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 28 Dec 2018 00:29:57 +0000
+
 sonic-visualiser (3.1.1-1) unstable; urgency=medium
 
   * New upstream version 3.1.1
diff -Nru sonic-visualiser-3.1.1/debian/patches/05-c++-14.patch sonic-visualiser-3.1.1/debian/patches/05-c++-14.patch
--- sonic-visualiser-3.1.1/debian/patches/05-c++-14.patch	1970-01-01 00:00:00.000000000 +0000
+++ sonic-visualiser-3.1.1/debian/patches/05-c++-14.patch	2018-12-28 00:29:57.000000000 +0000
@@ -0,0 +1,1204 @@
+Description:  Replace c++11 with c++14 to allow build with new capnp.
+ The package seems to mention -std=c++11 and std=gnu++11 in a large 
+ number of places, I Just did a bulk search and replace which may 
+ not have been the most elegant soloution but it works.
+Author: Peter Michael Green <plugwash@raspbian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2018-12-28
+
+Index: sonic-visualiser-3.1.1/acinclude.m4
+===================================================================
+--- sonic-visualiser-3.1.1.orig/acinclude.m4
++++ sonic-visualiser-3.1.1/acinclude.m4
+@@ -134,8 +134,8 @@ esac
+ #   standard; if necessary, add switches to CXXFLAGS to enable support.
+ #
+ #   The first argument, if specified, indicates whether you insist on an
+-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+-#   -std=c++11).  If neither is specified, you get whatever works, with
++#   extended mode (e.g. -std=gnu++14) or a strict conformance mode (e.g.
++#   -std=c++14).  If neither is specified, you get whatever works, with
+ #   preference for an extended mode.
+ #
+ #   The second argument, if specified 'mandatory' or if left unspecified,
+@@ -205,7 +205,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dn
+ 
+   m4_if([$1], [noext], [], [dnl
+   if test x$ac_success = xno; then
+-    for switch in -std=gnu++11 -std=gnu++0x; do
++    for switch in -std=gnu++14 -std=gnu++0x; do
+       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+       AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                      $cachevar,
+@@ -225,7 +225,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dn
+ 
+   m4_if([$1], [ext], [], [dnl
+   if test x$ac_success = xno; then
+-    for switch in -std=c++11 -std=c++0x; do
++    for switch in -std=c++14 -std=c++0x; do
+       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+       AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                      $cachevar,
+Index: sonic-visualiser-3.1.1/bqaudioio/Makefile
+===================================================================
+--- sonic-visualiser-3.1.1.orig/bqaudioio/Makefile
++++ sonic-visualiser-3.1.1/bqaudioio/Makefile
+@@ -4,7 +4,7 @@ HEADERS	:= $(wildcard src/*.h) $(wildcar
+ OBJECTS	:= $(patsubst %.cpp,%.o,$(SOURCES))
+ LIBRARY	:= libbqaudioio.a
+ 
+-CXXFLAGS := -std=c++11 -I. -I./bqaudioio -I../bqvec -I../bqresample -DHAVE_JACK -DHAVE_LIBPULSE -DHAVE_PORTAUDIO
++CXXFLAGS := -std=c++14 -I. -I./bqaudioio -I../bqvec -I../bqresample -DHAVE_JACK -DHAVE_LIBPULSE -DHAVE_PORTAUDIO
+ 
+ all:	$(LIBRARY)
+ 
+Index: sonic-visualiser-3.1.1/configure
+===================================================================
+--- sonic-visualiser-3.1.1.orig/configure
++++ sonic-visualiser-3.1.1/configure
+@@ -709,6 +709,7 @@ infodir
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -824,6 +825,7 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE}'
+@@ -1076,6 +1078,15 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
++  -runstatedir | --runstatedir | --runstatedi | --runstated \
++  | --runstate | --runstat | --runsta | --runst | --runs \
++  | --run | --ru | --r)
++    ac_prev=runstatedir ;;
++  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++  | --run=* | --ru=* | --r=*)
++    runstatedir=$ac_optarg ;;
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1213,7 +1224,7 @@ fi
+ for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ 		datadir sysconfdir sharedstatedir localstatedir includedir \
+ 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+-		libdir localedir mandir
++		libdir localedir mandir runstatedir
+ do
+   eval ac_val=\$$ac_var
+   # Remove trailing slashes.
+@@ -1366,6 +1377,7 @@ Fine tuning of the installation director
+   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+   --libdir=DIR            object code libraries [EPREFIX/lib]
+   --includedir=DIR        C header files [PREFIX/include]
+   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+@@ -3512,7 +3524,7 @@ $as_echo "$ax_cv_cxx_compile_cxx11" >&6;
+ 
+ 
+     if test x$ac_success = xno; then
+-    for switch in -std=c++11 -std=c++0x; do
++    for switch in -std=c++14 -std=c++0x; do
+       cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
+ $as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
+@@ -4257,24 +4269,27 @@ fi
+ 
+ fi
+ if test x$QMAKE = x ; then
+-   	# Extract the first word of "qmake-qt5", so it can be a program name with args.
+-set dummy qmake-qt5; ac_word=$2
++	if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}qmake-qt5", so it can be a program name with args.
++set dummy ${ac_tool_prefix}qmake-qt5; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_QMAKE+:} false; then :
++if ${ac_cv_path_QMAKE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test -n "$QMAKE"; then
+-  ac_cv_prog_QMAKE="$QMAKE" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  case $QMAKE in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_QMAKE="$QMAKE" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_QMAKE="qmake-qt5"
++    ac_cv_path_QMAKE="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -4282,9 +4297,10 @@ done
+   done
+ IFS=$as_save_IFS
+ 
++  ;;
++esac
+ fi
+-fi
+-QMAKE=$ac_cv_prog_QMAKE
++QMAKE=$ac_cv_path_QMAKE
+ if test -n "$QMAKE"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE" >&5
+ $as_echo "$QMAKE" >&6; }
+@@ -4295,25 +4311,28 @@ fi
+ 
+ 
+ fi
+-if test x$QMAKE = x ; then
+-   	# Extract the first word of "qt5-qmake", so it can be a program name with args.
+-set dummy qt5-qmake; ac_word=$2
++if test -z "$ac_cv_path_QMAKE"; then
++  ac_pt_QMAKE=$QMAKE
++  # Extract the first word of "qmake-qt5", so it can be a program name with args.
++set dummy qmake-qt5; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_QMAKE+:} false; then :
++if ${ac_cv_path_ac_pt_QMAKE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test -n "$QMAKE"; then
+-  ac_cv_prog_QMAKE="$QMAKE" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  case $ac_pt_QMAKE in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_ac_pt_QMAKE="$ac_pt_QMAKE" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_QMAKE="qt5-qmake"
++    ac_cv_path_ac_pt_QMAKE="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -4321,9 +4340,67 @@ done
+   done
+ IFS=$as_save_IFS
+ 
++  ;;
++esac
+ fi
++ac_pt_QMAKE=$ac_cv_path_ac_pt_QMAKE
++if test -n "$ac_pt_QMAKE"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_QMAKE" >&5
++$as_echo "$ac_pt_QMAKE" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-QMAKE=$ac_cv_prog_QMAKE
++
++  if test "x$ac_pt_QMAKE" = x; then
++    QMAKE=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    QMAKE=$ac_pt_QMAKE
++  fi
++else
++  QMAKE="$ac_cv_path_QMAKE"
++fi
++
++fi
++if test x$QMAKE = x ; then
++	if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}qt5-qmake", so it can be a program name with args.
++set dummy ${ac_tool_prefix}qt5-qmake; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_QMAKE+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $QMAKE in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_QMAKE="$QMAKE" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_QMAKE="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++QMAKE=$ac_cv_path_QMAKE
+ if test -n "$QMAKE"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE" >&5
+ $as_echo "$QMAKE" >&6; }
+@@ -4334,25 +4411,28 @@ fi
+ 
+ 
+ fi
+-if test x$QMAKE = x ; then
+-   	# Extract the first word of "qmake", so it can be a program name with args.
+-set dummy qmake; ac_word=$2
++if test -z "$ac_cv_path_QMAKE"; then
++  ac_pt_QMAKE=$QMAKE
++  # Extract the first word of "qt5-qmake", so it can be a program name with args.
++set dummy qt5-qmake; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_QMAKE+:} false; then :
++if ${ac_cv_path_ac_pt_QMAKE+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test -n "$QMAKE"; then
+-  ac_cv_prog_QMAKE="$QMAKE" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  case $ac_pt_QMAKE in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_ac_pt_QMAKE="$ac_pt_QMAKE" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+     for ac_exec_ext in '' $ac_executable_extensions; do
+   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_QMAKE="qmake"
++    ac_cv_path_ac_pt_QMAKE="$as_dir/$ac_word$ac_exec_ext"
+     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -4360,9 +4440,67 @@ done
+   done
+ IFS=$as_save_IFS
+ 
++  ;;
++esac
+ fi
++ac_pt_QMAKE=$ac_cv_path_ac_pt_QMAKE
++if test -n "$ac_pt_QMAKE"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_QMAKE" >&5
++$as_echo "$ac_pt_QMAKE" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+-QMAKE=$ac_cv_prog_QMAKE
++
++  if test "x$ac_pt_QMAKE" = x; then
++    QMAKE=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    QMAKE=$ac_pt_QMAKE
++  fi
++else
++  QMAKE="$ac_cv_path_QMAKE"
++fi
++
++fi
++if test x$QMAKE = x ; then
++	if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}qmake", so it can be a program name with args.
++set dummy ${ac_tool_prefix}qmake; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_QMAKE+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $QMAKE in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_QMAKE="$QMAKE" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_QMAKE="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++QMAKE=$ac_cv_path_QMAKE
+ if test -n "$QMAKE"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QMAKE" >&5
+ $as_echo "$QMAKE" >&6; }
+@@ -4373,6 +4511,63 @@ fi
+ 
+ 
+ fi
++if test -z "$ac_cv_path_QMAKE"; then
++  ac_pt_QMAKE=$QMAKE
++  # Extract the first word of "qmake", so it can be a program name with args.
++set dummy qmake; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_ac_pt_QMAKE+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $ac_pt_QMAKE in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_ac_pt_QMAKE="$ac_pt_QMAKE" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_ac_pt_QMAKE="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++ac_pt_QMAKE=$ac_cv_path_ac_pt_QMAKE
++if test -n "$ac_pt_QMAKE"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_QMAKE" >&5
++$as_echo "$ac_pt_QMAKE" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_pt_QMAKE" = x; then
++    QMAKE=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    QMAKE=$ac_pt_QMAKE
++  fi
++else
++  QMAKE="$ac_cv_path_QMAKE"
++fi
++
++fi
+ if test x$QMAKE = x ; then
+    	as_fn_error $? "
+ Failed to find the required qmake-qt5 or qmake program.  Please
+@@ -4424,7 +4619,7 @@ CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS"
+ CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
+ 
+ if test "x$GCC" = "xyes"; then
+-   	CXXFLAGS_ANY="-std=c++11 -fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
++   	CXXFLAGS_ANY="-std=c++14 -fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+         CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -O2 -Werror"
+    	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O3 -ffast-math"
+    	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
+@@ -4496,8 +4691,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bz2" >&5
++$as_echo_n "checking for bz2... " >&6; }
+ 
+ if test -n "$bz2_CFLAGS"; then
+     pkg_cv_bz2_CFLAGS="$bz2_CFLAGS"
+@@ -4537,7 +4732,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -4556,7 +4751,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -4647,8 +4842,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw3" >&5
++$as_echo_n "checking for fftw3... " >&6; }
+ 
+ if test -n "$fftw3_CFLAGS"; then
+     pkg_cv_fftw3_CFLAGS="$fftw3_CFLAGS"
+@@ -4688,7 +4883,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -4707,7 +4902,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -4798,8 +4993,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fftw3f" >&5
++$as_echo_n "checking for fftw3f... " >&6; }
+ 
+ if test -n "$fftw3f_CFLAGS"; then
+     pkg_cv_fftw3f_CFLAGS="$fftw3f_CFLAGS"
+@@ -4839,7 +5034,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -4858,7 +5053,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -4949,8 +5144,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sndfile" >&5
++$as_echo_n "checking for sndfile... " >&6; }
+ 
+ if test -n "$sndfile_CFLAGS"; then
+     pkg_cv_sndfile_CFLAGS="$sndfile_CFLAGS"
+@@ -4990,7 +5185,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -5009,7 +5204,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -5100,8 +5295,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsamplerate" >&5
++$as_echo_n "checking for libsamplerate... " >&6; }
+ 
+ if test -n "$libsamplerate_CFLAGS"; then
+     pkg_cv_libsamplerate_CFLAGS="$libsamplerate_CFLAGS"
+@@ -5141,7 +5336,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -5160,7 +5355,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -5251,8 +5446,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rubberband" >&5
++$as_echo_n "checking for rubberband... " >&6; }
+ 
+ if test -n "$rubberband_CFLAGS"; then
+     pkg_cv_rubberband_CFLAGS="$rubberband_CFLAGS"
+@@ -5292,7 +5487,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -5311,7 +5506,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -5402,8 +5597,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sord" >&5
++$as_echo_n "checking for sord... " >&6; }
+ 
+ if test -n "$sord_CFLAGS"; then
+     pkg_cv_sord_CFLAGS="$sord_CFLAGS"
+@@ -5443,7 +5638,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -5462,7 +5657,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -5553,8 +5748,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for serd" >&5
++$as_echo_n "checking for serd... " >&6; }
+ 
+ if test -n "$serd_CFLAGS"; then
+     pkg_cv_serd_CFLAGS="$serd_CFLAGS"
+@@ -5594,7 +5789,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -5613,7 +5808,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -5689,8 +5884,8 @@ fi
+ # version with pkg-config, we check for the symbol with the compiler.
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for capnp >= 0.6" >&5
+-$as_echo_n "checking for capnp >= 0.6... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for capnp" >&5
++$as_echo_n "checking for capnp... " >&6; }
+ 
+ if test -n "$capnp_CFLAGS"; then
+     pkg_cv_capnp_CFLAGS="$capnp_CFLAGS"
+@@ -5730,7 +5925,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -5749,7 +5944,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module capnp using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module capnp using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find required module capnp using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find required module capnp using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -5801,8 +5996,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for liblo" >&5
++$as_echo_n "checking for liblo... " >&6; }
+ 
+ if test -n "$liblo_CFLAGS"; then
+     pkg_cv_liblo_CFLAGS="$liblo_CFLAGS"
+@@ -5842,7 +6037,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -5861,7 +6056,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -5956,8 +6151,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for portaudio" >&5
++$as_echo_n "checking for portaudio... " >&6; }
+ 
+ if test -n "$portaudio_CFLAGS"; then
+     pkg_cv_portaudio_CFLAGS="$portaudio_CFLAGS"
+@@ -5997,7 +6192,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -6016,7 +6211,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -6111,8 +6306,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
++$as_echo_n "checking for JACK... " >&6; }
+ 
+ if test -n "$JACK_CFLAGS"; then
+     pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
+@@ -6152,7 +6347,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -6171,7 +6366,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -6266,8 +6461,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpulse" >&5
++$as_echo_n "checking for libpulse... " >&6; }
+ 
+ if test -n "$libpulse_CFLAGS"; then
+     pkg_cv_libpulse_CFLAGS="$libpulse_CFLAGS"
+@@ -6307,7 +6502,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -6326,7 +6521,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -6421,8 +6616,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lrdf" >&5
++$as_echo_n "checking for lrdf... " >&6; }
+ 
+ if test -n "$lrdf_CFLAGS"; then
+     pkg_cv_lrdf_CFLAGS="$lrdf_CFLAGS"
+@@ -6462,7 +6657,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -6481,7 +6676,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -6576,8 +6771,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for oggz" >&5
++$as_echo_n "checking for oggz... " >&6; }
+ 
+ if test -n "$oggz_CFLAGS"; then
+     pkg_cv_oggz_CFLAGS="$oggz_CFLAGS"
+@@ -6617,7 +6812,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -6636,7 +6831,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -6731,8 +6926,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fishsound" >&5
++$as_echo_n "checking for fishsound... " >&6; }
+ 
+ if test -n "$fishsound_CFLAGS"; then
+     pkg_cv_fishsound_CFLAGS="$fishsound_CFLAGS"
+@@ -6772,7 +6967,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -6791,7 +6986,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -6886,8 +7081,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mad" >&5
++$as_echo_n "checking for mad... " >&6; }
+ 
+ if test -n "$mad_CFLAGS"; then
+     pkg_cv_mad_CFLAGS="$mad_CFLAGS"
+@@ -6927,7 +7122,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -6946,7 +7141,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -7041,8 +7236,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for id3tag" >&5
++$as_echo_n "checking for id3tag... " >&6; }
+ 
+ if test -n "$id3tag_CFLAGS"; then
+     pkg_cv_id3tag_CFLAGS="$id3tag_CFLAGS"
+@@ -7082,7 +7277,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -7101,7 +7296,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+@@ -7198,8 +7393,8 @@ fi
+ if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_VERSION_TEST" >&5
+-$as_echo_n "checking for $SV_MODULE_VERSION_TEST... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
++$as_echo_n "checking for X11... " >&6; }
+ 
+ if test -n "$X11_CFLAGS"; then
+     pkg_cv_X11_CFLAGS="$X11_CFLAGS"
+@@ -7239,7 +7434,7 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+@@ -7258,7 +7453,7 @@ fi
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+ elif test $pkg_failed = untried; then
+-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
+ $as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
+Index: sonic-visualiser-3.1.1/configure.ac
+===================================================================
+--- sonic-visualiser-3.1.1.orig/configure.ac
++++ sonic-visualiser-3.1.1/configure.ac
+@@ -53,7 +53,7 @@ CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS"
+ CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
+ 
+ if test "x$GCC" = "xyes"; then
+-   	CXXFLAGS_ANY="-std=c++11 -fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
++   	CXXFLAGS_ANY="-std=c++14 -fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
+         CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -O2 -Werror"
+    	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O3 -ffast-math"
+    	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
+Index: sonic-visualiser-3.1.1/piper-cpp/Makefile
+===================================================================
+--- sonic-visualiser-3.1.1.orig/piper-cpp/Makefile
++++ sonic-visualiser-3.1.1/piper-cpp/Makefile
+@@ -7,7 +7,7 @@ INCFLAGS	:= -Iext -Iext/sord -Iext/serd
+ OPTFLAGS	:= -O3 -fPIC
+ 
+ CFLAGS		:= -Wall -std=c99 $(OPTFLAGS) $(INCFLAGS)
+-CXXFLAGS	:= -Wall -Wextra -Werror -Wno-error=unused-parameter -std=c++11 $(OPTFLAGS) $(INCFLAGS)
++CXXFLAGS	:= -Wall -Wextra -Werror -Wno-error=unused-parameter -std=c++14 $(OPTFLAGS) $(INCFLAGS)
+ 
+ LDFLAGS		:= $(VAMPSDK_DIR)/libvamp-hostsdk.a -L/usr/local/lib -lcapnp -lkj 
+ 
+Index: sonic-visualiser-3.1.1/piper-cpp/ext/json11/CMakeLists.txt
+===================================================================
+--- sonic-visualiser-3.1.1.orig/piper-cpp/ext/json11/CMakeLists.txt
++++ sonic-visualiser-3.1.1/piper-cpp/ext/json11/CMakeLists.txt
+@@ -12,7 +12,7 @@ option(JSON11_BUILD_TESTS "Build unit te
+ option(JSON11_ENABLE_DR1467_CANARY "Enable canary test for DR 1467" OFF)
+ 
+ if(CMAKE_VERSION VERSION_LESS "3")
+-  add_definitions(-std=c++11)
++  add_definitions(-std=c++14)
+ else()
+   set(CMAKE_CXX_STANDARD 11)
+   set(CMAKE_CXX_STANDARD_REQUIRED ON)
+Index: sonic-visualiser-3.1.1/piper-cpp/ext/json11/Makefile
+===================================================================
+--- sonic-visualiser-3.1.1.orig/piper-cpp/ext/json11/Makefile
++++ sonic-visualiser-3.1.1/piper-cpp/ext/json11/Makefile
+@@ -7,7 +7,7 @@ CANARY_ARGS = -DJSON11_ENABLE_DR1467_CAN
+ endif
+ 
+ test: json11.cpp json11.hpp test.cpp
+-	$(CXX) $(CANARY_ARGS) -O -std=c++11 json11.cpp test.cpp -o test -fno-rtti -fno-exceptions
++	$(CXX) $(CANARY_ARGS) -O -std=c++14 json11.cpp test.cpp -o test -fno-rtti -fno-exceptions
+ 
+ clean:
+ 	if [ -e test ]; then rm test; fi
+Index: sonic-visualiser-3.1.1/svapp/acinclude.m4
+===================================================================
+--- sonic-visualiser-3.1.1.orig/svapp/acinclude.m4
++++ sonic-visualiser-3.1.1/svapp/acinclude.m4
+@@ -134,8 +134,8 @@ esac
+ #   standard; if necessary, add switches to CXXFLAGS to enable support.
+ #
+ #   The first argument, if specified, indicates whether you insist on an
+-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+-#   -std=c++11).  If neither is specified, you get whatever works, with
++#   extended mode (e.g. -std=gnu++14) or a strict conformance mode (e.g.
++#   -std=c++14).  If neither is specified, you get whatever works, with
+ #   preference for an extended mode.
+ #
+ #   The second argument, if specified 'mandatory' or if left unspecified,
+@@ -205,7 +205,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dn
+ 
+   m4_if([$1], [noext], [], [dnl
+   if test x$ac_success = xno; then
+-    for switch in -std=gnu++11 -std=gnu++0x; do
++    for switch in -std=gnu++14 -std=gnu++0x; do
+       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+       AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                      $cachevar,
+@@ -225,7 +225,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dn
+ 
+   m4_if([$1], [ext], [], [dnl
+   if test x$ac_success = xno; then
+-    for switch in -std=c++11 -std=c++0x; do
++    for switch in -std=c++14 -std=c++0x; do
+       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+       AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                      $cachevar,
+Index: sonic-visualiser-3.1.1/svapp/configure
+===================================================================
+--- sonic-visualiser-3.1.1.orig/svapp/configure
++++ sonic-visualiser-3.1.1/svapp/configure
+@@ -3495,7 +3495,7 @@ $as_echo "$ax_cv_cxx_compile_cxx11" >&6;
+ 
+ 
+     if test x$ac_success = xno; then
+-    for switch in -std=c++11 -std=c++0x; do
++    for switch in -std=c++14 -std=c++0x; do
+       cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
+ $as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
+Index: sonic-visualiser-3.1.1/svcore/acinclude.m4
+===================================================================
+--- sonic-visualiser-3.1.1.orig/svcore/acinclude.m4
++++ sonic-visualiser-3.1.1/svcore/acinclude.m4
+@@ -134,8 +134,8 @@ esac
+ #   standard; if necessary, add switches to CXXFLAGS to enable support.
+ #
+ #   The first argument, if specified, indicates whether you insist on an
+-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+-#   -std=c++11).  If neither is specified, you get whatever works, with
++#   extended mode (e.g. -std=gnu++14) or a strict conformance mode (e.g.
++#   -std=c++14).  If neither is specified, you get whatever works, with
+ #   preference for an extended mode.
+ #
+ #   The second argument, if specified 'mandatory' or if left unspecified,
+@@ -205,7 +205,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dn
+ 
+   m4_if([$1], [noext], [], [dnl
+   if test x$ac_success = xno; then
+-    for switch in -std=gnu++11 -std=gnu++0x; do
++    for switch in -std=gnu++14 -std=gnu++0x; do
+       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+       AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                      $cachevar,
+@@ -225,7 +225,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dn
+ 
+   m4_if([$1], [ext], [], [dnl
+   if test x$ac_success = xno; then
+-    for switch in -std=c++11 -std=c++0x; do
++    for switch in -std=c++14 -std=c++0x; do
+       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+       AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                      $cachevar,
+Index: sonic-visualiser-3.1.1/svcore/configure
+===================================================================
+--- sonic-visualiser-3.1.1.orig/svcore/configure
++++ sonic-visualiser-3.1.1/svcore/configure
+@@ -3487,7 +3487,7 @@ $as_echo "$ax_cv_cxx_compile_cxx11" >&6;
+ 
+ 
+     if test x$ac_success = xno; then
+-    for switch in -std=c++11 -std=c++0x; do
++    for switch in -std=c++14 -std=c++0x; do
+       cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
+ $as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
+Index: sonic-visualiser-3.1.1/svgui/acinclude.m4
+===================================================================
+--- sonic-visualiser-3.1.1.orig/svgui/acinclude.m4
++++ sonic-visualiser-3.1.1/svgui/acinclude.m4
+@@ -134,8 +134,8 @@ esac
+ #   standard; if necessary, add switches to CXXFLAGS to enable support.
+ #
+ #   The first argument, if specified, indicates whether you insist on an
+-#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+-#   -std=c++11).  If neither is specified, you get whatever works, with
++#   extended mode (e.g. -std=gnu++14) or a strict conformance mode (e.g.
++#   -std=c++14).  If neither is specified, you get whatever works, with
+ #   preference for an extended mode.
+ #
+ #   The second argument, if specified 'mandatory' or if left unspecified,
+@@ -205,7 +205,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dn
+ 
+   m4_if([$1], [noext], [], [dnl
+   if test x$ac_success = xno; then
+-    for switch in -std=gnu++11 -std=gnu++0x; do
++    for switch in -std=gnu++14 -std=gnu++0x; do
+       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+       AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                      $cachevar,
+@@ -225,7 +225,7 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dn
+ 
+   m4_if([$1], [ext], [], [dnl
+   if test x$ac_success = xno; then
+-    for switch in -std=c++11 -std=c++0x; do
++    for switch in -std=c++14 -std=c++0x; do
+       cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch])
+       AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch,
+                      $cachevar,
+Index: sonic-visualiser-3.1.1/svgui/configure
+===================================================================
+--- sonic-visualiser-3.1.1.orig/svgui/configure
++++ sonic-visualiser-3.1.1/svgui/configure
+@@ -3495,7 +3495,7 @@ $as_echo "$ax_cv_cxx_compile_cxx11" >&6;
+ 
+ 
+     if test x$ac_success = xno; then
+-    for switch in -std=c++11 -std=c++0x; do
++    for switch in -std=c++14 -std=c++0x; do
+       cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
+ $as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
diff -Nru sonic-visualiser-3.1.1/debian/patches/series sonic-visualiser-3.1.1/debian/patches/series
--- sonic-visualiser-3.1.1/debian/patches/series	2018-08-21 20:37:33.000000000 +0000
+++ sonic-visualiser-3.1.1/debian/patches/series	2018-12-28 00:29:57.000000000 +0000
@@ -2,3 +2,4 @@
 02-disable-internal-dataquay.patch
 03-tests-on-archs.patch
 04-crosscompilation.patch
+05-c++-14.patch
diff -Nru sonic-visualiser-3.1.1/debian/rules sonic-visualiser-3.1.1/debian/rules
--- sonic-visualiser-3.1.1/debian/rules	2018-08-21 20:37:33.000000000 +0000
+++ sonic-visualiser-3.1.1/debian/rules	2018-12-28 00:29:57.000000000 +0000
@@ -23,6 +23,10 @@
 %:
 	dh $@
 
+override_dh_auto_configure:
+	dh_auto_configure
+	sed -i 's/std=gnu++11/std=gnu++14/' Makefile.*
+
 override_dh_auto_build:
 	mkdir -p $(CURDIR)/tmp
 	cp $(CURDIR)/debian/missing-sources/piper.capnp \
@@ -36,6 +40,7 @@
 	rm -f $(CURDIR)/piper-cpp/vamp-capnp/piper.capnp.c++
 	rm -f $(CURDIR)/piper-cpp/vamp-capnp/piper.capnp.h
 	rm -rf $(CURDIR)/tmp
+	rm -f config.log config.pri config.status
 
 override_dh_auto_install:
 	dh_auto_install -- \