aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2017-03-21 14:32:18 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2017-03-21 14:32:18 +0000
commit393b9e0926a27308dc3c036d1d3a79eec00ff276 (patch)
tree9b25bf3a316c946106478ca1208d0f9ec322627d
parente938bb19b70526dbd9d947bc7b75d322aa308769 (diff)
parent53e399c375b0b7ce4a90ae8f05789e2e127eb773 (diff)
Merge "[rcar-gen3] Fix webp bbappend"
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon_for_0.5.1.diff13
-rw-r--r--meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/webp/libwebp_%.bbappend8
2 files changed, 21 insertions, 0 deletions
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon_for_0.5.1.diff b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon_for_0.5.1.diff
new file mode 100644
index 000000000..e8523df40
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon_for_0.5.1.diff
@@ -0,0 +1,13 @@
+diff --git a/src/dsp/dsp.h b/src/dsp/dsp.h
+index 1faac27..8aae380 100644
+--- a/src/dsp/dsp.h
++++ b/src/dsp/dsp.h
+@@ -77,7 +77,7 @@ extern "C" {
+ #if (defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) || \
+ defined(__aarch64__) || defined(WEBP_HAVE_NEON)) && \
+ !defined(__native_client__)
+-#define WEBP_USE_NEON
++//#define WEBP_USE_NEON
+ #endif
+
+ #if defined(_MSC_VER) && _MSC_VER >= 1700 && defined(_M_ARM)
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/webp/libwebp_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/webp/libwebp_%.bbappend
new file mode 100644
index 000000000..bfeb4c50b
--- /dev/null
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-multimedia/webp/libwebp_%.bbappend
@@ -0,0 +1,8 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+# Add W/A patch for linaro gcc.
+# This patch disabled neon. (undefined #WEBP_USE_NEON)
+
+SRC_URI_append = " file://disabled_arm_neon_for_0.5.1.diff"
+#Remove patch for 0.5.0
+SRC_URI_remove = " file://disabled_arm_neon.diff"