[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/22.0.1229.94_r161065-1-23-gd1a3e36

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit f868804086af779b92bec9da0bb44f82e1f845a6
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sat Feb 23 11:42:11 2013 +0100

    Do not enable NEON on ARM, thanks Ubuntu.

diff --git a/debian/patches/arm-neon.patch b/debian/patches/arm-neon.patch
new file mode 100644
index 0000000..f0069d6
--- /dev/null
+++ b/debian/patches/arm-neon.patch
@@ -0,0 +1,71 @@
+Description: GYP assumes ARMv7 always wants NEON, even if compile flags disable.
+Origin: http://code.google.com/p/chromium/issues/detail?id=154107
+Author: Chad Miller <chad.miller at canonical.com>
+Bug-Chromium: 154107
+Bug-Ubuntu: 1084852
+
+Index: sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi
+===================================================================
+--- sid.orig/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi	2013-02-22 11:25:20.000000000 +0100
++++ sid/src/third_party/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.gypi	2013-02-23 11:41:42.274235012 +0100
+@@ -72,7 +72,7 @@
+             'WEBRTC_LINUX',
+           ],
+         }],
+-        ['target_arch=="arm" and armv7==1', {
++        ['target_arch=="arm" and armv7==1 and arm_neon==1', {
+           'dependencies': [ 'isac_neon', ],
+           'sources': [
+             'lattice_armv7.S',
+Index: sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc
+===================================================================
+--- sid.orig/src/third_party/webrtc/system_wrappers/source/cpu_features.cc	2013-02-22 11:25:19.000000000 +0100
++++ sid/src/third_party/webrtc/system_wrappers/source/cpu_features.cc	2013-02-23 11:41:42.282235012 +0100
+@@ -18,6 +18,47 @@
+ 
+ #include "typedefs.h"
+ 
++#include <elf.h>
++#ifdef __arm__
++#include <fcntl.h>
++#include <unistd.h>
++#include <linux/auxvec.h>
++#include <asm/hwcap.h>
++#endif
++
++#ifdef __arm__
++uint64_t WebRtc_GetCPUFeaturesARM() {
++	static bool detected = false;
++	static uint64_t have_neon = 0;
++
++	int fd;
++	Elf32_auxv_t auxv;
++	unsigned int hwcaps;
++
++	if (!detected) {
++		int fd;
++		Elf32_auxv_t auxv;
++		unsigned int hwcaps;
++
++		fd = open("/proc/self/auxv", O_RDONLY);
++		if (fd >= 0) {
++			while (read(fd, &auxv, sizeof(Elf32_auxv_t)) == sizeof(Elf32_auxv_t)) {
++				if (auxv.a_type == AT_HWCAP) {
++					have_neon = (auxv.a_un.a_val & HWCAP_NEON) ? kCPUFeatureNEON : 0;
++					break;
++				}
++			}
++			close (fd);
++		} else {
++			have_neon = 0;
++		}
++		detected = true;
++	}
++
++	return 0 | have_neon; // others here as we need them
++}
++#endif
++
+ // No CPU feature is available => straight C path.
+ int GetCPUInfoNoASM(CPUFeature feature) {
+   (void)feature;
diff --git a/debian/patches/series b/debian/patches/series
index 252d71e..9b2b2f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@ arm-no-float-abi.patch
 gcc4.7.patch
 arm.patch
 icon.patch
+arm-neon.patch

-- 
Git repository for pkg-chromium