From owner-svn-ports-all@freebsd.org Sat Jan 6 14:18:20 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 55A37EBB737; Sat, 6 Jan 2018 14:18:20 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2D5A570952; Sat, 6 Jan 2018 14:18:20 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 57FD4137BB; Sat, 6 Jan 2018 14:18:19 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w06EIJXD074221; Sat, 6 Jan 2018 14:18:19 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w06EIJfS074219; Sat, 6 Jan 2018 14:18:19 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801061418.w06EIJfS074219@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 6 Jan 2018 14:18:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r458271 - head/audio/festival/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/audio/festival/files X-SVN-Commit-Revision: 458271 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jan 2018 14:18:20 -0000 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' 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' 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 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 Order of lpc analysis. \n\n" + "-ref_order Order of lpc reflection coefficient analysis. \n\n" + "-cep_order Order of lpc cepstral analysis.\n\n"