svn commit: r458271 - head/audio/festival/files

[Jan Beich]

Author: jbeich
Date: Sat Jan  6 14:18:18 2018
New Revision: 458271
URL: https://svnweb.freebsd.org/changeset/ports/458271

Log:
  audio/festival: unbreak build with Clang 6 (C++14 by default)
  
  sig2fv_main.cc:190:18: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
           "    default: "DEFAULT_WINDOW"\n\n"
                          ^
  server.cc:125:68: error: invalid operands to binary expression ('__bind<int &, sockaddr *, unsigned
        long>' and 'int')
      if (bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0)
          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~
  
  Reported by:	antoine (via bug 224669)

Added:
  head/audio/festival/files/patch-festival_src_arch_festival_server.cc   (contents, props changed)
  head/audio/festival/files/patch-speech__tools_main_sig2fv__main.cc   (contents, props changed)

Added: head/audio/festival/files/patch-festival_src_arch_festival_server.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/festival/files/patch-festival_src_arch_festival_server.cc	Sat Jan  6 14:18:18 2018	(r458271)
@@ -0,0 +1,18 @@
+libc++ doesn't like "using namespace std" in C++11
+
+server.cc:125:68: error: invalid operands to binary expression ('__bind<int &, sockaddr *, unsigned
+      long>' and 'int')
+    if (bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0)
+        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^  ~
+
+--- festival/src/arch/festival/server.cc.orig	2005-10-26 19:44:06 UTC
++++ festival/src/arch/festival/server.cc
+@@ -122,7 +122,7 @@ int festival_start_server(int port)
+     serv_addr.sin_port = htons(port);
+     serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+ 
+-    if (bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0)
++    if (::bind(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0)
+     {
+ 	cerr << "socket: bind failed" << endl;
+ 	festival_error();

Added: head/audio/festival/files/patch-speech__tools_main_sig2fv__main.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/festival/files/patch-speech__tools_main_sig2fv__main.cc	Sat Jan  6 14:18:18 2018	(r458271)
@@ -0,0 +1,15 @@
+sig2fv_main.cc:190:18: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
+         "    default: "DEFAULT_WINDOW"\n\n"
+                        ^
+
+--- speech_tools/main/sig2fv_main.cc.orig	2010-11-05 14:12:43 UTC
++++ speech_tools/main/sig2fv_main.cc
+@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
+ 	 "-window_type <string> Type of window used on waveform. \n"
+ 	 "    Permissable types are: \n" +
+ 	 EST_Window::options_supported() + 
+-	 "    default: "DEFAULT_WINDOW"\n\n"
++	 "    default: " DEFAULT_WINDOW "\n\n"
+ 	 "-lpc_order <int>      Order of lpc analysis. \n\n"
+ 	 "-ref_order <int>      Order of lpc reflection coefficient analysis. \n\n"
+ 	 "-cep_order <int>      Order of lpc cepstral analysis.\n\n"