CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Niclas Rosenvik" <nros%netbsd.org@localhost>
Date: Mon, 28 Nov 2022 13:44:15 +0000

Module Name:    pkgsrc
Committed By:   nros
Date:           Mon Nov 28 13:44:15 UTC 2022

Modified Files:
        pkgsrc/audio: Makefile
        pkgsrc/meta-pkgs/qt6: Makefile
        pkgsrc/x11/qt6-qtbase: Makefile.common
Added Files:
        pkgsrc/audio/qt6-qtspeech: DESCR Makefile PLIST buildlink3.mk distinfo
        pkgsrc/audio/qt6-qtspeech/patches: patch-cmake_FindFlite.cmake

Log Message:
Add qt6-qtspeech version 6.4.1 to pkgsrc-current

Qt6 module for text to speech capabilites


To generate a diff of this commit:
cvs rdiff -u -r1.661 -r1.662 pkgsrc/audio/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/qt6-qtspeech/DESCR \
    pkgsrc/audio/qt6-qtspeech/Makefile pkgsrc/audio/qt6-qtspeech/PLIST \
    pkgsrc/audio/qt6-qtspeech/buildlink3.mk \
    pkgsrc/audio/qt6-qtspeech/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/audio/qt6-qtspeech/patches/patch-cmake_FindFlite.cmake
cvs rdiff -u -r1.19 -r1.20 pkgsrc/meta-pkgs/qt6/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/x11/qt6-qtbase/Makefile.common

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

Modified files:

Index: pkgsrc/audio/Makefile
diff -u pkgsrc/audio/Makefile:1.661 pkgsrc/audio/Makefile:1.662
--- pkgsrc/audio/Makefile:1.661 Thu Nov  3 06:16:31 2022
+++ pkgsrc/audio/Makefile       Mon Nov 28 13:44:14 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.661 2022/11/03 06:16:31 wiz Exp $
+# $NetBSD: Makefile,v 1.662 2022/11/28 13:44:14 nros Exp $
 #
 
 COMMENT=       Audio tools, players, and libraries
@@ -422,6 +422,7 @@ SUBDIR+=    py-soundfile
 SUBDIR+=       qjackctl
 SUBDIR+=       qmmp
 SUBDIR+=       qsynth
+SUBDIR+=       qt6-qtspeech
 SUBDIR+=       qtplay
 SUBDIR+=       quodlibet
 SUBDIR+=       rexima

Index: pkgsrc/meta-pkgs/qt6/Makefile
diff -u pkgsrc/meta-pkgs/qt6/Makefile:1.19 pkgsrc/meta-pkgs/qt6/Makefile:1.20
--- pkgsrc/meta-pkgs/qt6/Makefile:1.19  Mon Nov 28 13:04:39 2022
+++ pkgsrc/meta-pkgs/qt6/Makefile       Mon Nov 28 13:44:14 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2022/11/28 13:04:39 nros Exp $
+# $NetBSD: Makefile,v 1.20 2022/11/28 13:44:14 nros Exp $
 
 DISTNAME=      qt6-${QTVERSION}
 
