pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
speech-dispatcher: Fix libs installation. speech-dispatcher: Remove unnecessary workaround. speech-dispatcher: Remove (possible) unnecessary macos test.
Module Name: pkgsrc-wip
Committed By: adr <adr%sdf.org@localhost>
Pushed By: adr
Date: Mon Mar 11 23:09:56 2024 +0000
Changeset: a84b633f17a345776dbb593e810e1ab98c582009
Modified Files:
speech-dispatcher/Makefile
speech-dispatcher/PLIST
Log Message:
speech-dispatcher: Fix libs installation.
speech-dispatcher: Remove unnecessary workaround.
speech-dispatcher: Remove (possible) unnecessary macos test.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a84b633f17a345776dbb593e810e1ab98c582009
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
speech-dispatcher/Makefile | 20 +++++++-------------
speech-dispatcher/PLIST | 7 +++++++
2 files changed, 14 insertions(+), 13 deletions(-)
diffs:
diff --git a/speech-dispatcher/Makefile b/speech-dispatcher/Makefile
index ca30d8135d..6766104b7c 100644
--- a/speech-dispatcher/Makefile
+++ b/speech-dispatcher/Makefile
@@ -46,19 +46,12 @@ CONF_FILES+= ${PREFIX}/share/examples/speech-dispatcher/clients/emacs.conf \
CONF_FILES+= ${PREFIX}/share/examples/speech-dispatcher/speechd.conf \
${PKG_SYSCONFDIR}/speechd.conf
-PLIST_VARS+= espeak
-
MODULES= baratinoo.conf cicero.conf dtk-generic.conf epos-generic.conf \
festival.conf flite.conf kali.conf \
llia_phon-generic.conf mary-generic.conf mimic3-generic.conf \
- swift-generic.conf voxin.conf
-.if ${OPSYS} != "Darwin"
-# espeak officially says it does not support macOS:
-# https://github.com/rhdunn/espeak/issues/78
-MODULES+= espeak-mbrola-generic.conf espeak-ng-mbrola.conf espeak-ng-mbrola-generic.conf \
+ swift-generic.conf voxin.conf \
+ espeak-mbrola-generic.conf espeak-ng-mbrola.conf espeak-ng-mbrola-generic.conf \
espeak-ng.conf espeak.conf
-PLIST.espeak= yes
-.endif
.for module in ${MODULES}
CONF_FILES+= ${PREFIX}/share/examples/speech-dispatcher/modules/${module} \
@@ -69,12 +62,13 @@ REPLACE_PYTHON+= src/api/python/speechd_config/spd-conf
# temporary fix for GLib 2.68 breakage
# # https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963
-CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
-BUILDLINK_API_DEPENDS.glib2+= glib2>=2.66.0
+#CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
+#BUILDLINK_API_DEPENDS.glib2+= glib2>=2.66.0
+
+post-install:
+ ${INSTALL_LIB} ${WRKSRC}/src/modules/*so ${DESTDIR}${PREFIX}/lib
-.if ${OPSYS} != "Darwin"
.include "../../audio/espeak-ng/buildlink3.mk"
-.endif
.include "../../audio/flite/buildlink3.mk"
.include "../../audio/libao/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
diff --git a/speech-dispatcher/PLIST b/speech-dispatcher/PLIST
index be36dcc49e..fc587bd6d4 100644
--- a/speech-dispatcher/PLIST
+++ b/speech-dispatcher/PLIST
@@ -12,7 +12,14 @@ info/spd-say.info
info/speech-dispatcher-cs.info
info/speech-dispatcher.info
info/ssip.info
+lib/libKAnalyse.so
+lib/libKGlobal.so
+lib/libKParle.so
+lib/libKTrans.so
+lib/libKali.so
+lib/libbaratinoo.so
lib/libspeechd.la
+lib/libvoxin.so
lib/pkgconfig/speech-dispatcher.pc
${PYSITELIB}/speechd/__init__.py
${PYSITELIB}/speechd/__init__.pyc
Home |
Main Index |
Thread Index |
Old Index