Skip to content

Commit aeac4ac

Browse files
author
Rosa
committed
Automatic import for version 44.0.2376.0-1
0 parents  commit aeac4ac

12 files changed

+837
-0
lines changed

‎.abf.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
sources:
2+
"chromium-44.0.2376.0.tar.xz": ecbbc5efc19b89f1446f9f6e0f1b09cd27eb33d6

‎arm-neon.patch

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
--- chromium-44.0.2376.0/third_party/webrtc/common_audio/common_audio.gyp.0018~ 2015-04-21 05:21:18.000000000 +0200
2+
+++ chromium-44.0.2376.0/third_party/webrtc/common_audio/common_audio.gyp 2015-04-24 17:02:19.912522926 +0200
3+
@@ -146,7 +146,7 @@
4+
'signal_processing/spl_sqrt_floor.c',
5+
],
6+
'conditions': [
7+
- ['arm_version>=7', {
8+
+ ['arm_version>=7 and arm_neon==1', {
9+
'dependencies': ['common_audio_neon',],
10+
'sources': [
11+
'signal_processing/filter_ar_fast_q12_armv7.S',
12+
@@ -212,7 +212,7 @@
13+
},
14+
], # targets
15+
}],
16+
- ['target_arch=="arm" and arm_version>=7 or target_arch=="arm64"', {
17+
+ ['target_arch=="arm" and arm_version>=7 and arm_neon==1 or target_arch=="arm64"', {
18+
'targets': [
19+
{
20+
'target_name': 'common_audio_neon',
21+
--- chromium-44.0.2376.0/third_party/webrtc/common_audio/fir_filter.cc.0018~ 2015-04-21 05:21:18.000000000 +0200
22+
+++ chromium-44.0.2376.0/third_party/webrtc/common_audio/fir_filter.cc 2015-04-24 17:01:08.790972325 +0200
23+
@@ -62,13 +62,13 @@ FIRFilter* FIRFilter::Create(const float
24+
filter =
25+
new FIRFilterNEON(coefficients, coefficients_length, max_input_length);
26+
#else
27+
- // ARM CPU detection required.
28+
- if (WebRtc_GetCPUFeaturesARM() & kCPUFeatureNEON) {
29+
- filter =
30+
- new FIRFilterNEON(coefficients, coefficients_length, max_input_length);
31+
- } else {
32+
+// // ARM CPU detection required.
33+
+// if (WebRtc_GetCPUFeaturesARM() & kCPUFeatureNEON) {
34+
+// filter =
35+
+// new FIRFilterNEON(coefficients, coefficients_length, max_input_length);
36+
+// } else {
37+
filter = new FIRFilterC(coefficients, coefficients_length);
38+
- }
39+
+// }
40+
#endif
41+
#else
42+
filter = new FIRFilterC(coefficients, coefficients_length);
43+
--- chromium-44.0.2376.0/third_party/webrtc/common_audio/resampler/sinc_resampler.cc.0018~ 2015-04-21 05:21:18.000000000 +0200
44+
+++ chromium-44.0.2376.0/third_party/webrtc/common_audio/resampler/sinc_resampler.cc 2015-04-24 17:01:08.790972325 +0200
45+
@@ -138,8 +138,7 @@ void SincResampler::InitializeCPUSpecifi
46+
#define CONVOLVE_FUNC convolve_proc_
47+
48+
void SincResampler::InitializeCPUSpecificFeatures() {
49+
- convolve_proc_ = WebRtc_GetCPUFeaturesARM() & kCPUFeatureNEON ?
50+
- Convolve_NEON : Convolve_C;
51+
+ convolve_proc_ = Convolve_C;
52+
}
53+
#endif
54+
#else
55+
--- chromium-44.0.2376.0/third_party/webrtc/system_wrappers/source/cpu_features.cc.0018~ 2015-04-21 05:21:19.000000000 +0200
56+
+++ chromium-44.0.2376.0/third_party/webrtc/system_wrappers/source/cpu_features.cc 2015-04-24 17:01:08.790972325 +0200
57+
@@ -18,6 +18,47 @@
58+
59+
#include "webrtc/typedefs.h"
60+
61+
+#include <elf.h>
62+
+#ifdef __arm__
63+
+#include <fcntl.h>
64+
+#include <unistd.h>
65+
+#include <linux/auxvec.h>
66+
+#include <asm/hwcap.h>
67+
+#endif
68+
+
69+
+#ifdef __arm__
70+
+uint64_t WebRtc_GetCPUFeaturesARM() {
71+
+ static bool detected = false;
72+
+ static uint64_t have_neon = 0;
73+
+
74+
+ int fd;
75+
+ Elf32_auxv_t auxv;
76+
+ unsigned int hwcaps;
77+
+
78+
+ if (!detected) {
79+
+ int fd;
80+
+ Elf32_auxv_t auxv;
81+
+ unsigned int hwcaps;
82+
+
83+
+ fd = open("/proc/self/auxv", O_RDONLY);
84+
+ if (fd >= 0) {
85+
+ while (read(fd, &auxv, sizeof(Elf32_auxv_t)) == sizeof(Elf32_auxv_t)) {
86+
+ if (auxv.a_type == AT_HWCAP) {
87+
+ have_neon = (auxv.a_un.a_val & HWCAP_NEON) ? kCPUFeatureNEON : 0;
88+
+ break;
89+
+ }
90+
+ }
91+
+ close (fd);
92+
+ } else {
93+
+ have_neon = 0;
94+
+ }
95+
+ detected = true;
96+
+ }
97+
+
98+
+ return 0 | have_neon; // others here as we need them
99+
+}
100+
+#endif
101+
+
102+
// No CPU feature is available => straight C path.
103+
int GetCPUInfoNoASM(CPUFeature feature) {
104+
(void)feature;

‎arm.patch

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
--- chromium-44.0.2376.0/third_party/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi.0017~ 2015-04-21 05:21:18.000000000 +0200
2+
+++ chromium-44.0.2376.0/third_party/webrtc/modules/audio_coding/codecs/isac/isacfix.gypi 2015-04-24 17:00:14.863565689 +0200
3+
@@ -80,7 +80,7 @@
4+
'WEBRTC_LINUX',
5+
],
6+
}],
7+
- ['target_arch=="arm" and arm_version>=7', {
8+
+ ['target_arch=="arm" and arm_version>=7 and arm_neon==1', {
9+
'sources': [
10+
'fix/source/lattice_armv7.S',
11+
'fix/source/pitch_filter_armv6.S',
12+
@@ -128,7 +128,7 @@
13+
},
14+
],
15+
'conditions': [
16+
- ['target_arch=="arm" and arm_version>=7', {
17+
+ ['target_arch=="arm" and arm_version>=7 and arm_neon==1', {
18+
'targets': [
19+
{
20+
'target_name': 'isac_neon',
21+
--- chromium-44.0.2376.0/ui/base/resource/data_pack.cc.0017~ 2015-04-21 05:08:12.000000000 +0200
22+
+++ chromium-44.0.2376.0/ui/base/resource/data_pack.cc 2015-04-24 16:59:01.402028898 +0200
23+
@@ -155,9 +155,11 @@ bool DataPack::LoadImpl() {
24+
// 2) Verify the entries are within the appropriate bounds. There's an extra
25+
// entry after the last item which gives us the length of the last item.
26+
for (size_t i = 0; i < resource_count_ + 1; ++i) {
27+
+ uint32 t;
28+
const DataPackEntry* entry = reinterpret_cast<const DataPackEntry*>(
29+
mmap_->data() + kHeaderLength + (i * sizeof(DataPackEntry)));
30+
- if (entry->file_offset > mmap_->length()) {
31+
+ memcpy(&t, &entry->file_offset, 32/8);
32+
+ if (t > mmap_->length()) {
33+
LOG(ERROR) << "Entry #" << i << " in data pack points off end of file. "
34+
<< "Was the file corrupted?";
35+
UMA_HISTOGRAM_ENUMERATION("DataPack.Load", ENTRY_NOT_FOUND,

‎chromium-25.0.1364.172-no-courgette.patch

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
--- chromium-44.0.2376.0/build/all.gyp.0014~ 2015-04-24 16:51:39.755119457 +0200
2+
+++ chromium-44.0.2376.0/build/all.gyp 2015-04-24 16:58:08.603656827 +0200
3+
@@ -179,7 +179,6 @@
4+
}],
5+
['OS=="linux"', {
6+
'dependencies': [
7+
- '../courgette/courgette.gyp:*',
8+
'../sandbox/sandbox.gyp:*',
9+
],
10+
'conditions': [

‎chromium-25.0.1364.172-sandbox-pie.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
diff -urN chromium-25.0.1364.172.orig/sandbox/linux/sandbox_linux.gypi chromium-25.0.1364.172/sandbox/linux/sandbox_linux.gypi
2+
--- chromium-25.0.1364.172.orig/sandbox/linux/sandbox_linux.gypi 2013-03-24 23:58:19.000000000 +0400
3+
+++ chromium-25.0.1364.172/sandbox/linux/sandbox_linux.gypi 2013-03-25 00:05:45.874570662 +0400
4+
@@ -109,7 +109,10 @@
5+
],
6+
'cflags': [
7+
# For ULLONG_MAX
8+
- '-std=gnu99',
9+
+ '-std=gnu99 -fPIE',
10+
+ ],
11+
+ 'ldflags': [
12+
+ '-pie',
13+
],
14+
'include_dirs': [
15+
'../..',

‎chromium-25.0.1364.172-system-glew.patch

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
--- chromium-35.0.1916.153/build/linux/system.gyp.0013~ 2014-06-13 17:45:54.284344191 +0200
2+
+++ chromium-35.0.1916.153/build/linux/system.gyp 2014-06-13 17:51:00.946641566 +0200
3+
@@ -1011,5 +1011,41 @@
4+
}],
5+
],
6+
},
7+
+ {
8+
+ 'target_name': 'icu',
9+
+ 'type': 'none',
10+
+ 'conditions': [
11+
+ ['_toolset=="target"', {
12+
+ 'direct_dependent_settings': {
13+
+ 'cflags': [
14+
+ '-Wno-unused-function',
15+
+ # TODO(port): fix ICU to not depend on this flag.
16+
+ '-fno-strict-aliasing',
17+
+ ],
18+
+ },
19+
+ 'link_settings': {
20+
+ 'ldflags': [
21+
+ '',
22+
+ ],
23+
+ 'libraries': [
24+
+ '-licui18n',
25+
+ ],
26+
+ },
27+
+ }]]
28+
+ },
29+
+ {
30+
+ 'target_name': 'glew',
31+
+ 'type': 'none',
32+
+ 'conditions': [
33+
+ ['_toolset=="target"', {
34+
+ 'link_settings': {
35+
+ 'libraries': [
36+
+ '-lGLEW',
37+
+ '-lGL',
38+
+ '-lX11',
39+
+ ],
40+
+ },
41+
+ }]]
42+
+ },
43+
],
44+
}

‎chromium-30.0.1599.66-master-prefs-path.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff -urN chromium-30.0.1599.66.orig/chrome/browser/first_run/first_run_internal_linux.cc chromium-30.0.1599.66/chrome/browser/first_run/first_run_internal_linux.cc
2+
--- chromium-30.0.1599.66.orig/chrome/browser/first_run/first_run_internal_linux.cc 2013-10-04 13:51:55.589208095 +0400
3+
+++ chromium-30.0.1599.66/chrome/browser/first_run/first_run_internal_linux.cc 2013-10-04 13:52:49.035210352 +0400
4+
@@ -20,8 +20,7 @@
5+
base::FilePath MasterPrefsPath() {
6+
// The standard location of the master prefs is next to the chrome binary.
7+
base::FilePath master_prefs;
8+
- if (!PathService::Get(base::DIR_EXE, &master_prefs))
9+
- return base::FilePath();
10+
+ master_prefs = base::FilePath("/etc/chromium");
11+
return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
12+
}
13+

0 commit comments

Comments
 (0)