File chromium-7.0.500.0-system-speex.patch of Package chromium-square
diff -up chromium-7.0.500.0-20100819svn56724/build/linux/system.gyp.speex chromium-7.0.500.0-20100819svn56724/build/linux/system.gyp
--- chromium-7.0.500.0-20100819svn56724/src/build/linux/system.gyp.speex 2010-08-19 16:23:14.594998783 -0400
+++ chromium-7.0.500.0-20100819svn56724/src/build/linux/system.gyp 2010-08-19 16:23:14.676903548 -0400
@@ -348,6 +348,26 @@
}]]
},
{
+ 'target_name': 'speex',
+ 'type': 'settings',
+ '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': 'settings',
'conditions': [
diff -up chromium-7.0.500.0-20100819svn56724/content/content_browser.gypi.speex chromium-7.0.500.0-20100819svn56724/chrome/chrome_browser.gypi
--- chromium-7.0.500.0-20100819svn56724/src/content/content_browser.gypi.speex 2010-08-19 16:23:14.594998783 -0400
+++ chromium-7.0.500.0-20100819svn56724/src/content/content_browser.gypi 2010-08-19 16:25:27.921293238 -0400
@@ -15,7 +15,7 @@
'../third_party/flac/flac.gyp:libflac',
# TODO(ericu): remove leveldb ref after crbug.com/6955013 is fixed.
'../third_party/leveldb/leveldb.gyp:leveldb',
- '../third_party/speex/speex.gyp:libspeex',
+ '../build/linux/system.gyp:speex',
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/ui.gyp:ui',
--- chromium/src/content/browser/speech/audio_encoder.cc 2011-01-20 09:04:11.631000020 +0100
+++ chromium/src/content/browser/speech/audio_encoder.cc 2011-01-20 09:04:11.631000020 +0100
@@ -10,7 +10,7 @@
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "third_party/flac/flac.h"
-#include "third_party/speex/speex.h"
+#include <speex/speex.h>
using std::string;