diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-01-06 14:18:18 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-01-06 14:18:18 +0000 |
| commit | 029e4b5588cc9a34db415dad4472e78aae561b24 (patch) | |
| tree | 88616164cc9cf664a872af8da338e541376db002 /audio/festival | |
| parent | ec00d8a77dfcfc13c9e6ddcf4e96546b3c20edc9 (diff) | |
| download | ports-029e4b5588cc9a34db415dad4472e78aae561b24.tar.gz ports-029e4b5588cc9a34db415dad4472e78aae561b24.zip | |
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)
Notes
Notes:
svn path=/head/; revision=458271
Diffstat (limited to 'audio/festival')
| -rw-r--r-- | audio/festival/files/patch-festival_src_arch_festival_server.cc | 18 | ||||
| -rw-r--r-- | audio/festival/files/patch-speech__tools_main_sig2fv__main.cc | 15 |
2 files changed, 33 insertions, 0 deletions
diff --git a/audio/festival/files/patch-festival_src_arch_festival_server.cc b/audio/festival/files/patch-festival_src_arch_festival_server.cc new file mode 100644 index 000000000000..b53cb7c4463c --- /dev/null +++ b/audio/festival/files/patch-festival_src_arch_festival_server.cc @@ -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(); diff --git a/audio/festival/files/patch-speech__tools_main_sig2fv__main.cc b/audio/festival/files/patch-speech__tools_main_sig2fv__main.cc new file mode 100644 index 000000000000..8a177832bf57 --- /dev/null +++ b/audio/festival/files/patch-speech__tools_main_sig2fv__main.cc @@ -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" |