File brltty-5.0-speechd.diff of Package brltty

Overview Repositories Revisions Requests Users Attributes Meta

File brltty-5.0-speechd.diff of Package brltty (Revision 612abd15e31493d5ba88469a682098d0)

Currently displaying revision 612abd15e31493d5ba88469a682098d0 , Show latest

From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-06-18 11:27:55.105668872 +0200

speech-dispatcher-0.8 moved speechd.h from /usr/include
to /usr/include/speech-dispatcher.

This patch is not really for upstream; the proper way to
use speech-dispatcher is by way of pkg-config. This here is
just a quick way to get it building in openSUSE again.

---
 Drivers/Speech/SpeechDispatcher/speech.c |    2 +-
 configure                                |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: brltty-4.3/Drivers/Speech/SpeechDispatcher/speech.c
===================================================================
--- brltty-4.3.orig/Drivers/Speech/SpeechDispatcher/speech.c
+++ brltty-4.3/Drivers/Speech/SpeechDispatcher/speech.c
@@ -34,7 +34,7 @@ typedef enum {
 
 #include "spk_driver.h"
 
-#include <libspeechd.h>
+#include <speech-dispatcher/libspeechd.h>
 
 static SPDConnection *connectionHandle = NULL;
 static const char *moduleName;
diff --git a/configure.ac b/configure.ac
index bc14d72..a832e78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1697,7 +1697,7 @@ BRLTTY_ARG_DISABLE(
    BRLTTY_SPEECH_DRIVER([fv], [Festival])
    BRLTTY_SPEECH_DRIVER([gs], [GenericSay])
    BRLTTY_IF_PACKAGE([Mikropuhe], [mikropuhe], [mpwrfile.h], [BRLTTY_IF_PTHREADS([BRLTTY_SPEECH_DRIVER([mp], [Mikropuhe], [-L$(MPLINUX_ROOT) -lmplinux])])])
-   BRLTTY_IF_PACKAGE([speech-dispatcher], [speechd], [include/libspeechd.h], [BRLTTY_SPEECH_DRIVER([sd], [SpeechDispatcher], [-L$(SPEECHD_ROOT)/lib -lspeechd])])
+   BRLTTY_IF_PACKAGE([speech-dispatcher], [speechd], [include/speech-dispatcher/libspeechd.h], [BRLTTY_SPEECH_DRIVER([sd], [SpeechDispatcher], [-L$(SPEECHD_ROOT)/lib -lspeechd])])
    BRLTTY_IF_PACKAGE([Swift], [swift], [include/swift.h], [BRLTTY_SPEECH_DRIVER([sw], [Swift], [-L$(SWIFT_ROOT)/lib -lswift -lm])])
    BRLTTY_IF_PACKAGE([Theta], [theta], [include/theta.h], [BRLTTY_SPEECH_DRIVER([th], [Theta], [-L$(THETA_ROOT)/lib -ltheta])])
    BRLTTY_IF_PACKAGE([ViaVoice], [viavoice], [include/eci.h], [BRLTTY_SPEECH_DRIVER([vv], [ViaVoice], [-L$(VIAVOICE_ROOT)/lib -libmeci50])])
Index: brltty-4.3/configure
===================================================================
--- brltty-4.3.orig/configure
+++ brltty-4.3/configure
@@ -13484,7 +13484,7 @@
    roots="/usr /usr/local /usr/local/speech-dispatcher /usr/local/speechd /opt/speech-dispatcher /opt/speechd /mingw /mingw/speech-dispatcher /mingw/speechd"
    for root in ${roots}
    do
-      if test -f "${root}/include/libspeechd.h"
+      if test -f "${root}/include/speech-dispatcher/libspeechd.h"
       then
          speechd_root="${root}"
          break

Places

File brltty-5.0-speechd.diff of Package brltty (Revision 612abd15e31493d5ba88469a682098d0)

Places