author | Wolfgang Rosenauer <wr@rosenauer.org> |
Sat, 16 Mar 2013 00:07:21 +0100 | |
branch | firefox19 |
changeset 631 | e5ead5bc3360 |
parent 603 | cfcae96df099 |
permissions | -rw-r--r-- |
603
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
Submitted-by: schwab@@linux-m68k.org |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
Subject: fix PPC build |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
References: (not delivered with the patch but apparently mix of:) |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
Bug 750869 - Support WebRTC for Android in our build system (TM:20) |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
Bug 814693 - Build failure on Debian powerpc (TM:20) |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
|
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
diff --git a/media/webrtc/shared_libs.mk b/media/webrtc/shared_libs.mk |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
--- a/media/webrtc/shared_libs.mk |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
+++ b/media/webrtc/shared_libs.mk |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
@@ -23,33 +23,39 @@ WEBRTC_LIBS = \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
$(call EXPAND_LIBNAME_PATH,video_render_module,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_render_module) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
$(call EXPAND_LIBNAME_PATH,video_engine_core,$(DEPTH)/media/webrtc/trunk/src/video_engine/video_engine_video_engine_core) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
$(call EXPAND_LIBNAME_PATH,media_file,$(DEPTH)/media/webrtc/trunk/src/modules/modules_media_file) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
$(call EXPAND_LIBNAME_PATH,rtp_rtcp,$(DEPTH)/media/webrtc/trunk/src/modules/modules_rtp_rtcp) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
$(call EXPAND_LIBNAME_PATH,udp_transport,$(DEPTH)/media/webrtc/trunk/src/modules/modules_udp_transport) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
$(call EXPAND_LIBNAME_PATH,bitrate_controller,$(DEPTH)/media/webrtc/trunk/src/modules/modules_bitrate_controller) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
$(call EXPAND_LIBNAME_PATH,remote_bitrate_estimator,$(DEPTH)/media/webrtc/trunk/src/modules/modules_remote_bitrate_estimator) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
$(call EXPAND_LIBNAME_PATH,video_processing,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
- $(call EXPAND_LIBNAME_PATH,video_processing_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing_sse2) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
$(call EXPAND_LIBNAME_PATH,voice_engine_core,$(DEPTH)/media/webrtc/trunk/src/voice_engine/voice_engine_voice_engine_core) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
$(call EXPAND_LIBNAME_PATH,audio_conference_mixer,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_conference_mixer) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
$(call EXPAND_LIBNAME_PATH,audio_device,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_device) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
$(call EXPAND_LIBNAME_PATH,audio_processing,$(DEPTH)/media/webrtc/trunk/src/modules/modules_audio_processing) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
$(call EXPAND_LIBNAME_PATH,aec,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
- $(call EXPAND_LIBNAME_PATH,aec_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec_sse2) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
$(call EXPAND_LIBNAME_PATH,apm_util,$(DEPTH)/media/webrtc/trunk/src/modules/modules_apm_util) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
$(call EXPAND_LIBNAME_PATH,aecm,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aecm) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
$(call EXPAND_LIBNAME_PATH,agc,$(DEPTH)/media/webrtc/trunk/src/modules/modules_agc) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
$(call EXPAND_LIBNAME_PATH,ns,$(DEPTH)/media/webrtc/trunk/src/modules/modules_ns) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
$(call EXPAND_LIBNAME_PATH,yuv,$(DEPTH)/media/webrtc/trunk/third_party/libyuv/libyuv_libyuv) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
$(call EXPAND_LIBNAME_PATH,webrtc_jpeg,$(DEPTH)/media/webrtc/trunk/src/common_video/common_video_webrtc_jpeg) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
$(call EXPAND_LIBNAME_PATH,nicer,$(DEPTH)/media/mtransport/third_party/nICEr/nicer_nicer) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
33 |
$(call EXPAND_LIBNAME_PATH,nrappkit,$(DEPTH)/media/mtransport/third_party/nrappkit/nrappkit_nrappkit) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
34 |
$(NULL) |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
35 |
|
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
+# if we're on an intel arch, we want SSE2 optimizations |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
37 |
+ifneq (,$(INTEL_ARCHITECTURE)) |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
38 |
+WEBRTC_LIBS += \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
+ $(call EXPAND_LIBNAME_PATH,video_processing_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_video_processing_sse2) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
40 |
+ $(call EXPAND_LIBNAME_PATH,aec_sse2,$(DEPTH)/media/webrtc/trunk/src/modules/modules_aec_sse2) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
41 |
+ $(NULL) |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
42 |
+endif |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
+ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
# If you enable one of these codecs in webrtc_config.gypi, you'll need to re-add the |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
45 |
# relevant library from this list: |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
46 |
# |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
# $(call EXPAND_LIBNAME_PATH,G722,$(DEPTH)/media/webrtc/trunk/src/modules/modules_G722) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
48 |
# $(call EXPAND_LIBNAME_PATH,iLBC,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iLBC) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
49 |
# $(call EXPAND_LIBNAME_PATH,iSAC,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iSAC) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
50 |
# $(call EXPAND_LIBNAME_PATH,iSACFix,$(DEPTH)/media/webrtc/trunk/src/modules/modules_iSACFix) \ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
51 |
# |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
52 |
diff --git a/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi b/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
53 |
--- a/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
54 |
+++ b/media/webrtc/trunk/src/modules/audio_coding/codecs/pcm16b/pcm16b.gypi |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
55 |
@@ -6,16 +6,19 @@ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
56 |
# in the file PATENTS. All contributing project authors may |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
57 |
# be found in the AUTHORS file in the root of the source tree. |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
58 |
|
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
59 |
{ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
60 |
'targets': [ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
61 |
{ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
62 |
'target_name': 'PCM16B', |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
63 |
'type': '<(library)', |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
64 |
+ 'dependencies': [ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
65 |
+ '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing', |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
66 |
+ ], |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
67 |
'include_dirs': [ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
68 |
'include', |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
69 |
], |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
70 |
'direct_dependent_settings': { |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
71 |
'include_dirs': [ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
72 |
'include', |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
73 |
], |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
74 |
}, |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
75 |
diff --git a/media/webrtc/trunk/src/typedefs.h b/media/webrtc/trunk/src/typedefs.h |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
76 |
--- a/media/webrtc/trunk/src/typedefs.h |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
77 |
+++ b/media/webrtc/trunk/src/typedefs.h |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
78 |
@@ -52,16 +52,24 @@ |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
79 |
//#define WEBRTC_ARCH_ARMEL |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
80 |
#define WEBRTC_ARCH_32_BITS |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
81 |
#define WEBRTC_ARCH_LITTLE_ENDIAN |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
82 |
#define WEBRTC_LITTLE_ENDIAN |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
83 |
#elif defined(__MIPSEL__) |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
84 |
#define WEBRTC_ARCH_32_BITS |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
85 |
#define WEBRTC_ARCH_LITTLE_ENDIAN |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
86 |
#define WEBRTC_LITTLE_ENDIAN |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
87 |
+#elif defined(__powerpc__) |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
88 |
+#if defined(__powerpc64__) |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
89 |
+#define WEBRTC_ARCH_64_BITS |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
90 |
+#else |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
91 |
+#define WEBRTC_ARCH_32_BITS |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
92 |
+#endif |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
93 |
+#define WEBRTC_ARCH_BIG_ENDIAN |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
94 |
+#define WEBRTC_BIG_ENDIAN |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
95 |
#else |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
96 |
#error Please add support for your architecture in typedefs.h |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
97 |
#endif |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
98 |
|
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
99 |
#if defined(__SSE2__) || defined(_MSC_VER) |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
100 |
#define WEBRTC_USE_SSE2 |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
101 |
#endif |
cfcae96df099
imported patch to fix PPC build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
102 |