From nobody Tue Oct 29 20:13:31 2024 X-Original-To: dev-commits-ports-all@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 4XdLzv4J7qz5bs39; Tue, 29 Oct 2024 20:13:31 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XdLzv3q3sz4Llb; Tue, 29 Oct 2024 20:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730232811; 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=r2wcVS6RtqgbV93KhoSufg3q4FzIIX8LJ81a4zngm0E=; b=C3ugRRy5CF9Tc0u2cRRsvQ/1lOt0u05OC8WQMrktbV1TW4MccGbXJLqFIL1e3tacF4f+ah 8drpJseIuuVf0BX0FD2ZImxbkSpZAxjR8q0oquDTEif42b9yGBGM89zuHzeu72uBQYvzU8 HA76CdCevR45OnQDrWaSuepE9o51LaEyxG8evsfvOImbipK7T8R9QfUY9KbhtsjBrrS0u2 sDZmHM84gDJh62N57pxNFAZRkGzRlNDDYoYVXXse9ueuI15eVenCoun+YnO6qVpv1wUJvJ fLVE9+DqA9StWNtuUMRgUhQfkfJz5vT9pqPQ+RIWhCgVRHHDH/3V4PTV/0pYTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730232811; 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=r2wcVS6RtqgbV93KhoSufg3q4FzIIX8LJ81a4zngm0E=; b=oN9l69wlf3shME2yFsJxe56fKJ4m8uMqM5nG9zF4iljqjxkwYXoiXm/FiqUBg1OZTycfez trsqvfZI9a6HTmPbBH3ALq8Xs+97HcbSzGS2/yWKUKxUW/3SLgCHFpoEbmVJbUaSnfyqYt USw0ReE115c0RWQIJRr6yOaYbgO1Ops2ixhUfWh5OEewltxWvQnmGRJ5FWqiiPzfgbbdny DvBsKBfWyVkWqjxImPc5/jjPdfy+pIRA0FiYXThsnq6kzis88L0rKaWKNviIS2VP3GeKBN gBpN3dCuPIUAIVLyf6lDnmbcC8f8u9+q1vxrIx58p3ka+akxKZgOhLRa5WpKZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730232811; a=rsa-sha256; cv=none; b=NTWY5FfBP0AT0CYSOd8O0n0hv1UcEKltOG9G9mPAKbiwgGbJzGPJMHzL2Gt9u6gfdJYUHh D3EKgOUTzuH5LWwQ7KJp2TLf5nK3pt5GvoHcSD8RkpurALBRlWqDt/Q3GHStDa7YaCuA2s G1o3PiCAcGe1vbVu4epkNlM+TBwptogJFz/NlLJJDNNujh5777DtSMVdrgQ73KT4b+qQ1m dUI2x0DopqDxlSVJw+4uUaYAs2j/kXe5dEd9lrSWvPRBeC2Va2n/C4oANeJ23pv+vtWxL/ LuWejNOcKFowNmzDaUBLCwfSqzlidXh/94ZYVOTTFnHlIvJi+SyjIDwK0W8J/Q== 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 4XdLzv3Q1fzdcM; Tue, 29 Oct 2024 20:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49TKDVO7085103; Tue, 29 Oct 2024 20:13:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TKDVlm085100; Tue, 29 Oct 2024 20:13:31 GMT (envelope-from git) Date: Tue, 29 Oct 2024 20:13:31 GMT Message-Id: <202410292013.49TKDVlm085100@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 94894ac316a0 - main - audio/praat: update to 6.4.23, latest upstream List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94894ac316a0d5fd1f9eab053078a7da4e04e0c4 Auto-Submitted: auto-generated The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=94894ac316a0d5fd1f9eab053078a7da4e04e0c4 commit 94894ac316a0d5fd1f9eab053078a7da4e04e0c4 Author: Adriaan de Groot AuthorDate: 2024-10-29 20:04:36 +0000 Commit: Adriaan de Groot CommitDate: 2024-10-29 20:13:29 +0000 audio/praat: update to 6.4.23, latest upstream As always, the release notes are at https://www.fon.hum.uva.nl/praat/manual/What_s_new_.html with some minor improvements. While here, try to fix build on 15-CURRENT which is complaining about typo's in uninstantiated templates. It builds for me, but then I'm on 13-STABLE and therefore have a several-versions-older C++ compiler. --- audio/praat/Makefile | 2 +- audio/praat/distinfo | 6 ++--- audio/praat/files/patch-melder_melder__strvec.h | 15 +++++++++++ audio/praat/files/patch-melder_melder__tensor.h | 33 +++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/audio/praat/Makefile b/audio/praat/Makefile index bbf0807db1ba..bc0a54a98d20 100644 --- a/audio/praat/Makefile +++ b/audio/praat/Makefile @@ -1,6 +1,6 @@ PORTNAME= praat DISTVERSIONPREFIX= v -DISTVERSION= 6.4.22 +DISTVERSION= 6.4.23 CATEGORIES= audio science MAINTAINER= adridg@FreeBSD.org diff --git a/audio/praat/distinfo b/audio/praat/distinfo index dce8258a9597..36122fc86798 100644 --- a/audio/praat/distinfo +++ b/audio/praat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1728847102 -SHA256 (praat-praat-v6.4.22_GH0.tar.gz) = c66049b8ff4845183437bbc23b1b35bdb426ae08a7eee9514c7d7a565d093eb8 -SIZE (praat-praat-v6.4.22_GH0.tar.gz) = 61257341 +TIMESTAMP = 1730230968 +SHA256 (praat-praat-v6.4.23_GH0.tar.gz) = 1284d97fc2724142cacd6ef73ec9c146f1b10662865dd47b6e9e758c33f2f256 +SIZE (praat-praat-v6.4.23_GH0.tar.gz) = 61260316 diff --git a/audio/praat/files/patch-melder_melder__strvec.h b/audio/praat/files/patch-melder_melder__strvec.h new file mode 100644 index 000000000000..cfdd31bb882e --- /dev/null +++ b/audio/praat/files/patch-melder_melder__strvec.h @@ -0,0 +1,15 @@ +--- melder/melder_strvec.h.orig 2024-10-29 19:53:40 UTC ++++ melder/melder_strvec.h +@@ -192,12 +192,6 @@ class _autostringautovector { (public) + return _autostringvectorview (our elements + (firstPosition - 1), newSize); + } + _autostringautovector&& move () noexcept { return static_cast <_autostringautovector&&> (*this); } // enable construction and assignment for l-values (variables) via explicit move() +- void initWithCapacity (integer capacity) { +- if (capacity > 0) +- our cells = MelderArray:: _alloc <_autostring > (capacity, MelderArray::kInitializationType::ZERO); +- our size = 0; +- our _capacity = capacity; +- } + void resize (integer newSize) { + if (newSize > our _capacity) { + /* diff --git a/audio/praat/files/patch-melder_melder__tensor.h b/audio/praat/files/patch-melder_melder__tensor.h new file mode 100644 index 000000000000..4a32eb5cca49 --- /dev/null +++ b/audio/praat/files/patch-melder_melder__tensor.h @@ -0,0 +1,33 @@ +--- melder/melder_tensor.h.orig 2024-10-29 19:52:21 UTC ++++ melder/melder_tensor.h +@@ -155,10 +155,6 @@ struct vectorview { + Melder_assert (last >= 1 && last <= our size); + return vectorview (& our operator[] (first), newSize, our stride); + } +- matrixview asmatrixview (integer nrow, integer ncol) { +- Melder_assert (nrow * ncol <= our size); +- return matrixview (our cells, nrow, ncol, ncol * our stride, our stride); +- } + T *asArgumentToFunctionThatExpectsZeroBasedArray () const { return & our operator[] (1); } + T *asArgumentToFunctionThatExpectsOneBasedArray () const { return & our operator[] (0); } + }; +@@ -188,10 +184,6 @@ struct constvectorview { + Melder_assert (last >= 1 && last <= our size); + return constvectorview (& our operator[] (first), newSize, our stride); + } +- constmatrixview asmatrixview (integer nrow, integer ncol) { +- Melder_assert (nrow * ncol <= our size); +- return constmatrixview (our cells, nrow, ncol, ncol * our stride, our stride); +- } + const T *asArgumentToFunctionThatExpectsZeroBasedArray () const { return & our operator[] (1); } + const T *asArgumentToFunctionThatExpectsOneBasedArray () const { return & our operator[] (0); } + }; +@@ -1049,7 +1041,7 @@ struct consttensor3 { + our cells + + (dim2 - 1) * our stride2 + + (dim3 - 1) * our stride3, +- our nidm1, ++ our ndim1, + our stride1 + ); + }