@@ -29,5 +29,6 @@ DEPENDS+=     qt6-qt3d-${QTVERSION}{,nb[0-9]
 DEPENDS+=      qt6-qtremoteobjects-${QTVERSION}{,nb[0-9]*}:../../net/qt6-qtremoteobjects
 DEPENDS+=      qt6-qtscxml-${QTVERSION}{,nb[0-9]*}:../../lang/qt6-qtscxml
 DEPENDS+=      qt6-qtmultimedia-${QTVERSION}{,nb[0-9]*}:../../multimedia/qt6-qtmultimedia
+DEPENDS+=      qt6-qtspeech-${QTVERSION}{,nb[0-9]*}:../../audio/qt6-qtspeech
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/qt6-qtbase/Makefile.common
diff -u pkgsrc/x11/qt6-qtbase/Makefile.common:1.19 pkgsrc/x11/qt6-qtbase/Makefile.common:1.20
--- pkgsrc/x11/qt6-qtbase/Makefile.common:1.19  Mon Nov 28 13:04:40 2022
+++ pkgsrc/x11/qt6-qtbase/Makefile.common       Mon Nov 28 13:44:14 2022
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.common,v 1.19 2022/11/28 13:04:40 nros Exp $
+# $NetBSD: Makefile.common,v 1.20 2022/11/28 13:44:14 nros Exp $
+# used by audio/qt6-qtspeech/Makefile
 # used by databases/qt6-odbc/Makefile
 # used by databases/qt6-psql/Makefile
 # used by graphics/qt6-qt3d/Makefile

Added files:

Index: pkgsrc/audio/qt6-qtspeech/DESCR
diff -u /dev/null pkgsrc/audio/qt6-qtspeech/DESCR:1.1
--- /dev/null   Mon Nov 28 13:44:15 2022
+++ pkgsrc/audio/qt6-qtspeech/DESCR     Mon Nov 28 13:44:14 2022
@@ -0,0 +1 @@
+Qt6 module for text to speech capabilites
Index: pkgsrc/audio/qt6-qtspeech/Makefile
diff -u /dev/null pkgsrc/audio/qt6-qtspeech/Makefile:1.1
--- /dev/null   Mon Nov 28 13:44:15 2022
+++ pkgsrc/audio/qt6-qtspeech/Makefile  Mon Nov 28 13:44:14 2022
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2022/11/28 13:44:14 nros Exp $
+
+DISTNAME=      qtspeech-everywhere-src-${QTVERSION}
+PKGNAME=       qt6-qtspeech-${QTVERSION}
+COMMENT=       Qt6 module for text to speech
+CATEGORIES=    audio
+LICENSE=       gnu-gpl-v3
+
+.include "../../mk/bsd.prefs.mk"
+
+PLIST_VARS+=   flite
+
+.if ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=       -no-flite
+.else
+PLIST.flite=           yes
+CONFIGURE_ARGS+=       -no-flite-alsa
+.endif
+
+.include "../../x11/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 "../../lang/qt6-qtdeclarative/buildlink3.mk"
+.include "../../multimedia/qt6-qtmultimedia/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/audio/qt6-qtspeech/PLIST
diff -u /dev/null pkgsrc/audio/qt6-qtspeech/PLIST:1.1
--- /dev/null   Mon Nov 28 13:44:15 2022
+++ pkgsrc/audio/qt6-qtspeech/PLIST     Mon Nov 28 13:44:14 2022
@@ -0,0 +1,71 @@
+@comment $NetBSD: PLIST,v 1.1 2022/11/28 13:44:14 nros Exp $
+lib/pkgconfig/Qt6TextToSpeech.pc
+qt6/include/QtTextToSpeech/${PKGVERSION}/QtTextToSpeech/private/qtexttospeech_p.h
+qt6/include/QtTextToSpeech/${PKGVERSION}/QtTextToSpeech/private/qtexttospeech_qmltypes_p.h
+qt6/include/QtTextToSpeech/${PKGVERSION}/QtTextToSpeech/private/qttexttospeech-config_p.h
+qt6/include/QtTextToSpeech/${PKGVERSION}/QtTextToSpeech/private/qvoice_p.h
+qt6/include/QtTextToSpeech/QTextToSpeech
+qt6/include/QtTextToSpeech/QTextToSpeechEngine
+qt6/include/QtTextToSpeech/QTextToSpeechPlugin
+qt6/include/QtTextToSpeech/QVoice
+qt6/include/QtTextToSpeech/QtTextToSpeech
+qt6/include/QtTextToSpeech/QtTextToSpeechDepends
+qt6/include/QtTextToSpeech/QtTextToSpeechVersion
+qt6/include/QtTextToSpeech/qtexttospeech.h
+qt6/include/QtTextToSpeech/qtexttospeech_global.h
+qt6/include/QtTextToSpeech/qtexttospeechengine.h
+qt6/include/QtTextToSpeech/qtexttospeechplugin.h
+qt6/include/QtTextToSpeech/qttexttospeech-config.h
+qt6/include/QtTextToSpeech/qttexttospeechversion.h
+qt6/include/QtTextToSpeech/qvoice.h
+qt6/lib/cmake/Qt6/FindFlite.cmake
+qt6/lib/cmake/Qt6/FindSpeechDispatcher.cmake
+qt6/lib/cmake/Qt6BuildInternals/StandaloneTests/QtSpeechTestsConfig.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6Qml/QmlPlugins/Qt6TextToSpeechQmlConfig.cmake
+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
+${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
+qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginTargets-release.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechMockPluginTargets.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginConfig.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginConfigVersion.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginTargets-release.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6QTextToSpeechSpeechdPluginTargets.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechAdditionalTargetInfo.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechConfig.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechConfigVersion.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechConfigVersionImpl.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechDependencies.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechPlugins.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechTargets-release.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechTargets.cmake
+qt6/lib/cmake/Qt6TextToSpeech/Qt6TextToSpeechVersionlessTargets.cmake
+qt6/lib/libQt6TextToSpeech.prl
+qt6/lib/libQt6TextToSpeech.so
+qt6/lib/libQt6TextToSpeech.so.6
+qt6/lib/libQt6TextToSpeech.so.${PKGVERSION}
+qt6/lib/metatypes/qt6texttospeech_release_metatypes.json
+qt6/lib/pkgconfig/Qt6TextToSpeech.pc
+qt6/mkspecs/modules/qt_lib_texttospeech.pri
+qt6/mkspecs/modules/qt_lib_texttospeech_private.pri
+qt6/modules/TextToSpeech.json
+${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
+qt6/qml/QtTextToSpeech/plugins.qmltypes
+qt6/qml/QtTextToSpeech/qmldir
Index: pkgsrc/audio/qt6-qtspeech/buildlink3.mk
diff -u /dev/null pkgsrc/audio/qt6-qtspeech/buildlink3.mk:1.1
--- /dev/null   Mon Nov 28 13:44:15 2022
+++ pkgsrc/audio/qt6-qtspeech/buildlink3.mk     Mon Nov 28 13:44:14 2022
@@ -0,0 +1,15 @@
+# $NetBSD: buildlink3.mk,v 1.1 2022/11/28 13:44:14 nros Exp $
+
+BUILDLINK_TREE+=       qt6-qtspeech
+
+.if !defined(QT6_QTSPEECH_BUILDLINK3_MK)
+QT6_QTSPEECH_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.qt6-qtspeech+=   qt6-qtspeech>=6.4.1
+BUILDLINK_PKGSRCDIR.qt6-qtspeech?=     ../../audio/qt6-qtspeech
+
+.include "../../lang/qt6-qtdeclarative/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.endif # QT6_QTSPEECH_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -qt6-qtspeech
Index: pkgsrc/audio/qt6-qtspeech/distinfo
diff -u /dev/null pkgsrc/audio/qt6-qtspeech/distinfo:1.1
--- /dev/null   Mon Nov 28 13:44:15 2022
+++ pkgsrc/audio/qt6-qtspeech/distinfo  Mon Nov 28 13:44:14 2022
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2022/11/28 13:44:14 nros Exp $
+
+BLAKE2s (qtspeech-everywhere-src-6.4.1.tar.xz) = 03b267a5be1a5e2a32f156f2a66b356e95f606226a44b07ecea9ffca3b03908a
+SHA512 (qtspeech-everywhere-src-6.4.1.tar.xz) = 83c8612215690761c2b4150fc86e13fff547588c98a0f6d97f6ac9a7e2719f85f06c4739f0480f36a9df7805f945ee5e32007a5c52dc58c30632dc47cbd6a49f
+Size (qtspeech-everywhere-src-6.4.1.tar.xz) = 219176 bytes
+SHA1 (patch-cmake_FindFlite.cmake) = 871495c2082dcbd020a80bc30ebe12a41afd6350

Index: pkgsrc/audio/qt6-qtspeech/patches/patch-cmake_FindFlite.cmake
diff -u /dev/null pkgsrc/audio/qt6-qtspeech/patches/patch-cmake_FindFlite.cmake:1.1
--- /dev/null   Mon Nov 28 13:44:15 2022
+++ pkgsrc/audio/qt6-qtspeech/patches/patch-cmake_FindFlite.cmake       Mon Nov 28 13:44:14 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-cmake_FindFlite.cmake,v 1.1 2022/11/28 13:44:14 nros Exp $
+
+* pkgsrc flite does not use ALSA,
+  the test will fail if pkgsrc alsa is
+  installed and cmake finds it, this
+  causes the flite feature to not be
+  used in the package leading to PLIST
+  breakage etc.
+
+--- cmake/FindFlite.cmake.orig 2022-10-05 14:32:21.272294992 +0000
++++ cmake/FindFlite.cmake
+@@ -25,6 +25,7 @@ include(CheckCXXSourceCompiles)
+ # Flite can be built with ALSA support,
+ # in which case we need to link ALSA as well
+ find_package(ALSA QUIET)
++set(ALSA_FOUND 0)
+ 
+ cmake_push_check_state(RESET)
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index