pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

qt6-qtspeech: disable flite plugin on Linux



Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Fri Oct 28 11:17:29 2022 +0200
Changeset:	5ab1910b57666cb9b6384363046c81022a53678c

Modified Files:
	qt6-qtspeech/Makefile
	qt6-qtspeech/PLIST

Log Message:
qt6-qtspeech: disable flite plugin on Linux

Disable flite plugin on Linux.
It need to be comiled with -fPIC to be
linkable with on Linux.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5ab1910b57666cb9b6384363046c81022a53678c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qt6-qtspeech/Makefile | 16 ++++++++++++++--
 qt6-qtspeech/PLIST    | 14 +++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diffs:
diff --git a/qt6-qtspeech/Makefile b/qt6-qtspeech/Makefile
index 1ce37b915d..162338d0fd 100644
--- a/qt6-qtspeech/Makefile
+++ b/qt6-qtspeech/Makefile
@@ -6,13 +6,25 @@ COMMENT=	Qt6 module for text to speech
 CATEGORIES=	audio
 LICENSE=	gnu-gpl-v3
 
-CONFIGURE_ARGS+=	-no-flite-alsa
+.include "../../mk/bsd.prefs.mk"
 
-PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6TextToSpeech.pc
+PLIST_VARS+=	flite
+
+.if ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=	-no-flite
+.else
+PLIST.flite=	yes
+CONFIGURE_ARGS+=	-no-flite-alsa
+.endif
 
 .include "../../wip/qt6-qtbase/Makefile.common"
 
+PKGCONFIG_OVERRIDE+=	lib/pkgconfig/Qt6TextToSpeech.pc
+
+.if ${OPSYS} != "Linux"
 .include "../../audio/flite/buildlink3.mk"
+.endif
+
 .include "../../audio/speech-dispatcher/buildlink3.mk"
 .include "../../wip/qt6-qtbase/buildlink3.mk"
 .include "../../wip/qt6-qtdeclarative/buildlink3.mk"
diff --git a/qt6-qtspeech/PLIST b/qt6-qtspeech/PLIST
index a85a1a6dc5..096c009f4d 100644
--- a/qt6-qtspeech/PLIST
+++ b/qt6-qtspeech/PLIST
@@ -27,12 +27,12 @@ qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlConfigVersion.cmake
 qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlConfigVersionImpl.cmake
 qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlTargets-release.cmake
 qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlTargets.cmake
-qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginAdditionalTargetInfo.cmake
-qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginConfig.cmake
-qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginConfigVersion.cmake
-qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginConfigVersionImpl.cmake
-qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginTargets-release.cmake
-qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginTargets.cmake
+${PLIST.flite}qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginAdditionalTargetInfo.cmake
+${PLIST.flite}qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginConfig.cmake
+${PLIST.flite}qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginConfigVersion.cmake
+${PLIST.flite}qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginConfigVersionImpl.cmake
+${PLIST.flite}qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginTargets-release.cmake
+${PLIST.flite}qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechFlitePluginTargets.cmake
 qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginAdditionalTargetInfo.cmake
 qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginConfig.cmake
 qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginConfigVersion.cmake
@@ -63,7 +63,7 @@ qt6/lib/pkgconfig/Qt6TextToSpeech.pc
 qt6/mkspecs/modules/qt_lib_texttospeech.pri
 qt6/mkspecs/modules/qt_lib_texttospeech_private.pri
 qt6/modules/TextToSpeech.json
-qt6/plugins/texttospeech/libqtexttospeech_flite.so
+${PLIST.flite}qt6/plugins/texttospeech/libqtexttospeech_flite.so
 qt6/plugins/texttospeech/libqtexttospeech_mock.so
 qt6/plugins/texttospeech/libqtexttospeech_speechd.so
 qt6/qml/QtTextToSpeech/libtexttospeechqmlplugin.so


Home | Main Index | Thread Index | Old Index