From 62b8bba232cd1541e4825cd165f835d7c40b4b3f Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Tue, 18 Apr 2017 19:38:28 +0100 Subject: 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 --- .../recipes-multimedia/webp/libwebp/disabled_arm_neon.diff | 12 ------------ .../webp/libwebp/disabled_arm_neon_for_0.5.1.diff | 13 +++++++++++++ meta-rcar-gen3/recipes-multimedia/webp/libwebp_%.bbappend | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) delete mode 100644 meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon.diff create mode 100644 meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon_for_0.5.1.diff 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.diff deleted file mode 100644 index 80b1811..0000000 --- a/meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/dsp/dsp.h b/src/dsp/dsp.h -index 95f1ce0..fc20ffe 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. - #if (defined(__ARM_NEON__) || defined(WEBP_ANDROID_NEON) || \ - defined(__aarch64__)) && !defined(__native_client__) --#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/disabled_arm_neon_for_0.5.1.diff b/meta-rcar-gen3/recipes-multimedia/webp/libwebp/disabled_arm_neon_for_0.5.1.diff new file mode 100644 index 0000000..e8523df --- /dev/null +++ b/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-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" -- cgit 1.2.3-korg