From 5862829c79fe0e430a9101fc19bdf82da039274d Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 8 May 2021 11:01:16 +0000 Subject: [PATCH] Disable some stuff until proven useful. Fix some @sample while here. --- audio/speech-dispatcher/Makefile | 16 ++++++++++------ audio/speech-dispatcher/pkg/PLIST | 18 ++++-------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/audio/speech-dispatcher/Makefile b/audio/speech-dispatcher/Makefile index 936f76a17fa..a72de729fc4 100755 --- a/audio/speech-dispatcher/Makefile +++ b/audio/speech-dispatcher/Makefile @@ -1,11 +1,12 @@ -# $OpenBSD: Makefile,v 1.33 2021/02/23 19:39:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.34 2021/05/08 11:01:16 ajacoutot Exp $ COMMENT= common interface to speech synthesis V= 0.10.2 DISTNAME= speech-dispatcher-${V} +REVISION= 0 -SHARED_LIBS += speechd 2.2 # .10.2 +SHARED_LIBS += speechd 2.2 # .8.0 CATEGORIES= audio @@ -14,9 +15,8 @@ HOMEPAGE= http://devel.freebsoft.org/speechd # GPLv2 PERMIT_PACKAGE= Yes -WANTLIB += ${COMPILER_LIBCXX} FLAC ao c dotconf espeak glib-2.0 -WANTLIB += gmodule-2.0 gthread-2.0 iconv intl ltdl m ogg sndfile -WANTLIB += vorbis vorbisenc +WANTLIB += ao c dotconf espeak glib-2.0 gmodule-2.0 gthread-2.0 +WANTLIB += iconv intl ltdl m pthread sndfile MASTER_SITES= https://github.com/brailcom/speechd/releases/download/${V}/ @@ -50,7 +50,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ENV += ac_cv_prog_HELP2MAN= CONFIGURE_ARGS= --without-pulse \ - --without-flite + --without-flite \ + --without-kali \ + --without-baratinoo \ + --without-ibmtts \ + --without-voxin FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/speech-dispatcher diff --git a/audio/speech-dispatcher/pkg/PLIST b/audio/speech-dispatcher/pkg/PLIST index 6f8a15ae422..aa304203dd2 100644 --- a/audio/speech-dispatcher/pkg/PLIST +++ b/audio/speech-dispatcher/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.10 2021/02/01 00:08:18 jsg Exp $ +@comment $OpenBSD: PLIST,v 1.11 2021/05/08 11:01:16 ajacoutot Exp $ bin/spd-conf @bin bin/spd-say @bin bin/spdsend @@ -44,15 +44,11 @@ lib/python${MODPY_VERSION}/site-packages/speechd_config/config.py lib/python${MODPY_VERSION}/site-packages/speechd_config/paths.py lib/speech-dispatcher/ lib/speech-dispatcher-modules/ -@bin lib/speech-dispatcher-modules/sd_baratinoo @bin lib/speech-dispatcher-modules/sd_cicero @bin lib/speech-dispatcher-modules/sd_dummy @bin lib/speech-dispatcher-modules/sd_espeak @bin lib/speech-dispatcher-modules/sd_festival @bin lib/speech-dispatcher-modules/sd_generic -@bin lib/speech-dispatcher-modules/sd_ibmtts -@bin lib/speech-dispatcher-modules/sd_kali -@bin lib/speech-dispatcher-modules/sd_voxin @so lib/speech-dispatcher/spd_libao.so share/examples/speech-dispatcher/ share/examples/speech-dispatcher/speech-dispatcher/ @@ -63,7 +59,6 @@ share/examples/speech-dispatcher/speech-dispatcher/clients/emacs.conf @sample ${SYSCONFDIR}/speech-dispatcher/clients/emacs.conf share/examples/speech-dispatcher/speech-dispatcher/modules/ @sample ${SYSCONFDIR}/speech-dispatcher/modules/ -share/examples/speech-dispatcher/speech-dispatcher/modules/baratinoo.conf share/examples/speech-dispatcher/speech-dispatcher/modules/cicero.conf @sample ${SYSCONFDIR}/speech-dispatcher/modules/cicero.conf share/examples/speech-dispatcher/speech-dispatcher/modules/dtk-generic.conf @@ -73,24 +68,23 @@ share/examples/speech-dispatcher/speech-dispatcher/modules/epos-generic.conf share/examples/speech-dispatcher/speech-dispatcher/modules/espeak-mbrola-generic.conf @sample ${SYSCONFDIR}/speech-dispatcher/modules/espeak-mbrola-generic.conf share/examples/speech-dispatcher/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf +@sample ${SYSCONFDIR}/speech-dispatcher/modules/espeak-ng-mbrola-generic.conf share/examples/speech-dispatcher/speech-dispatcher/modules/espeak-ng.conf +@sample ${SYSCONFDIR}/speech-dispatcher/modules/espeak-ng.conf share/examples/speech-dispatcher/speech-dispatcher/modules/espeak.conf @sample ${SYSCONFDIR}/speech-dispatcher/modules/espeak.conf share/examples/speech-dispatcher/speech-dispatcher/modules/festival.conf @sample ${SYSCONFDIR}/speech-dispatcher/modules/festival.conf share/examples/speech-dispatcher/speech-dispatcher/modules/flite.conf @sample ${SYSCONFDIR}/speech-dispatcher/modules/flite.conf -share/examples/speech-dispatcher/speech-dispatcher/modules/ibmtts.conf -@sample ${SYSCONFDIR}/speech-dispatcher/modules/ibmtts.conf share/examples/speech-dispatcher/speech-dispatcher/modules/ivona.conf @sample ${SYSCONFDIR}/speech-dispatcher/modules/ivona.conf -share/examples/speech-dispatcher/speech-dispatcher/modules/kali.conf share/examples/speech-dispatcher/speech-dispatcher/modules/llia_phon-generic.conf @sample ${SYSCONFDIR}/speech-dispatcher/modules/llia_phon-generic.conf share/examples/speech-dispatcher/speech-dispatcher/modules/mary-generic-disabled.conf +@sample ${SYSCONFDIR}/speech-dispatcher/modules/mary-generic-disabled.conf share/examples/speech-dispatcher/speech-dispatcher/modules/swift-generic.conf @sample ${SYSCONFDIR}/speech-dispatcher/modules/swift-generic.conf -share/examples/speech-dispatcher/speech-dispatcher/modules/voxin.conf share/examples/speech-dispatcher/speech-dispatcher/speechd.conf @sample ${SYSCONFDIR}/speech-dispatcher/speechd.conf share/locale/cs/LC_MESSAGES/speech-dispatcher.mo @@ -114,14 +108,10 @@ share/speech-dispatcher/conf/clients/emacs.conf share/speech-dispatcher/conf/desktop/ share/speech-dispatcher/conf/desktop/speechd.desktop share/speech-dispatcher/conf/modules/ -share/speech-dispatcher/conf/modules/baratinoo.conf share/speech-dispatcher/conf/modules/cicero.conf share/speech-dispatcher/conf/modules/espeak-ng.conf share/speech-dispatcher/conf/modules/espeak.conf share/speech-dispatcher/conf/modules/festival.conf -share/speech-dispatcher/conf/modules/ibmtts.conf -share/speech-dispatcher/conf/modules/kali.conf -share/speech-dispatcher/conf/modules/voxin.conf share/speech-dispatcher/conf/speechd.conf share/speech-dispatcher/locale/ share/speech-dispatcher/locale/af/