speech-dispatcher: fix build on Darwin

This commit is contained in:
adam 2024-03-24 10:28:14 +00:00
parent f6bc4782ea
commit 741b952b54
6 changed files with 248 additions and 18 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.33 2024/03/12 08:57:39 wiz Exp $
# $NetBSD: Makefile,v 1.34 2024/03/24 10:28:14 adam Exp $
DISTNAME= speech-dispatcher-0.11.5
CATEGORIES= audio
@ -11,11 +11,10 @@ HOMEPAGE= https://devel.freebsoft.org/speechd
COMMENT= Common interface to speech synthesis library
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool pkg-config makeinfo
USE_TOOLS+= msgfmt msgmerge xgettext
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= gmake intltool makeinfo msgfmt msgmerge pkg-config xgettext
GNU_CONFIGURE= yes
INFO_FILES= yes
@ -60,8 +59,13 @@ CONF_FILES+= ${PREFIX}/share/examples/speech-dispatcher/modules/${module} \
REPLACE_PYTHON+= src/api/python/speechd_config/spd-conf
PLIST_VARS+= mods
.if ${OPSYS} != "Darwin"
PLIST.mods= yes
post-install:
${INSTALL_LIB} ${WRKSRC}/src/modules/*so ${DESTDIR}${PREFIX}/lib
.endif
.include "../../audio/espeak-ng/buildlink3.mk"
.include "../../audio/flite/buildlink3.mk"

View File

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.7 2024/03/12 08:53:19 wiz Exp $
@comment $NetBSD: PLIST,v 1.8 2024/03/24 10:28:14 adam Exp $
bin/spd-conf
bin/spd-say
bin/spdsend
@ -43,7 +43,7 @@ ${PYSITELIB}/speechd_config/config.py
${PYSITELIB}/speechd_config/config.pyc
${PYSITELIB}/speechd_config/config.pyo
lib/speech-dispatcher/spd_libao.la
libexec/speech-dispatcher-modules/sd_baratinoo
${PLIST.mods}libexec/speech-dispatcher-modules/sd_baratinoo
libexec/speech-dispatcher-modules/sd_cicero
libexec/speech-dispatcher-modules/sd_dummy
libexec/speech-dispatcher-modules/sd_espeak-ng
@ -51,13 +51,13 @@ libexec/speech-dispatcher-modules/sd_espeak-ng-mbrola
libexec/speech-dispatcher-modules/sd_festival
libexec/speech-dispatcher-modules/sd_flite
libexec/speech-dispatcher-modules/sd_generic
libexec/speech-dispatcher-modules/sd_kali
libexec/speech-dispatcher-modules/sd_voxin
${PLIST.mods}libexec/speech-dispatcher-modules/sd_kali
${PLIST.mods}libexec/speech-dispatcher-modules/sd_voxin
man/man1/spd-conf.1
man/man1/spd-say.1
man/man1/speech-dispatcher.1
share/examples/speech-dispatcher/clients/emacs.conf
share/examples/speech-dispatcher/modules/baratinoo.conf
${PLIST.mods}share/examples/speech-dispatcher/modules/baratinoo.conf
share/examples/speech-dispatcher/modules/cicero.conf
share/examples/speech-dispatcher/modules/dtk-generic.conf
share/examples/speech-dispatcher/modules/epos-generic.conf
@ -68,12 +68,12 @@ share/examples/speech-dispatcher/modules/espeak-ng.conf
share/examples/speech-dispatcher/modules/espeak.conf
share/examples/speech-dispatcher/modules/festival.conf
share/examples/speech-dispatcher/modules/flite.conf
share/examples/speech-dispatcher/modules/kali.conf
${PLIST.mods}share/examples/speech-dispatcher/modules/kali.conf
share/examples/speech-dispatcher/modules/llia_phon-generic.conf
share/examples/speech-dispatcher/modules/mary-generic.conf
share/examples/speech-dispatcher/modules/mimic3-generic.conf
share/examples/speech-dispatcher/modules/swift-generic.conf
share/examples/speech-dispatcher/modules/voxin.conf
${PLIST.mods}share/examples/speech-dispatcher/modules/voxin.conf
share/examples/speech-dispatcher/speechd.conf
share/locale/cs/LC_MESSAGES/speech-dispatcher.mo
share/locale/de/LC_MESSAGES/speech-dispatcher.mo
@ -88,14 +88,14 @@ share/sounds/speech-dispatcher/dummy-message.wav
share/sounds/speech-dispatcher/test.wav
share/speech-dispatcher/conf/clients/emacs.conf
share/speech-dispatcher/conf/desktop/speechd.desktop
share/speech-dispatcher/conf/modules/baratinoo.conf
${PLIST.mods}share/speech-dispatcher/conf/modules/baratinoo.conf
share/speech-dispatcher/conf/modules/cicero.conf
share/speech-dispatcher/conf/modules/espeak-ng-mbrola.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/kali.conf
share/speech-dispatcher/conf/modules/voxin.conf
${PLIST.mods}share/speech-dispatcher/conf/modules/kali.conf
${PLIST.mods}share/speech-dispatcher/conf/modules/voxin.conf
share/speech-dispatcher/conf/speechd.conf
share/speech-dispatcher/locale/af/emojis.dic
share/speech-dispatcher/locale/am/emojis.dic

View File

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.6 2024/03/12 08:53:19 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.7 2024/03/24 10:28:14 adam Exp $
BUILDLINK_TREE+= speech-dispatcher
@ -6,7 +6,7 @@ BUILDLINK_TREE+= speech-dispatcher
SPEECH_DISPATCHER_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.speech-dispatcher+= speech-dispatcher>=0.8.4
BUILDLINK_ABI_DEPENDS.speech-dispatcher?= speech-dispatcher>=0.10.2nb8
BUILDLINK_ABI_DEPENDS.speech-dispatcher+= speech-dispatcher>=0.10.2nb8
BUILDLINK_PKGSRCDIR.speech-dispatcher?= ../../audio/speech-dispatcher
.include "../../devel/glib2/buildlink3.mk"

View File

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.8 2024/03/12 08:53:19 wiz Exp $
$NetBSD: distinfo,v 1.9 2024/03/24 10:28:14 adam Exp $
BLAKE2s (speech-dispatcher-0.11.5.tar.gz) = cf3c479b27173d96225026d886e360b6cf2d25474180b2cbf574d7f256171ab9
SHA512 (speech-dispatcher-0.11.5.tar.gz) = d6d880bce0ae5bc2a5d519ef7740c689ae8b4b0bb658379762810e4beae3e465a429fbe19f7c490e89db0ea6a36aedd4b2287ac9251b90059b5c2cb3c0dd8a28
@ -6,5 +6,7 @@ Size (speech-dispatcher-0.11.5.tar.gz) = 7230756 bytes
SHA1 (patch-config_Makefile.in) = dd58a389bc9820d85e4fe912faff7e2cf969fa8e
SHA1 (patch-config_clients_Makefile.in) = 4c172a7c33336343b88707ae17702c80c97c28f5
SHA1 (patch-config_modules_Makefile.in) = 674d4306baf0e2c0d5d91f4576922be8405d93b3
SHA1 (patch-configure) = 6396c925040cb4583b6e67178551b5dfd145c07d
SHA1 (patch-src-audio-libao.c) = d974ecdb0653082ef39cdefb55b4c9b2f8ec1c68
SHA1 (patch-src_modules_Makefile.in) = fde7e250546ba38ad27c4cf6ae136feb189c0591
SHA1 (patch-src_modules_espeak.c) = e75d4269c393df15359b9574ca99643a9b87faf3

View File

@ -0,0 +1,103 @@
$NetBSD: patch-configure,v 1.1 2024/03/24 10:28:15 adam Exp $
Allow _module_speak _module_speak_sync being undefined
https://github.com/brailcom/speechd/pull/853
--- configure.orig 2023-08-06 18:00:07.000000000 +0000
+++ configure
@@ -775,6 +775,8 @@ GLIB_CFLAGS
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
+DARWIN_HOST_FALSE
+DARWIN_HOST_TRUE
HAVE_HELP2MAN_FALSE
HAVE_HELP2MAN_TRUE
HELP2MAN
@@ -20816,6 +20818,26 @@ fi
fi
+if test x$enable_shared = xyes;
+then
+ default_shim=shim
+else
+ default_shim=no
+fi
+
+case "$host" in
+ *-*darwin*)
+ darwin_host=yes
+ default_shim=no
+ ;;
+esac
+ if test "$darwin_host" = yes; then
+ DARWIN_HOST_TRUE=
+ DARWIN_HOST_FALSE='#'
+else
+ DARWIN_HOST_TRUE='#'
+ DARWIN_HOST_FALSE=
+ fi
@@ -23572,13 +23594,10 @@ printf "%s\n" "$as_me: error: in \`$ac_p
as_fn_error $? "IBMTTS is not available
See \`config.log' for more details" "$LINENO" 5; }
fi
- with_ibmtts=shim
+ with_ibmtts=$default_shim
fi
fi
-if test "$with_ibmtts" = shim -a $enable_shared = no; then
- with_ibmtts=no
-fi
if test $with_ibmtts != no; then
ibmtts_support_TRUE=
ibmtts_support_FALSE='#'
@@ -23659,13 +23678,10 @@ printf "%s\n" "$as_me: error: in \`$ac_p
as_fn_error $? "Voxin is not available
See \`config.log' for more details" "$LINENO" 5; }
fi
- with_voxin=shim
+ with_voxin=$default_shim
fi
fi
-if test "$with_voxin" = shim -a $enable_shared = no; then
- with_voxin=no
-fi
if test "$with_voxin" != no; then
voxin_support_TRUE=
voxin_support_FALSE='#'
@@ -23893,13 +23909,10 @@ printf "%s\n" "$as_me: error: in \`$ac_p
as_fn_error $? "Voxygen Baratinoo is not available
See \`config.log' for more details" "$LINENO" 5; }
fi
- with_baratinoo=shim
+ with_baratinoo=$default_shim
fi
fi
-if test "$with_baratinoo" = shim -a $enable_shared = no; then
- with_baratinoo=no
-fi
if test "$with_baratinoo" != no; then
baratinoo_support_TRUE=
baratinoo_support_FALSE='#'
@@ -23979,13 +23992,10 @@ printf "%s\n" "$as_me: error: in \`$ac_p
as_fn_error $? "Kali is not available
See \`config.log' for more details" "$LINENO" 5; }
fi
- with_kali=shim
+ with_kali=$default_shim
fi
fi
-if test "$with_kali" = shim -a $enable_shared = no; then
- with_kali=no
-fi
if test $with_kali != no; then
kali_support_TRUE=
kali_support_FALSE='#'

View File

@ -0,0 +1,121 @@
$NetBSD: patch-src_modules_Makefile.in,v 1.1 2024/03/24 10:28:15 adam Exp $
Allow _module_speak _module_speak_sync being undefined
https://github.com/brailcom/speechd/pull/853
--- src/modules/Makefile.in.orig 2023-08-06 18:00:06.000000000 +0000
+++ src/modules/Makefile.in
@@ -107,6 +107,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
+@DARWIN_HOST_TRUE@am__append_1 = -Wl,-U,_module_speak -Wl,-U,_module_speak_sync
noinst_PROGRAMS = sd_skeleton0$(EXEEXT) sd_skeleton_config$(EXEEXT) \
$(am__EXEEXT_10)
modulebin_PROGRAMS = sd_dummy$(EXEEXT) sd_generic$(EXEEXT) \
@@ -114,28 +115,28 @@ modulebin_PROGRAMS = sd_dummy$(EXEEXT) s
$(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
$(am__EXEEXT_5) $(am__EXEEXT_6) $(am__EXEEXT_7) \
$(am__EXEEXT_8) $(am__EXEEXT_9)
-@flite_support_TRUE@am__append_1 = sd_flite
-@ibmtts_support_TRUE@am__append_2 = sd_ibmtts
-@ibmtts_shim_TRUE@@ibmtts_support_TRUE@am__append_3 = -L.
-@ibmtts_shim_TRUE@@ibmtts_support_TRUE@am__append_4 = $(EXTRA_sd_ibmtts_DEPENDENCIES)
-@espeak_support_TRUE@am__append_5 = sd_espeak
-@espeak_ng_support_TRUE@am__append_6 = sd_espeak-ng
-@espeak_ng_support_TRUE@am__append_7 = sd_skeleton0_espeak-ng-sync \
+@flite_support_TRUE@am__append_2 = sd_flite
+@ibmtts_support_TRUE@am__append_3 = sd_ibmtts
+@ibmtts_shim_TRUE@@ibmtts_support_TRUE@am__append_4 = -L.
+@ibmtts_shim_TRUE@@ibmtts_support_TRUE@am__append_5 = $(EXTRA_sd_ibmtts_DEPENDENCIES)
+@espeak_support_TRUE@am__append_6 = sd_espeak
+@espeak_ng_support_TRUE@am__append_7 = sd_espeak-ng
+@espeak_ng_support_TRUE@am__append_8 = sd_skeleton0_espeak-ng-sync \
@espeak_ng_support_TRUE@ sd_skeleton0_espeak-ng-async \
@espeak_ng_support_TRUE@ sd_skeleton0_espeak-ng-sync-server \
@espeak_ng_support_TRUE@ sd_skeleton0_espeak-ng-async-server
-@ivona_support_TRUE@am__append_8 = sd_ivona
-@pico_support_TRUE@am__append_9 = sd_pico
-@baratinoo_support_TRUE@am__append_10 = sd_baratinoo
-@baratinoo_shim_TRUE@@baratinoo_support_TRUE@am__append_11 = -L.
-@baratinoo_shim_TRUE@@baratinoo_support_TRUE@am__append_12 = $(EXTRA_sd_baratinoo_DEPENDENCIES)
-@kali_support_TRUE@am__append_13 = sd_kali
-@kali_shim_TRUE@@kali_support_TRUE@am__append_14 = -L.
-@kali_shim_TRUE@@kali_support_TRUE@am__append_15 = -I$(srcdir)/kali_shim
-@kali_shim_TRUE@@kali_support_TRUE@am__append_16 = $(EXTRA_sd_kali_DEPENDENCIES)
-@voxin_support_TRUE@am__append_17 = sd_voxin
-@voxin_shim_TRUE@@voxin_support_TRUE@am__append_18 = -L.
-@voxin_shim_TRUE@@voxin_support_TRUE@am__append_19 = $(EXTRA_sd_voxin_DEPENDENCIES)
+@ivona_support_TRUE@am__append_9 = sd_ivona
+@pico_support_TRUE@am__append_10 = sd_pico
+@baratinoo_support_TRUE@am__append_11 = sd_baratinoo
+@baratinoo_shim_TRUE@@baratinoo_support_TRUE@am__append_12 = -L.
+@baratinoo_shim_TRUE@@baratinoo_support_TRUE@am__append_13 = $(EXTRA_sd_baratinoo_DEPENDENCIES)
+@kali_support_TRUE@am__append_14 = sd_kali
+@kali_shim_TRUE@@kali_support_TRUE@am__append_15 = -L.
+@kali_shim_TRUE@@kali_support_TRUE@am__append_16 = -I$(srcdir)/kali_shim
+@kali_shim_TRUE@@kali_support_TRUE@am__append_17 = $(EXTRA_sd_kali_DEPENDENCIES)
+@voxin_support_TRUE@am__append_18 = sd_voxin
+@voxin_shim_TRUE@@voxin_support_TRUE@am__append_19 = -L.
+@voxin_shim_TRUE@@voxin_support_TRUE@am__append_20 = $(EXTRA_sd_voxin_DEPENDENCIES)
subdir = src/modules
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
@@ -624,7 +625,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
INTLLIBS = @INTLLIBS@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ $(am__append_1)
LIBAO_CFLAGS = @LIBAO_CFLAGS@
LIBAO_LIBS = @LIBAO_LIBS@
LIBICONV = @LIBICONV@
@@ -773,8 +774,8 @@ EXTRA_DIST = baratinoo_shim.c README.bar
kali_KParle_shim.cpp kali_KAnalyse_shim.cpp ibmtts_shim.c \
eci.h voxin_shim.c voxin.h module_main.h module_utils.h \
dummy-message-default.wav dummy-message.txt
-CLEANFILES = dummy-message.wav $(am__append_4) $(am__append_12) \
- $(am__append_16) $(am__append_19)
+CLEANFILES = dummy-message.wav $(am__append_5) $(am__append_13) \
+ $(am__append_17) $(am__append_20)
inc_local = -I$(top_srcdir)/include -I$(top_srcdir)/src/common
common_SOURCES = module_main.c module_readline.c module_process.c module_config.c module_utils.c module_utils.h
common_LDADD = $(DOTCONF_LIBS) $(GLIB_LIBS) $(audio_dlopen) -lpthread
@@ -830,7 +831,7 @@ sd_cicero_LDADD = $(top_builddir)/src/co
@ibmtts_support_TRUE@sd_ibmtts_LDADD = \
@ibmtts_support_TRUE@ $(top_builddir)/src/common/libcommon.la \
@ibmtts_support_TRUE@ -libmeci $(audio_dlopen_modules) \
-@ibmtts_support_TRUE@ $(common_LDADD) $(am__append_3)
+@ibmtts_support_TRUE@ $(common_LDADD) $(am__append_4)
@ibmtts_support_TRUE@ibmtts_CPPFLAGS = $(AM_CPPFLAGS) \
@ibmtts_support_TRUE@ $(DOTCONF_CFLAGS) \
@ibmtts_support_TRUE@ $(ibmtts_include)
@@ -877,16 +878,16 @@ sd_cicero_LDADD = $(top_builddir)/src/co
@baratinoo_support_TRUE@sd_baratinoo_SOURCES = baratinoo.c baratinoo_compat.h $(common_SOURCES)
@baratinoo_support_TRUE@sd_baratinoo_LDADD = $(top_builddir)/src/common/libcommon.la \
@baratinoo_support_TRUE@ -lbaratinoo $(common_LDADD) \
-@baratinoo_support_TRUE@ $(am__append_11)
+@baratinoo_support_TRUE@ $(am__append_12)
@baratinoo_shim_TRUE@@baratinoo_support_TRUE@EXTRA_sd_baratinoo_DEPENDENCIES = libbaratinoo.so
@kali_support_TRUE@KALI_DIR = /usr/lib/kali
@kali_support_TRUE@sd_kali_SOURCES = kali.cpp $(common_SOURCES)
@kali_support_TRUE@sd_kali_LDADD = \
@kali_support_TRUE@ $(top_builddir)/src/common/libcommon.la \
@kali_support_TRUE@ -lKali -lKGlobal -lKTrans -lKParle \
-@kali_support_TRUE@ -lKAnalyse $(common_LDADD) $(am__append_14)
+@kali_support_TRUE@ -lKAnalyse $(common_LDADD) $(am__append_15)
@kali_support_TRUE@sd_kali_CPPFLAGS = -DLINUX $(AM_CPPFLAGS) \
-@kali_support_TRUE@ $(am__append_15)
+@kali_support_TRUE@ $(am__append_16)
@kali_shim_TRUE@@kali_support_TRUE@noinst_HEADERS = kali_shim/kali/Kali/kali.h
@kali_shim_TRUE@@kali_support_TRUE@EXTRA_sd_kali_DEPENDENCIES = libKali.so libKGlobal.so libKTrans.so libKParle.so libKAnalyse.so
@voxin_support_TRUE@sd_voxin_SOURCES = ibmtts.c $(common_SOURCES) \
@@ -894,7 +895,7 @@ sd_cicero_LDADD = $(top_builddir)/src/co
@voxin_support_TRUE@sd_voxin_LDADD = \
@voxin_support_TRUE@ $(top_builddir)/src/common/libcommon.la \
-@voxin_support_TRUE@ -lvoxin $(common_LDADD) $(am__append_18)
+@voxin_support_TRUE@ -lvoxin $(common_LDADD) $(am__append_19)
@voxin_support_TRUE@sd_voxin_CPPFLAGS = -DVOXIN $(AM_CPPFLAGS) \
@voxin_support_TRUE@ $(DOTCONF_CFLAGS) \
@voxin_support_TRUE@ $(ibmtts_include)