Date: Thu, 22 Apr 2021 07:55:33 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: 1a3219fc0441 - main - accessibility/qt5-speech: fix FLITE/ALSA options and config mixups Message-ID: <202104220755.13M7tX7j033456@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=1a3219fc0441a9e024c690cbd4c5b2a043c4add4 commit 1a3219fc0441a9e024c690cbd4c5b2a043c4add4 Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2021-04-21 20:51:20 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2021-04-22 07:25:13 +0000 accessibility/qt5-speech: fix FLITE/ALSA options and config mixups There is a complicated interplay between ALSA and FLITE in the qt5-speech port, and ALSA options in other parts of the Qt stack. This patch tries to offer enough knobs to manage the game. PR: 245614 Submitted by: tcberner Reported by: John Hein --- accessibility/qt5-speech/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/accessibility/qt5-speech/Makefile b/accessibility/qt5-speech/Makefile index b1ae4892d427..b451bb6a9a75 100644 --- a/accessibility/qt5-speech/Makefile +++ b/accessibility/qt5-speech/Makefile @@ -1,5 +1,6 @@ PORTNAME= speech DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= accessibility PKGNAMEPREFIX= qt5- @@ -11,6 +12,7 @@ USES= compiler:c++11-lang gl pkgconfig qmake:outsource,norecursive \ USE_GL= gl USE_QT= core gui buildtools_build qmake_build +OPTIONS_DEFINE= ALSA OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= SPEECHD FLITE OPTIONS_DEFAULT= SPEECHD @@ -27,6 +29,11 @@ FLITE_DESC= Festival Lite Backend FLITE_LIB_DEPENDS= libflite.so:audio/flite FLITE_USE= QT=multimedia,network FLITE_VARS= QMAKE_CONFIGURE_ARGS+=--feature-flite -FLITE_VARS_OFF= QMAKE_CONFIGURE_ARGS+=--no-feature-flite +FLITE_VARS_OFF= QMAKE_CONFIGURE_ARGS+=--no-feature-flite --no-feature-flite_alsa + +ALSA_IMPLIES= FLITE +ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib +ALSA_VARS= QMAKE_CONFIGURE_ARGS+=--feature-flite_alsa +ALSA_VARS_OFF= QMAKE_CONFIGURE_ARGS+=--no-feature-flite_alsa .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104220755.13M7tX7j033456>