summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr2016-03-15 18:52:58 -0700
committerDonald Carr2016-03-15 18:52:58 -0700
commite3c9a3ce8e294af65b9c7d56f2489e160b6cd4ed (patch)
tree3f4c8646f2d70cd159c74f0d68471d40052744ce
parent29e272b8f8fedb1b87407190b2bc512787fe6554 (diff)
downloadaur-e3c9a3ce8e294af65b9c7d56f2489e160b6cd4ed.tar.gz
Try to patch webengine to build neon support on the Pi3
Change-Id: I11844d5c01b939906a8222af33c45a83b2be4cca
-rw-r--r--0001-Include-neon-support-for-any-fpu-.-neon.patch26
-rw-r--r--PKGBUILD5
2 files changed, 30 insertions, 1 deletions
diff --git a/0001-Include-neon-support-for-any-fpu-.-neon.patch b/0001-Include-neon-support-for-any-fpu-.-neon.patch
new file mode 100644
index 000000000000..777b47ea8c32
--- /dev/null
+++ b/0001-Include-neon-support-for-any-fpu-.-neon.patch
@@ -0,0 +1,26 @@
+From 133d09c9c65cea0addec7963abd32992b2144a0d Mon Sep 17 00:00:00 2001
+From: Donald Carr <sirspudd@gmail.com>
+Date: Tue, 15 Mar 2016 18:48:24 -0700
+Subject: [PATCH] Include neon support for any -fpu=.*neon.*
+
+Change-Id: I9c571c823b6fa2411e003799f7ff8627ef6e1d5e
+---
+ src/core/gyp_run.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
+index dea1a22..8aa4ad2 100644
+--- a/src/core/gyp_run.pro
++++ b/src/core/gyp_run.pro
+@@ -75,7 +75,7 @@ contains(QT_ARCH, "arm") {
+ # If the toolchain does not explicitly specify to use NEON instructions
+ # we use arm_neon_optional for ARMv7 and newer and let chromium decide
+ # about the mfpu option.
+- contains(MFPU, "neon")|contains(MFPU, "neon-vfpv4"): GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=1
++ contains(MFPU, ".*neon.*"): GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=1
+ else:!lessThan(MARMV, 7): GYP_CONFIG += arm_neon=0 arm_neon_optional=1
+ else: GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=0 arm_neon_optional=0
+ }
+--
+2.7.3
+
diff --git a/PKGBUILD b/PKGBUILD
index 53aa0cecdd5e..9c3af7a7b264 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,7 +29,7 @@ pkgver="${_pkgvermajmin}.0"
pkgrel=2
# PKGBUILD
-_piver=2
+_piver=3
pkgname="qt-sdk-raspberry-pi${_piver}"
if $_static_build; then
@@ -108,6 +108,7 @@ build() {
local _srcdir="${srcdir}/${_source_unpackaged_name}"
local _basedir="${_srcdir}/qtbase"
local _waylanddir="${_srcdir}/qtwayland"
+ local _webenginedir="${_srcdir}/qtwebengine"
local _bindir="${_srcdir}"
local _mkspec_dir="${_basedir}/mkspecs/devices/${_mkspec}"
@@ -152,6 +153,8 @@ fi
patch -p1 < ${_patch_dir}/0001-journald-test-will-fail-with-certain-toolchains.patch
cd ${_waylanddir}
patch -p1 < ${_patch_dir}/0001-Adjust-Raspberry-Pi-integration-to-new-API.patch
+ cd ${_webenginedir}
+ patch -p1 < ${_patch_dir}/0001-Include-neon-support-for-any-fpu-.-neon.patch
# end patch