/[gentoo-x86]/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
Gentoo

Contents of /media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Fri Jun 7 02:14:48 2013 UTC (6 years, 8 months ago) by tgurr
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Fix building with speech-dispatcher >=0.8 wrt bug #472366.

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 5270BA51)

1 From 22d18212acec9e97231a13a6dc02a0c451df9b89 Mon Sep 17 00:00:00 2001
2 From: Mikkel Krautz <mikkel@krautz.dk>
3 Date: Thu, 6 Jun 2013 22:17:31 +0200
4 Subject: [PATCH] mumble.pro: add speech-dispatcher 0.8 compatibiltiy.
5
6 Based on initial patch by Timo Gurr <timo.gurr@gmail.com>
7 ---
8 src/mumble/TextToSpeech_unix.cpp | 6 +++++-
9 src/mumble/mumble.pro | 7 ++++++-
10 2 files changed, 11 insertions(+), 2 deletions(-)
11
12 diff --git a/src/mumble/TextToSpeech_unix.cpp b/src/mumble/TextToSpeech_unix.cpp
13 index d0fbb82..6443c07 100644
14 --- a/src/mumble/TextToSpeech_unix.cpp
15 +++ b/src/mumble/TextToSpeech_unix.cpp
16 @@ -33,7 +33,11 @@
17 #include "TextToSpeech.h"
18
19 #ifdef USE_SPEECHD
20 -#include <libspeechd.h>
21 +# ifdef USE_SPEECHD_PKGCONFIG
22 +# include <speech-dispatcher/libspeechd.h>
23 +# else
24 +# include <libspeechd.h>
25 +# endif
26 #endif
27
28 #include "Global.h"
29 diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
30 index 04f5a36..ff3c02f 100644
31 --- a/src/mumble/mumble.pro
32 +++ b/src/mumble/mumble.pro
33 @@ -279,7 +279,12 @@ dbus {
34
35 speechd {
36 DEFINES *= USE_SPEECHD
37 - LIBS *= -lspeechd
38 + system(pkg-config --atleast-version=0.8 speech-dispatcher) {
39 + DEFINES *= USE_SPEECHD_PKGCONFIG
40 + PKGCONFIG *= speech-dispatcher
41 + } else {
42 + LIBS *= -lspeechd
43 + }
44 }
45
46 directsound {
47 --
48 1.8.1.6
49

  ViewVC Help
Powered by ViewVC 1.1.20