From nobody Sun Jun 4 16:21:57 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QZ27T2XQkz4ZHcx; Sun, 4 Jun 2023 16:21:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QZ27T25fvz3sCK; Sun, 4 Jun 2023 16:21:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685895717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMi5G/2OPYbGX7UivgbSGWt2eAJ+5qR/l2WDUlunn5o=; b=P+L53JqzzgHQcC8R3qlMncnLbICOtljhd1JxjVTOzPnf/MLO4u5eABzT2zNT0hdMCjLE56 gf5mvQQCzxXsenzW26QWfz5kncnLRuPY0lVDs1fViATctOqqx8mIV8MV9ouhFCrHqTfUiy vy/LdDvOjAdd9FbAhvotZqDj9XizDl/NFoBfYi1xPi0ZIKGNlkgQHBSLELJDgZHGD9ynDd BXMjcPmFy6jdNtDZwYMSUh+69C4oldPNHDTEkTODz/U+/v6g6eNK8gnkXwB8kt3cgBF7WE tMcWQu9Cjuy2Ta2rEGnyCjfqXg1SptWsLLmrJilhaDunK9ts8HQrn9GqGeqfpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685895717; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fMi5G/2OPYbGX7UivgbSGWt2eAJ+5qR/l2WDUlunn5o=; b=UtTad4ElKcSYUwHYG8wowO6DeKPeDrU6m2d66yvX6RRWAGMI4SEvPBinPlLY4fubp/EwHO xdpaOh/eSOiB+BeVgaqLSgOXd5W9QQRaPeEI7bO9bnSEeotqEmu18n9uNVc8WYGXGi6YFi SHl6WKPvjlp9MG+0d+XExoC8vxd+C1DptlMDZrgoTu/sHl8alHXFxRb/Ri0tIs2TenHfBD +4z7IirNFBmnaiF3CN2DV2+RuO0YjGV8ir6sBTm5lm1YiYQQFoGiPTH/eU0bKqh0+aZaH/ ZXExwZzt8W5PrHO9+NaVQjeLJ5XTvgws1xkTPB0bsdQiMnEWNJB7nZ0QQuq1tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685895717; a=rsa-sha256; cv=none; b=vtCcGVlUiIUy9kWbkRI4jVuUwKROdTNkC2tUB4xrMMpdaeUzIwf2pCToxr6y7D0smB2ZQR DGostp77UCMGb3qFICKa4kU9BsGPT2i22zuyjYOcI66zzZLqoT9yksjt1b8ZNSGNMElHWQ 8EuzB74qBe3N4+r8kJOMa5luRXETXBijW6m5xrxeU+4pyPrhCekX3LcTXt+24mzacRfrUc nGvOr0KEXAVe+ZV9VPzzsQDnqSWRPtNyuHTwaRaYLILv3vSF5LZOFQQXf0H1znMo0PgYBX nJ748p6jrkq02FgNrHIF9Rn8/dfpN0aOcWffAMiWyNA0aS/MGeScA0xVLEiIIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QZ27T0mGhz1CZH; Sun, 4 Jun 2023 16:21:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 354GLvuC024972; Sun, 4 Jun 2023 16:21:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 354GLvSL024971; Sun, 4 Jun 2023 16:21:57 GMT (envelope-from git) Date: Sun, 4 Jun 2023 16:21:57 GMT Message-Id: <202306041621.354GLvSL024971@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: c7753b07bba7 - main - audio/espeak-ng: fix build with clang 16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7753b07bba7d1a4d1b60c8e83758ef25d909cc5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=c7753b07bba7d1a4d1b60c8e83758ef25d909cc5 commit c7753b07bba7d1a4d1b60c8e83758ef25d909cc5 Author: Dimitry Andric AuthorDate: 2023-05-18 12:09:48 +0000 Commit: Dimitry Andric CommitDate: 2023-06-04 16:21:24 +0000 audio/espeak-ng: fix build with clang 16 Since clang 16 (and gcc 11) the default C++ standard is now gnu++17. Because audio/espeak-ng's Makefile does not explicitly set its C++ standard, this leads to an error: src/speechPlayer/src/speechWaveGenerator.cpp:197:56: error: reference to 'sample' is ambiguous unsigned int generate(const unsigned int sampleCount, sample* sampleBuf) { ^ src/speechPlayer/src/sample.h:23:3: note: candidate found by name lookup is 'sample' } sample; ^ /usr/include/c++/v1/__algorithm/sample.h:95:17: note: candidate found by name lookup is 'std::sample' _SampleIterator sample(_PopulationIterator __first, ^ This is because speechWaveGenerator.cpp has "using namespace std;" at the top, so "sample" can match both "std::sample" (from ) and "struct sample" (from sample.h). Qualify "sample" as "::sample" to work around the problem. PR: 271486 Approved by: maintainer timeout (2 weeks) MFH: 2023Q2 --- audio/espeak-ng/Makefile | 2 +- .../files/patch-src_speechPlayer_src_speechWaveGenerator.cpp | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/audio/espeak-ng/Makefile b/audio/espeak-ng/Makefile index 1b5c28c6a07b..a51c5f5045b1 100644 --- a/audio/espeak-ng/Makefile +++ b/audio/espeak-ng/Makefile @@ -1,6 +1,6 @@ PORTNAME= espeak-ng PORTVERSION= 1.51.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio #MASTER_SITES= https://github.com/espeak-ng/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/audio/espeak-ng/files/patch-src_speechPlayer_src_speechWaveGenerator.cpp b/audio/espeak-ng/files/patch-src_speechPlayer_src_speechWaveGenerator.cpp new file mode 100644 index 000000000000..19f1081e6c02 --- /dev/null +++ b/audio/espeak-ng/files/patch-src_speechPlayer_src_speechWaveGenerator.cpp @@ -0,0 +1,11 @@ +--- src/speechPlayer/src/speechWaveGenerator.cpp.orig 2022-06-21 14:53:53 UTC ++++ src/speechPlayer/src/speechWaveGenerator.cpp +@@ -194,7 +194,7 @@ class SpeechWaveGeneratorImpl: public SpeechWaveGenera + SpeechWaveGeneratorImpl(int sr): sampleRate(sr), voiceGenerator(sr), fricGenerator(), cascade(sr), parallel(sr), frameManager(NULL) { + } + +- unsigned int generate(const unsigned int sampleCount, sample* sampleBuf) { ++ unsigned int generate(const unsigned int sampleCount, ::sample* sampleBuf) { + if(!frameManager) return 0; + double val=0; + for(unsigned int i=0;i