From owner-dev-commits-ports-all@freebsd.org Thu Apr 22 07:55:33 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69F3B5E3313; Thu, 22 Apr 2021 07:55:33 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FQqTx2Yxfz3GnP; Thu, 22 Apr 2021 07:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 400BC1628D; Thu, 22 Apr 2021 07:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13M7tXqh033457; Thu, 22 Apr 2021 07:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13M7tX7j033456; Thu, 22 Apr 2021 07:55:33 GMT (envelope-from git) Date: Thu, 22 Apr 2021 07:55:33 GMT Message-Id: <202104220755.13M7tX7j033456@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: 1a3219fc0441 - main - accessibility/qt5-speech: fix FLITE/ALSA options and config mixups 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: 1a3219fc0441a9e024c690cbd4c5b2a043c4add4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Apr 2021 07:55:33 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a3219fc0441a9e024c690cbd4c5b2a043c4add4 commit 1a3219fc0441a9e024c690cbd4c5b2a043c4add4 Author: Adriaan de Groot AuthorDate: 2021-04-21 20:51:20 +0000 Commit: Adriaan de Groot 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