summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Lawrence <stephen.lawrence@renesas.com>2017-04-18 19:38:28 +0100
committerRonan Le Martret <ronan.lemartret@iot.bzh>2017-09-15 10:20:15 +0200
commit62b8bba232cd1541e4825cd165f835d7c40b4b3f (patch)
treed89dda6efeb9f9e54abfc48d24f5c4e664dab141
parent9f5581d2d4e644ab25c83269c8549d98af14ffc5 (diff)
webp: upgrade to 0.5.1
Morty poky meta upgraded to 0.5.1. Rework patch for 0.5.1. Adopted from Ronan Le Martret's commit 53e399c375b0b7c to meta-agl. (cherry picked from commit 488051b6c6a4a46cba123b7a758edc86b1c95758) Signed-off-by: Stephen Lawrence <stephen.lawrence@renesas.com>
-rw-r--r--meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon_for_0.5.1.diff (renamed from meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon.diff)9
-rw-r--r--meta-rcar-gen3/recipes-multimedia/webp/libwebp_%.bbappend2
2 files changed, 6 insertions, 5 deletions
diff --git a/meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon.diff b/meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon_for_0.5.1.diff
index 80b1811..e8523df 100644
--- a/meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon.diff
+++ b/meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon_for_0.5.1.diff
@@ -1,12 +1,13 @@
diff --git a/src/dsp/dsp.h b/src/dsp/dsp.h
-index 95f1ce0..fc20ffe 100644
+index 1faac27..8aae380 100644
--- a/src/dsp/dsp.h
+++ b/src/dsp/dsp.h
-@@ -73,7 +73,6 @@ extern "C" {
- // inline assembly would need to be modified for use with Native Client.
+@@ -77,7 +77,7 @@ extern "C" {
#if (defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) || \
- defined(__aarch64__)) && !defined(__native_client__)
+ 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-rcar-gen3/recipes-multimedia/webp/libwebp_%.bbappend b/meta-rcar-gen3/recipes-multimedia/webp/libwebp_%.bbappend
index e9469ed..9035026 100644
--- a/meta-rcar-gen3/recipes-multimedia/webp/libwebp_%.bbappend
+++ b/meta-rcar-gen3/recipes-multimedia/webp/libwebp_%.bbappend
@@ -2,4 +2,4 @@ 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.diff"
+SRC_URI_append = " file://disabled_arm_neon_for_0.5.1.diff"