remove patch
This commit is contained in:
parent
c344db3380
commit
448da33fec
|
@ -1,3 +1,2 @@
|
|||
AUX mumble-1.2.4-speech-dispatcher.patch 1289 BLAKE2B 674312376997a2ee7f70886f8a7ec13731f46bc25870c1af239d6814ef66192999f89d644caf63eb98a3ad4fa3460c16fbfb2acb35c845c181cf08943d142c3b SHA512 32b83ba846fbda3529c222df2cf6fa0f615dabdd7e211051119fb9ed53bdc3e8e11aaa1b132bbdfcedffd72b1e19666aaf083799f7ebbbf60f536a9f9a0c6a2a
|
||||
EBUILD mumble-9999.ebuild 2910 BLAKE2B 1f60aabe8d38b861be209903ab11806deff811f8c0d5da2cb65d9ae7013a4c610ed70ed5849d1c995d7b4c80dabafa45fdef8b0ce45efb5aa652e4b74dae5eb6 SHA512 af3425eaed69b756a0eaeb41eaf8970bf9f911a31282229945e14e384c56866930fc247ec0e40f024bdd916fdc49255df4b3b2f0f2fd10ea9645578463e8b2c1
|
||||
MISC metadata.xml 751 BLAKE2B 17b72569ef8313fa654bd444572521c482b1b2c4d14bc73b41be5f6ddf8e9c8e9064fa1a87b4589f7a18a5ceae835fb60718226059f5b96d4dfa6e2b26256630 SHA512 78d4d18e60dfbcbab8b1ae64f214c2f6aa0ae7ea01323590f3847b1ed50fc90a29acbb5a44c65e82747237e60d5d4a24c9b2808d4e4a90a996ab90952340c18b
|
||||
|
|
|
@ -1,49 +0,0 @@
|
|||
From 22d18212acec9e97231a13a6dc02a0c451df9b89 Mon Sep 17 00:00:00 2001
|
||||
From: Mikkel Krautz <mikkel@krautz.dk>
|
||||
Date: Thu, 6 Jun 2013 22:17:31 +0200
|
||||
Subject: [PATCH] mumble.pro: add speech-dispatcher 0.8 compatibiltiy.
|
||||
|
||||
Based on initial patch by Timo Gurr <timo.gurr@gmail.com>
|
||||
---
|
||||
src/mumble/TextToSpeech_unix.cpp | 6 +++++-
|
||||
src/mumble/mumble.pro | 7 ++++++-
|
||||
2 files changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/mumble/TextToSpeech_unix.cpp b/src/mumble/TextToSpeech_unix.cpp
|
||||
index d0fbb82..6443c07 100644
|
||||
--- a/src/mumble/TextToSpeech_unix.cpp
|
||||
+++ b/src/mumble/TextToSpeech_unix.cpp
|
||||
@@ -33,7 +33,11 @@
|
||||
#include "TextToSpeech.h"
|
||||
|
||||
#ifdef USE_SPEECHD
|
||||
-#include <libspeechd.h>
|
||||
+# ifdef USE_SPEECHD_PKGCONFIG
|
||||
+# include <speech-dispatcher/libspeechd.h>
|
||||
+# else
|
||||
+# include <libspeechd.h>
|
||||
+# endif
|
||||
#endif
|
||||
|
||||
#include "Global.h"
|
||||
diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
|
||||
index 04f5a36..ff3c02f 100644
|
||||
--- a/src/mumble/mumble.pro
|
||||
+++ b/src/mumble/mumble.pro
|
||||
@@ -279,7 +279,12 @@ dbus {
|
||||
|
||||
speechd {
|
||||
DEFINES *= USE_SPEECHD
|
||||
- LIBS *= -lspeechd
|
||||
+ system(pkg-config --atleast-version=0.8 speech-dispatcher) {
|
||||
+ DEFINES *= USE_SPEECHD_PKGCONFIG
|
||||
+ PKGCONFIG *= speech-dispatcher
|
||||
+ } else {
|
||||
+ LIBS *= -lspeechd
|
||||
+ }
|
||||
}
|
||||
|
||||
directsound {
|
||||
--
|
||||
1.8.1.6
|
||||
|
Loading…
Reference in a new issue