summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Heiko Becker <heirecka@exherbo.org> 2017-08-31 22:11:22 +0200
committerAvatar Heiko Becker <heirecka@exherbo.org> 2017-09-02 12:44:57 +0200
commitc284c5ee78b2f6dfb0be07474fd1506bcb0aaaf2 (patch)
tree74a3ffb29f072eca3da07d0223421585f6ba7e03
parentc6c056158f54d0bbbd5fb1783f858d761eb1c5bf (diff)
downloadmedia-c284c5ee78b2f6dfb0be07474fd1506bcb0aaaf2.tar.gz
media-c284c5ee78b2f6dfb0be07474fd1506bcb0aaaf2.tar.xz
speechd: Fix broken option combination [alsa][-ao]
3a571361f222cc2147f3b8c02371cd873e71fd25 bound the alsa option to --with-libao/--without-libao. But if you enable alsa and disable ao "--with-libao --without-libao" is passed to configure and the last one wins, leaving you without support for alsa and possibly even without any audio output module, which is how I found this. That being said, I'm not convinced libao[alsa] works better, but it doesn't seem worse either and at least the exheres works as expected with this fix. Change-Id: I391b7d1cdd673d8c240251ec589a4435c071e9d6
-rw-r--r--packages/app-speech/speechd/speechd-0.8.7-r1.exheres-0 (renamed from packages/app-speech/speechd/speechd-0.8.7.exheres-0)56
1 files changed, 32 insertions, 24 deletions
diff --git a/packages/app-speech/speechd/speechd-0.8.7.exheres-0 b/packages/app-speech/speechd/speechd-0.8.7-r1.exheres-0
index 7d1c432..59ad907 100644
--- a/packages/app-speech/speechd/speechd-0.8.7.exheres-0
+++ b/packages/app-speech/speechd/speechd-0.8.7-r1.exheres-0
@@ -53,30 +53,6 @@ DEPENDENCIES="
WORK=${WORKBASE}/${PN/d/-dispatcher}-${PV}
-DEFAULT_SRC_CONFIGURE_PARAMS=(
- --enable-nls
- --disable-static
- # ALSA audio output driver is buggy and known to cause crashes
- --without-alsa
- # We only have espeak, not -ng
- --without-espeak-ng
- # Hard-disable these backends atm
- --without-ibmtts
- --without-ivona
- # Hard-disable network audio system, needs NAS (http://radscan.com/nas.html)
- --without-nas
- --without-oss
- --without-pico
-)
-
-DEFAULT_SRC_CONFIGURE_OPTION_WITHS=(
- "alsa libao"
- "ao libao"
- espeak
- flite
- "pulseaudio pulse"
-)
-DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=( python )
src_prepare() {
edo sed -i -e "s:env python[[:digit:].]*$:env ${PYTHON##*/}:" \
@@ -85,6 +61,38 @@ src_prepare() {
edo intltoolize --force --copy --automake
}
+src_configure() {
+ local params=(
+ --enable-nls
+ --disable-static
+ # ALSA audio output driver is buggy and known to cause crashes
+ --without-alsa
+ # We only have espeak, not -ng
+ --without-espeak-ng
+ # Hard-disable these backends atm
+ --without-ibmtts
+ --without-ivona
+ # Hard-disable network audio system, needs NAS (http://radscan.com/nas.html)
+ --without-nas
+ --without-oss
+ --without-pico
+ $(option_enable python)
+ $(option_with espeak)
+ $(option_with flite)
+ $(option_with pulseaudio pulse)
+ )
+
+ # ALSA audio output driver is buggy and known to cause crashes, thus we
+ # use libao[alsa].
+ if option alsa || option ao ; then
+ params+=( --with-libao )
+ else
+ params+=( --without-libao )
+ fi
+
+ econf "${params[@]}"
+}
+
src_test() {
default