clean speex third_party, ensure it builds

diff --git a/chromium-browser.spec b/chromium-browser.spec
index 9b81f2644a2c751702b29afc4fe01a4aa989d7ad..b8cfc56dabca8c1299bd54cc454ff0e62e4beabf 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -94,6 +94,7 @@ Patch16:      nacl-linkingfix.patch
 Patch17:       system-icu.patch
 Patch18:       nacl-no-untar.patch
 Patch19:       system-jsoncpp.patch
+Patch20:       system-speex.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 BuildRequires: OpenGL-GLU-devel
@@ -116,6 +117,7 @@ BuildRequires:      gperf
 BuildRequires: gtk+2-devel
 %{?with_kerberos:BuildRequires:        heimdal-devel}
 BuildRequires: hicolor-icon-theme
+%{?with_system_jsoncpp:BuildRequires:  jsoncpp-devel}
 BuildRequires: libevent-devel
 %{?with_keyring:BuildRequires: libgnome-keyring-devel}
 BuildRequires: libicu-devel >= 4.6
@@ -143,7 +145,6 @@ BuildRequires:      python-modules
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: rpmbuild(macros) >= 1.453
 %{?with_system_speex:BuildRequires:    speex-devel >= 1:1.2-rc1}
-%{?with_system_jsoncpp:BuildRequires:  jsoncpp-devel}
 BuildRequires: sqlite3-devel >= 3.6.1
 BuildRequires: subversion
 BuildRequires: tar >= 1:1.22
@@ -246,6 +247,7 @@ cd src
 %patch19 -p1
 cd ..
 %patch18 -p1
+%patch20 -p1
 
 cd src
 

diff --git a/clean-source.sh b/clean-source.sh
index d30a5301abc08c5127a5e5cae106a76a44eddc20..a6c1552037e01cdc8db25224ded4bb56444b1700 100755 (executable)
--- a/clean-source.sh
+++ b/clean-source.sh
@@ -462,6 +462,7 @@ strip_system_dirs \
        _third_party/libvpx \
        native_client/src/third_party_mod/jsoncpp \
        third_party/jsoncpp \
+       third_party/speex \
        third_party/flac \
        v8 \
 | tee -a REMOVED-stripped.txt

diff --git a/system-speex.patch b/system-speex.patch
new file mode 100644 (file)
index 0000000..71f63b9
--- /dev/null
+++ b/system-speex.patch
@@ -0,0 +1,31 @@
+even third_party/speex/speex.h is wrapper to system speex, here are some
+includes included directly from third party dir...
+
+--- chromium-browser-23.0.1271.64/src/remoting/codec/audio_decoder_speex.cc~   2012-10-31 19:01:20.000000000 +0000
++++ chromium-browser-23.0.1271.64/src/remoting/codec/audio_decoder_speex.cc    2012-11-12 23:04:42.083266707 +0000
+@@ -11,9 +11,9 @@
+ #include "base/logging.h"
+ #include "base/stl_util.h"
+ #include "remoting/proto/audio.pb.h"
+-#include "third_party/speex/speex.h"
+-#include "third_party/speex/include/speex/speex_callbacks.h"
+-#include "third_party/speex/include/speex/speex_stereo.h"
++#include <speex/speex.h>
++#include <speex/speex_callbacks.h>
++#include <speex/speex_stereo.h>
+ 
+ namespace remoting {
+ 
+--- chromium-browser-23.0.1271.64/src/remoting/codec/audio_encoder_speex.cc~   2012-10-31 19:01:20.000000000 +0000
++++ chromium-browser-23.0.1271.64/src/remoting/codec/audio_encoder_speex.cc    2012-11-12 23:06:33.544849553 +0000
+@@ -11,8 +11,8 @@
+ #include "base/logging.h"
+ #include "base/stl_util.h"
+ #include "remoting/proto/audio.pb.h"
+-#include "third_party/speex/speex.h"
+-#include "third_party/speex/include/speex/speex_stereo.h"
++#include <speex/speex.h>
++#include <speex/speex_stereo.h>
+ 
+ namespace {
+ // A quality of 8 in wide band mode corresponds to 27,800 bits per second.