diff --git a/audio/praat/Makefile b/audio/praat/Makefile index bbf0807db1ba..bc0a54a98d20 100644 --- a/audio/praat/Makefile +++ b/audio/praat/Makefile @@ -1,44 +1,44 @@ PORTNAME= praat DISTVERSIONPREFIX= v -DISTVERSION= 6.4.22 +DISTVERSION= 6.4.23 CATEGORIES= audio science MAINTAINER= adridg@FreeBSD.org COMMENT= Phonetics by Computer WWW= https://www.fon.hum.uva.nl/praat/ LICENSE= GPLv2 LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libasound.so:audio/alsa-lib # These are recommended but I can't tell the difference RUN_DEPENDS= CharisSIL>=0:x11-fonts/charis \ DoulosSIL>=0:x11-fonts/doulos USES= compiler:c++11-lang dos2unix gnome iconv pkgconfig xorg USE_GNOME= cairo gdkpixbuf2 gtk30 USE_GITHUB= yes USE_XORG= x11 DOS2UNIX_FILES= \ fon/Makefile \ melder/Makefile \ sys/Makefile \ EEG/Makefile PLIST_FILES= bin/praat share/man/man1/praat.1.gz post-patch: @${REINPLACE_CMD} -e 's|^CPPFLAGS =|CPPFLAGS +=|' \ ${WRKSRC}/*/Makefile \ ${WRKSRC}/external/*/Makefile @${CP} ${WRKSRC}/makefiles/makefile.defs.freebsd.alsa \ ${WRKSRC}/makefile.defs do-install: ${INSTALL_PROGRAM} ${WRKSRC}/praat ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${FILESDIR}/praat.1 ${STAGEDIR}${PREFIX}/share/man/man1 .include 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 + ); + }