svn commit: r493747 - in head/accessibility/qt5-speech: . files

[Tobias C. Berner]

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 at dismail.de, lumiwa at 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 at 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 <bsd.port.mk>

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