Date: Sat, 13 Jun 2026 22:09:10 +0000 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: 08f97dc8d6e8 - main - audio/praat: update to 6.4.67, latest upstream Message-ID: <6a2dd506.3f400.2b24c0f5@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=08f97dc8d6e86d3021f7d2e1ac7b6d6c2e8206e3 commit 08f97dc8d6e86d3021f7d2e1ac7b6d6c2e8206e3 Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2026-06-02 08:58:19 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2026-06-13 22:09:03 +0000 audio/praat: update to 6.4.67, latest upstream Release notes as always at https://www.fon.hum.uva.nl/praat/manual/What_s_new_.html The build system has been revamped (in unfortunate ways), I ought to engage with upstream to get it to build well with meson on FreeBSD, so we can abandon all the Makefile hacks. --- audio/praat/Makefile | 9 +++++---- audio/praat/distinfo | 6 +++--- audio/praat/files/patch-Makefile | 16 ++++++++++++++++ audio/praat/files/patch-external_glpk_glpspx02.c | 11 +++++++++++ audio/praat/files/patch-external_glpk_glpssx01.c | 11 +++++++++++ audio/praat/files/patch-external_whispercpp_Makefile | 11 +++++++++++ audio/praat/files/patch-fon_Sound__audio.cpp | 11 +++++++++++ audio/praat/files/patch-main_main__Praat.cpp | 11 +++++++++++ .../files/patch-makefiles_makefile.defs.freebsd.alsa | 20 -------------------- audio/praat/files/patch-melder_MelderThread.cpp | 11 +++++++++++ 10 files changed, 90 insertions(+), 27 deletions(-) diff --git a/audio/praat/Makefile b/audio/praat/Makefile index 330db5186d1e..f753200f221a 100644 --- a/audio/praat/Makefile +++ b/audio/praat/Makefile @@ -1,6 +1,6 @@ PORTNAME= praat DISTVERSIONPREFIX= v -DISTVERSION= 6.4.65 +DISTVERSION= 6.4.67 CATEGORIES= audio science MAINTAINER= adridg@FreeBSD.org @@ -11,12 +11,13 @@ WWW= https://www.fon.hum.uva.nl/praat/ \ LICENSE= GPLv3+ LIB_DEPENDS= libasound.so:audio/alsa-lib \ + libjack.so:audio/jack \ libharfbuzz.so:print/harfbuzz # These are recommended but I can't tell the difference RUN_DEPENDS= Charis>=0:x11-fonts/charis \ DoulosSIL>=0:x11-fonts/doulos -USES= compiler:c++17-lang gnome iconv pkgconfig xorg +USES= compiler:c++17-lang gmake gnome iconv pkgconfig xorg USE_GITHUB= yes USE_GNOME= cairo gdkpixbuf gtk30 USE_XORG= x11 @@ -28,12 +29,12 @@ PLIST_FILES= bin/praat \ WRKSRC= ${WRKDIR}/praat.github.io-${DISTVERSION} +MAKE_ARGS+= RANLIB=${RANLIB} + post-patch: ${REINPLACE_CMD} -e 's|^CPPFLAGS =|CPPFLAGS +=|' \ ${WRKSRC}/*/Makefile \ ${WRKSRC}/external/*/Makefile - ${CP} ${WRKSRC}/makefiles/makefile.defs.freebsd.alsa \ - ${WRKSRC}/makefile.defs @${CP} ${WRKSRC}/main/praat-480.svg \ ${WRKSRC}/praat.svg diff --git a/audio/praat/distinfo b/audio/praat/distinfo index 28cc3fdb70a2..0aa1a7b9eedb 100644 --- a/audio/praat/distinfo +++ b/audio/praat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1777321258 -SHA256 (praat-praat-v6.4.65_GH0.tar.gz) = bb3f9c520f93f4786903d59d7f64acdc4704d40ed88b4bbfd52ec75f07be6182 -SIZE (praat-praat-v6.4.65_GH0.tar.gz) = 134345538 +TIMESTAMP = 1779789284 +SHA256 (praat-praat-v6.4.67_GH0.tar.gz) = b032404b50c9745b1a75967569dbdd805d75dc5d66ffd0d09f1cc7977c36bbce +SIZE (praat-praat-v6.4.67_GH0.tar.gz) = 159435862 diff --git a/audio/praat/files/patch-Makefile b/audio/praat/files/patch-Makefile new file mode 100644 index 000000000000..7c074054b844 --- /dev/null +++ b/audio/praat/files/patch-Makefile @@ -0,0 +1,16 @@ +--- Makefile.orig 2026-06-10 21:32:39 UTC ++++ Makefile +@@ -145,6 +145,13 @@ $(info ARCHITECTURE: given as "$(PRAAT_ARCH)", resolve + endif + $(info ARCHITECTURE: given as "$(PRAAT_ARCH)", resolved as "$(ARCH_COMPILER_FLAGS)") + ++INC = $(LOCALBASE)/include ++CPPFLAGS += -DUNIX -I$(INC) ++CPPFLAGS += -I$(INC)/gtk-3.0 -I$(INC)/glib-2.0 -I$(LOCALBASE)/lib/glib-2.0/include -I$(INC)/pango-1.0 -I$(INC)/harfbuzz -I$(INC)/cairo -I$(INC)/gdk-pixbuf-2.0 -I$(INC)/atk-1.0 ++EXECUTABLE_FILE = praat ++LINKER_COMMAND = $(CXX) ++GRAPHICS_LINKER_FLAGS := `pkg-config --libs gtk+-3.0` ++NON_PRAAT_LIBRARIES = -L$(LOCALBASE) $(GRAPHICS_LINKER_FLAGS) -lpthread + ifeq ($(OS_IS_FREEBSD),1) + # by Paul Boersma, Jason Bacon, Adriaan de Groot + diff --git a/audio/praat/files/patch-external_glpk_glpspx02.c b/audio/praat/files/patch-external_glpk_glpspx02.c new file mode 100644 index 000000000000..f5aa044b86a8 --- /dev/null +++ b/audio/praat/files/patch-external_glpk_glpspx02.c @@ -0,0 +1,11 @@ +--- external/glpk/glpspx02.c.orig 2026-06-09 15:25:39 UTC ++++ external/glpk/glpspx02.c +@@ -89,7 +89,7 @@ struct csa + /* non-zero element values */ + #if 1 /* 06/IV-2009 */ + /* constraint matrix A stored by rows */ +- int *AT_ptr; /* int AT_ptr[1+m+1]; ++ int *AT_ptr; /* int AT_ptr[1+m+1]; */ + /* AT_ptr[0] is not used; + AT_ptr[i], 1 <= i <= m, is starting position of i-th row in + arrays AT_ind and AT_val; note that AT_ptr[1] is always 1; diff --git a/audio/praat/files/patch-external_glpk_glpssx01.c b/audio/praat/files/patch-external_glpk_glpssx01.c new file mode 100644 index 000000000000..39adf6adb09a --- /dev/null +++ b/audio/praat/files/patch-external_glpk_glpssx01.c @@ -0,0 +1,11 @@ +--- external/glpk/glpssx01.c.orig 2026-06-09 15:27:29 UTC ++++ external/glpk/glpssx01.c +@@ -787,7 +787,7 @@ void ssx_change_basis(SSX *ssx) + /* update factorization of the basis matrix */ + if (bfx_update(ssx->binv, p)) + { if (ssx_factorize(ssx)) +- xassert(("Internal error: basis matrix is singular", 0)); ++ xassert(0 && ("Internal error: basis matrix is singular")); + } + } + return; diff --git a/audio/praat/files/patch-external_whispercpp_Makefile b/audio/praat/files/patch-external_whispercpp_Makefile new file mode 100644 index 000000000000..1e42d2457321 --- /dev/null +++ b/audio/praat/files/patch-external_whispercpp_Makefile @@ -0,0 +1,11 @@ +--- external/whispercpp/Makefile.orig 2026-05-21 21:23:35 UTC ++++ external/whispercpp/Makefile +@@ -1,7 +1,7 @@ + # Makefile of the library "external/whispercpp" + # Anastasia Shchupak, 16 May 2026 + +-CPPFLAGS = -I ../../melder -I ../../fon -I ../../sys ++CPPFLAGS = -I ../../melder -I ../../fon -I ../../sys -Wno-trigraphs + + WHISPER_AND_GGML_OBJECTS = \ + whisper.o \ diff --git a/audio/praat/files/patch-fon_Sound__audio.cpp b/audio/praat/files/patch-fon_Sound__audio.cpp new file mode 100644 index 000000000000..9f49a24553cf --- /dev/null +++ b/audio/praat/files/patch-fon_Sound__audio.cpp @@ -0,0 +1,11 @@ +--- fon/Sound_audio.cpp.orig 2026-06-09 21:48:47 UTC ++++ fon/Sound_audio.cpp +@@ -37,7 +37,7 @@ + #include <windows.h> + #include <mmsystem.h> + #include "winport_off.h" +-#elif defined (linux) ++#elif defined (linux) || defined(UNIX) + #include <fcntl.h> + #if ! defined (NO_AUDIO) + #if defined (__OpenBSD__) || defined (__NetBSD__) diff --git a/audio/praat/files/patch-main_main__Praat.cpp b/audio/praat/files/patch-main_main__Praat.cpp new file mode 100644 index 000000000000..aabe1dcbda96 --- /dev/null +++ b/audio/praat/files/patch-main_main__Praat.cpp @@ -0,0 +1,11 @@ +--- main/main_Praat.cpp.orig 2026-06-13 14:46:14 UTC ++++ main/main_Praat.cpp +@@ -70,6 +70,8 @@ static void logo (Graphics graphics) { + isArm64 ? U"ARM64 Linux" : + x64_version == 3 ? U"x64(v3) Linux" : + U"x64(v1) Linux"; ++#elif defined(__FreeBSD__) ++U"FreeBSD"; + #else + U""; + #error Unknown OS type. diff --git a/audio/praat/files/patch-makefiles_makefile.defs.freebsd.alsa b/audio/praat/files/patch-makefiles_makefile.defs.freebsd.alsa deleted file mode 100644 index 1428e06e8586..000000000000 --- a/audio/praat/files/patch-makefiles_makefile.defs.freebsd.alsa +++ /dev/null @@ -1,20 +0,0 @@ ---- makefiles/makefile.defs.freebsd.alsa.orig 2026-04-19 21:54:48 UTC -+++ makefiles/makefile.defs.freebsd.alsa -@@ -19,7 +19,7 @@ LINK ?= $(CXX) - LINK ?= $(CXX) - - # -DALSA and -DJACK: Use ALSA and Jack audio in pa_unix_hostapis.c --AUDIO = -DALSA -DJACK -+AUDIO = -DALSA # -DJACK - - # FreeBSD pretends to be Linux for most of the code; add CPPFLAGS - # explicitly because GNU make / gcc uses those preprocessor flags, -@@ -40,7 +40,7 @@ EXECUTABLE = praat - - EXECUTABLE = praat - --LIBS = `pkg-config --libs gtk+-3.0` -L$(LOCALBASE)/lib -lasound -ljack -lm -lpthread -ltinfow -+LIBS = `pkg-config --libs gtk+-3.0` -L$(LOCALBASE)/lib -lasound -lm -lpthread -ltinfow - - AR = ar - RANLIB = ls diff --git a/audio/praat/files/patch-melder_MelderThread.cpp b/audio/praat/files/patch-melder_MelderThread.cpp new file mode 100644 index 000000000000..474f0704d7a4 --- /dev/null +++ b/audio/praat/files/patch-melder_MelderThread.cpp @@ -0,0 +1,11 @@ +--- melder/MelderThread.cpp.orig 2026-06-09 16:04:19 UTC ++++ melder/MelderThread.cpp +@@ -103,7 +103,7 @@ integer MelderThread_computeNumberOfThreads ( + #elif defined (_WIN32) + Melder_iroundDown ((double) numberOfElements / 2.0 / minimumNumberOfElementsPerThread); + // round down, assuming that the first spawned thread is the costliest +- #elif defined (linux) ++ #elif defined (linux) || defined(UNIX) + Melder_iround ((double) numberOfElements / 1.5 / minimumNumberOfElementsPerThread); + // round to nearest, assuming that all spawned threads are equally costly + #elsehome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a2dd506.3f400.2b24c0f5>