[Pkg-chromium-commit] chromium-browser/chromium-browser.experimental: 683 Use system speex

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.experimental
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.experimental
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 683
Revision Id: iuculano at debian.org-20101001161408-o526062rd9bpdo8v
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Use system speex


--------------------------------------------------------
  ** Added :
        - debian/patches/system-speech.patch

  ** Modified :
        - debian/changelog
        - debian/control
        - debian/patches/series

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-10-01 16:06:55 +0000
+++ b/debian/changelog	2010-10-01 16:14:08 +0000
@@ -5,8 +5,9 @@
   * Remove icu44.patch, applied upstream
   * Refreshed patches
   * Enable compile-time dependency on gnome-keyring
+  * Use system speex
 
- -- Giuseppe Iuculano <iuculano at debian.org>  Fri, 01 Oct 2010 18:06:43 +0200
+ -- Giuseppe Iuculano <iuculano at debian.org>  Fri, 01 Oct 2010 18:11:27 +0200
 
 chromium-browser (6.0.472.62~r59676-1) unstable; urgency=low
 

=== modified file 'debian/control'
--- a/debian/control	2010-09-01 13:38:33 +0000
+++ b/debian/control	2010-10-01 16:14:08 +0000
@@ -58,6 +58,7 @@
 	libcups2-dev | libcupsys2-dev,
 	libgnome-keyring-dev,
 	libgconf2-dev,
+	libspeex-dev,
 	hardening-wrapper
 Standards-Version: 3.9.0
 

=== modified file 'debian/patches/series'
--- a/debian/patches/series	2010-10-01 15:51:37 +0000
+++ b/debian/patches/series	2010-10-01 16:14:08 +0000
@@ -13,3 +13,4 @@
 armv4.patch
 gecko-mediaplayer.patch
 ffmpeg_arm.patch
+system-speech.patch

=== added file 'debian/patches/system-speech.patch'
--- a/debian/patches/system-speech.patch	1970-01-01 00:00:00 +0000
+++ b/debian/patches/system-speech.patch	2010-10-01 16:14:08 +0000
@@ -0,0 +1,52 @@
+Use system speex
+--- a/src/build/linux/system.gyp
++++ b/src/build/linux/system.gyp
+@@ -285,6 +285,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': [
+--- a/src/chrome/browser/speech/speech_recognizer.cc
++++ b/src/chrome/browser/speech/speech_recognizer.cc
+@@ -10,7 +10,7 @@
+ #include "chrome/browser/chrome_thread.h"
+ #include "chrome/browser/profile.h"
+ #include "chrome/common/net/url_request_context_getter.h"
+-#include "third_party/speex/include/speex/speex.h"
++#include <speex/speex.h>
+ 
+ using media::AudioInputController;
+ using std::list;
+--- a/src/chrome/chrome_browser.gypi
++++ b/src/chrome/chrome_browser.gypi
+@@ -36,7 +36,7 @@
+         '../third_party/libxml/libxml.gyp:libxml',
+         '../third_party/npapi/npapi.gyp:npapi',
+         '../third_party/hunspell/hunspell.gyp:hunspell',
+-        '../third_party/speex/speex.gyp:libspeex',
++        '../build/linux/system.gyp:speex',
+         '../webkit/support/webkit_support.gyp:appcache',
+         '../webkit/support/webkit_support.gyp:blob',
+         '../webkit/support/webkit_support.gyp:database',