Date: Tue, 29 Oct 2024 20:13:31 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 94894ac316a0 - main - audio/praat: update to 6.4.23, latest upstream Message-ID: <202410292013.49TKDVlm085100@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=94894ac316a0d5fd1f9eab053078a7da4e04e0c4 commit 94894ac316a0d5fd1f9eab053078a7da4e04e0c4 Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2024-10-29 20:04:36 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> 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<T> (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 <T>> (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<T> (& our operator[] (first), newSize, our stride); + } +- matrixview<T> 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<T> (& our operator[] (first), newSize, our stride); + } +- constmatrixview<T> 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 + ); + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410292013.49TKDVlm085100>