From owner-svn-ports-all@freebsd.org Sun Feb 24 09:29:04 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B136215184E8; Sun, 24 Feb 2019 09:29:04 +0000 (UTC) (envelope-from tcberner@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 55F6F8CE83; Sun, 24 Feb 2019 09:29:04 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2F4D930B8; Sun, 24 Feb 2019 09:29:04 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1O9T4g9068821; Sun, 24 Feb 2019 09:29:04 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1O9T3uA068818; Sun, 24 Feb 2019 09:29:03 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201902240929.x1O9T3uA068818@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 24 Feb 2019 09:29:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493747 - in head/accessibility/qt5-speech: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/accessibility/qt5-speech: . files X-SVN-Commit-Revision: 493747 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 55F6F8CE83 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.95)[-0.946,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2019 09:29:04 -0000 Author: tcberner Date: Sun Feb 24 09:29:03 2019 New Revision: 493747 URL: https://svnweb.freebsd.org/changeset/ports/493747 Log: accessibility/qt5-speech: add options SPEECHD and FLITE Previously we only assumed to build the speechd backend. If however flite was installed, it would be picked up and could leed to it failing due to a missing dependency to qt5-multimedia required by said backend. With this we add options to deterministically toggle which of the backends to build. PR: 235900 Reported by: starikarp@dismail.de, lumiwa@gmail.com Added: head/accessibility/qt5-speech/files/ head/accessibility/qt5-speech/files/patch-qtspeech.pro (contents, props changed) head/accessibility/qt5-speech/files/patch-src_plugins_tts_tts.pro (contents, props changed) Modified: head/accessibility/qt5-speech/Makefile head/accessibility/qt5-speech/pkg-plist Modified: head/accessibility/qt5-speech/Makefile ============================================================================== --- head/accessibility/qt5-speech/Makefile Sun Feb 24 09:00:51 2019 (r493746) +++ head/accessibility/qt5-speech/Makefile Sun Feb 24 09:29:03 2019 (r493747) @@ -2,15 +2,31 @@ PORTNAME= speech DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= accessibility PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Accessibilty features for Qt5 -LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher - -USES= compiler:c++11-lang pkgconfig qmake:outsource qt-dist:5,speech +USES= compiler:c++11-lang gl pkgconfig qmake:outsource qt-dist:5,speech +USE_GL= gl USE_QT= core gui buildtools_build qmake_build + +OPTIONS_MULTI= BACKEND +OPTIONS_MULTI_BACKEND= SPEECHD FLITE +OPTIONS_DEFAULT= SPEECHD +OPTIONS_SUB= yes + +SPEECHD_DESC= Speech Dispatcher Backend +SPEECHD_USES= gettext-runtime gnome +SPEECHD_USE= GNOME=glib20 +SPEECHD_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher +SPEECHD_QMAKE_ON= CONFIG+=with_speechd + +FLITE_DESC= Festival Lite Backend +FLITE_LIB_DEPENDS= libflite.so:audio/flite +FLITE_USE= QT=multimedia,network +FLITE_QMAKE_ON= CONFIG+=with_flite .include Added: head/accessibility/qt5-speech/files/patch-qtspeech.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/accessibility/qt5-speech/files/patch-qtspeech.pro Sun Feb 24 09:29:03 2019 (r493747) @@ -0,0 +1,18 @@ +--- qtspeech.pro.orig 2019-02-16 08:32:35 UTC ++++ qtspeech.pro +@@ -1,7 +1,11 @@ + load(configure) +-qtCompileTest(flite) +-qtCompileTest(flite_alsa) +-!packagesExist(speech-dispatcher) { +- qtCompileTest(speechd) ++with_flite { ++ qtCompileTest(flite) ++ qtCompileTest(flite_alsa) ++} ++with_speechd { ++ !packagesExist(speech-dispatcher) { ++ qtCompileTest(speechd) ++ } + } + load(qt_parts) Added: head/accessibility/qt5-speech/files/patch-src_plugins_tts_tts.pro ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/accessibility/qt5-speech/files/patch-src_plugins_tts_tts.pro Sun Feb 24 09:29:03 2019 (r493747) @@ -0,0 +1,31 @@ +--- src/plugins/tts/tts.pro.orig 2019-02-16 08:43:06 UTC ++++ src/plugins/tts/tts.pro +@@ -1,10 +1,12 @@ + TEMPLATE = subdirs + +-unix { +- CONFIG += link_pkgconfig +- config_speechd | packagesExist(speech-dispatcher) { +- SUBDIRS += speechdispatcher +- } ++with_speechd { ++ unix { ++ CONFIG += link_pkgconfig ++ config_speechd | packagesExist(speech-dispatcher) { ++ SUBDIRS += speechdispatcher ++ } ++ } + } + + windows:!winrt: SUBDIRS += sapi +@@ -15,6 +17,8 @@ uikit: SUBDIRS += ios + + android: SUBDIRS += android + +-config_flite | config_flite_alsa { +- SUBDIRS += flite ++with_flite { ++ config_flite | config_flite_alsa { ++ SUBDIRS += flite ++ } + } Modified: head/accessibility/qt5-speech/pkg-plist ============================================================================== --- head/accessibility/qt5-speech/pkg-plist Sun Feb 24 09:00:51 2019 (r493746) +++ head/accessibility/qt5-speech/pkg-plist Sun Feb 24 09:29:03 2019 (r493747) @@ -15,7 +15,8 @@ %%QT_INCDIR%%/QtTextToSpeech/qvoice.h %%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfig.cmake %%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeechConfigVersion.cmake -%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeech_QTextToSpeechPluginSpeechd.cmake +%%FLITE%%%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeech_QTextToSpeechEngineFlite.cmake +%%SPEECHD%%%%QT_CMAKEDIR%%/Qt5TextToSpeech/Qt5TextToSpeech_QTextToSpeechPluginSpeechd.cmake %%QT_LIBDIR%%/libQt5TextToSpeech.prl %%QT_LIBDIR%%/libQt5TextToSpeech.so %%QT_LIBDIR%%/libQt5TextToSpeech.so.5 @@ -24,6 +25,8 @@ %%DEBUG%%%%QT_LIBDIR%%/libQt5TextToSpeech.so.%%FULLVER%%.debug %%QT_MKSPECDIR%%/modules/qt_lib_texttospeech.pri %%QT_MKSPECDIR%%/modules/qt_lib_texttospeech_private.pri -%%QT_PLUGINDIR%%/texttospeech/libqtexttospeech_speechd.so -%%DEBUG%%%%QT_PLUGINDIR%%/texttospeech/libqtexttospeech_speechd.so.debug +%%FLITE%%%%QT_PLUGINDIR%%/texttospeech/libqttexttospeech_flite.so +%%FLITE%%%%DEBUG%%%%QT_PLUGINDIR%%/texttospeech/libqttexttospeech_flite.so.debug +%%SPEECHD%%%%QT_PLUGINDIR%%/texttospeech/libqtexttospeech_speechd.so +%%SPEECHD%%%%DEBUG%%%%QT_PLUGINDIR%%/texttospeech/libqtexttospeech_speechd.so.debug libdata/pkgconfig/Qt5TextToSpeech.pc