[Pkg-chromium-commit] [pkg-chromium] 01/01: patches: fix skia build again

[Riku Voipio]

This is an automated email from the git hooks/post-receive script.

riku pushed a commit to branch experimental
in repository pkg-chromium.

commit e8bf0ac2c853f28ff3c64c7aec4c6c7e45722d2b
Author: Riku Voipio <riku.voipio at linaro.org>
Date:   Tue Apr 3 15:52:39 2018 +0300

    patches: fix skia build again
    
    Add patch from upstream to build skia without neon
---
 debian/patches/fixes/skia_neon.patch | 60 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  1 +
 2 files changed, 61 insertions(+)

diff --git a/debian/patches/fixes/skia_neon.patch b/debian/patches/fixes/skia_neon.patch
new file mode 100644
index 0000000..612a75a
--- /dev/null
+++ b/debian/patches/fixes/skia_neon.patch
@@ -0,0 +1,60 @@
+From b84682f31dc99b9c90f5a04947075815697c68d9 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena at lge.com>
+Date: Wed, 7 Mar 2018 20:07:48 +0000
+Subject: [PATCH] GCC: do not initialize NEON int32x4_t with braces initializer
+
+GCC does not support int32x4_t loading using braces wrapping 4 ints.
+Instead we should use the NEON intrinsic to load from an array of
+ints.
+
+Bug: 819294
+Change-Id: I13b877405273e4ebcc944d50c155ee29ff31cc99
+Reviewed-on: https://chromium-review.googlesource.com/951773
+Commit-Queue: Mike Klein <mtklein at chromium.org>
+Reviewed-by: Mike Klein <mtklein at chromium.org>
+Cr-Commit-Position: refs/heads/master@{#541544}
+---
+ skia/ext/convolver_neon.cc | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/skia/ext/convolver_neon.cc b/skia/ext/convolver_neon.cc
+index 26b91b9c88c4..cae6bc2f833f 100644
+--- a/skia/ext/convolver_neon.cc
++++ b/skia/ext/convolver_neon.cc
+@@ -23,7 +23,7 @@ AccumRemainder(const unsigned char* pixels_left,
+     remainder[2] += coeff * pixels_left[i * 4 + 2];
+     remainder[3] += coeff * pixels_left[i * 4 + 3];
+   }
+-  return {remainder[0], remainder[1], remainder[2], remainder[3]};
++  return vld1q_s32(remainder);
+ }
+ 
+ // Convolves horizontally along a single row. The row data is given in
+@@ -336,4 +336,4 @@ void ConvolveVertically_Neon(const ConvolutionFilter1D::Fixed* filter_values,
+   }
+ }
+ 
+-}  // namespace skia
+\ No newline at end of file
++}  // namespace skia
+diff --git a/skia/BUILD.gn b/skia/BUILD.gn
+index 79aafb2b535f..a8daf9b77911 100644
+--- a/skia/BUILD.gn
++++ b/skia/BUILD.gn
+@@ -282,10 +282,12 @@ component("skia") {
+       "ext/convolver_mips_dspr2.h",
+     ]
+   } else if (current_cpu == "arm" || current_cpu == "arm64") {
+-    sources += [
+-      "ext/convolver_neon.cc",
+-      "ext/convolver_neon.h",
+-    ]
++    if (arm_use_neon) {
++      sources += [
++        "ext/convolver_neon.cc",
++        "ext/convolver_neon.h",
++      ]
++    }
+   }
+ 
+   # The imported Skia gni source paths are made absolute by gn.
diff --git a/debian/patches/series b/debian/patches/series
index 6a33c79..7dca35f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,6 +28,7 @@ fixes/widevine-revision.patch
 fixes/connection-message.patch
 fixes/chromedriver-revision.patch
 fixes/skia_buildfix.patch
+fixes/skia_neon.patch
 
 warnings/friend.patch
 warnings/printf.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-chromium/pkg-chromium.git