1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
description: use system speex
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -641,6 +641,26 @@
],
},
{
+ 'target_name': 'speex',
+ 'type': 'none',
+ 'conditions': [
+ ['_toolset=="target"', {
+ 'direct_dependent_settings': {
+ 'cflags': [
+ '<!@(pkg-config --cflags speex)',
+ ],
+ },
+ 'link_settings': {
+ 'ldflags': [
+ '<!@(pkg-config --libs-only-L --libs-only-other speex)',
+ ],
+ 'libraries': [
+ '<!@(pkg-config --libs-only-l speex)',
+ ],
+ },
+ }]]
+ },
+ {
'target_name': 'gnome_keyring',
'type': 'none',
'conditions': [
--- a/content/browser/speech/audio_encoder.cc
+++ b/content/browser/speech/audio_encoder.cc
@@ -11,7 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "content/browser/speech/audio_buffer.h"
#include "third_party/flac/include/FLAC/stream_encoder.h"
-#include "third_party/speex/include/speex/speex.h"
+#include <speex/speex.h>
namespace content {
namespace {
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -1750,7 +1750,7 @@
['input_speech==1', {
'dependencies': [
'../third_party/flac/flac.gyp:libflac',
- '../third_party/speex/speex.gyp:libspeex',
+ '../build/linux/system.gyp:speex',
],
}],
['OS == "win"', {
|
