|
1 Various ifdef Solaris fixes. |
|
2 Recast for getpid() because it requires an int. |
|
3 Changing default flags for compiling on SSE. We can try removing these or add |
|
4 them to the config lines in Makefile. |
|
5 |
|
6 --- mozilla-esr31/build/gyp.mozbuild.orig 2015-06-04 17:42:52.755839292 -0700 |
|
7 +++ mozilla-esr31/build/gyp.mozbuild 2015-06-04 17:42:52.861350941 -0700 |
|
8 @@ -38,6 +38,7 @@ |
|
9 'moz_widget_toolkit_gonk': 0, |
|
10 'moz_webrtc_omx': 0, |
|
11 |
|
12 + 'use_official_google_api_keys': 0, |
|
13 # (for vp8) chromium sets to 0 also |
|
14 'use_temporal_layers': 0, |
|
15 # Creates AEC internal sample dump files in current directory |
|
16 --- mozilla-esr31/memory/mozalloc/VolatileBufferFallback.cpp.orig 2015-06-04 17:42:52.788896719 -0700 |
|
17 +++ mozilla-esr31/memory/mozalloc/VolatileBufferFallback.cpp 2015-06-04 17:42:52.862173467 -0700 |
|
18 @@ -8,7 +8,7 @@ |
|
19 #include "mozilla/mozalloc.h" |
|
20 |
|
21 #ifdef MOZ_MEMORY |
|
22 -int posix_memalign(void** memptr, size_t alignment, size_t size); |
|
23 +extern "C" int posix_memalign(void** memptr, size_t alignment, size_t size); |
|
24 #endif |
|
25 |
|
26 namespace mozilla { |
|
27 --- mozilla-esr31/media/libsoundtouch/src/FIRFilter.cpp.orig 2015-06-04 17:42:52.816481996 -0700 |
|
28 +++ mozilla-esr31/media/libsoundtouch/src/FIRFilter.cpp 2015-06-04 17:42:52.863552954 -0700 |
|
29 @@ -46,6 +46,10 @@ |
|
30 #include "FIRFilter.h" |
|
31 #include "cpu_detect.h" |
|
32 |
|
33 +#ifdef __sun |
|
34 +#include <alloca.h> |
|
35 +#endif |
|
36 + |
|
37 #ifdef _MSC_VER |
|
38 #include <malloc.h> |
|
39 #define alloca _alloca |
|
40 --- mozilla-esr31/media/libsoundtouch/src/SoundTouch.cpp.orig 2015-06-04 17:42:52.821942936 -0700 |
|
41 +++ mozilla-esr31/media/libsoundtouch/src/SoundTouch.cpp 2015-06-04 17:42:52.863676152 -0700 |
|
42 @@ -80,6 +80,10 @@ |
|
43 #include "RateTransposer.h" |
|
44 #include "cpu_detect.h" |
|
45 |
|
46 +#ifdef __sun |
|
47 +#include <alloca.h> |
|
48 +#endif |
|
49 + |
|
50 #ifdef _MSC_VER |
|
51 #include <malloc.h> |
|
52 #define alloca _alloca |
|
53 --- mozilla-esr31/media/webrtc/trunk/build/common.gypi.orig 2015-06-04 17:42:52.827866736 -0700 |
|
54 +++ mozilla-esr31/media/webrtc/trunk/build/common.gypi 2015-06-04 17:42:52.864152685 -0700 |
|
55 @@ -917,11 +917,16 @@ |
|
56 'android_app_version_name%': 'Developer Build', |
|
57 'android_app_version_code%': 0, |
|
58 |
|
59 - 'sas_dll_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(sas_dll_path))', |
|
60 - 'wix_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(wix_path))', |
|
61 + 'conditions': [ |
|
62 + ['OS=="win"', { |
|
63 + 'sas_dll_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(sas_dll_path))', |
|
64 + 'wix_exists': '<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(wix_path))', |
|
65 + }], |
|
66 + ], |
|
67 |
|
68 'windows_sdk_default_path': '<(DEPTH)/third_party/platformsdk_win8/files', |
|
69 'directx_sdk_default_path': '<(DEPTH)/third_party/directxsdk/files', |
|
70 + 'windows_sdk_path%': 'C:/Program Files (x86)/Windows Kits/8.0', |
|
71 |
|
72 'conditions': [ |
|
73 ['"<!(<(PYTHON) <(DEPTH)/build/dir_exists.py <(windows_sdk_default_path))"=="True"', { |
|
74 --- mozilla-esr31/xpcom/base/nsStatusReporterManager.cpp.orig 2015-06-04 17:42:52.846266617 -0700 |
|
75 +++ mozilla-esr31/xpcom/base/nsStatusReporterManager.cpp 2015-06-04 17:42:52.864489417 -0700 |
|
76 @@ -142,7 +142,7 @@ |
|
77 nsresult rv; |
|
78 |
|
79 nsCString filename("status-reports-"); |
|
80 - filename.AppendInt(getpid()); |
|
81 + filename.AppendInt((int)getpid()); |
|
82 filename.AppendLiteral("-"); |
|
83 filename.AppendInt(number++); |
|
84 filename.AppendLiteral(".json"); |
|
85 --- mozilla-esr31//configure.orig 2015-06-04 17:42:52.849519256 -0700 |
|
86 +++ mozilla-esr31//configure 2015-06-04 17:42:52.867572588 -0700 |
|
87 @@ -9678,8 +9678,8 @@ |
|
88 CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife,tmplrefstatic,extensions,no%except -norunpath -D__FUNCTION__=__func__ -template=no%extdef" |
|
89 LDFLAGS="-xildoff $LDFLAGS" |
|
90 MMX_FLAGS="-xarch=mmx -xO4" |
|
91 - SSE_FLAGS="-xarch=sse" |
|
92 - SSE2_FLAGS="-xarch=ssei2 -xO4" |
|
93 + SSE_FLAGS="-xarch=sse -xO4" |
|
94 + SSE2_FLAGS="-xarch=sse2 -xO4" |
|
95 if test -z "$CROSS_COMPILE" -a -f /usr/lib/ld/map.noexstk; then |
|
96 _SAVE_LDFLAGS=$LDFLAGS |
|
97 LDFLAGS="-M /usr/lib/ld/map.noexstk $LDFLAGS" |