summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2018-02-02 15:33:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:29 +0000
commitdcfe332645d7e7e8b926b9a11f937df1c38b86c9 (patch)
tree87830ec8c8335dcb2587e80182ceda5f5f649707
parentee9a355d416fa8a0d5871bb39c5d6190e0dc7204 (diff)
downloadpoky-dcfe332645d7e7e8b926b9a11f937df1c38b86c9.tar.gz
x264: upgrade to latest revision
Change dependency from yasm to nasm following this change: commit d2b5f4873e2147452a723b61b14f030b2ee760a5 Author: Henrik Gramner <henrik@gramner.com> Date: Sat Mar 18 18:50:36 2017 +0100 x86: Change assembler from yasm to nasm Refreshed the following patch: don-t-default-to-cortex-a9-with-neon.patch (From OE-Core rev: 85deeb7bdd17c417e48e86647ad1580e71829afa) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch29
-rw-r--r--meta/recipes-multimedia/x264/x264_git.bb6
2 files changed, 24 insertions, 11 deletions
diff --git a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
index 73f2aac613..065e3b35b7 100644
--- a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
+++ b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
@@ -1,20 +1,33 @@
1-march flag is not in CFLAGS so this will always default to -mcpu=cortex-a8 1From a72bf499a0674fc75eedf15008b424e28f67e4bd Mon Sep 17 00:00:00 2001
2-mfpu=neon. 2From: Andrei Gherzan <andrei@gherzan.ro>
3Date: Fri, 2 Feb 2018 15:10:08 +0200
4Subject: [PATCH] dont default to cortex-a9 with neon
5
6-march flag is not in CFLAGS so this will always default to
7 -mcpu=cortex-a8 -mfpu=neon.
3 8
4Upstream-Status: Pending 9Upstream-Status: Pending
10
5Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 11Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
12Signed-off-by: Maxin B. John <maxin.john@intel.com>
13---
14 configure | 3 ---
15 1 file changed, 3 deletions(-)
6 16
7diff --git a/configure b/configure 17diff --git a/configure b/configure
8index 9d1586c..3109ec4 100755 18index 0e3ef23..955b993 100755
9--- a/configure 19--- a/configure
10+++ b/configure 20+++ b/configure
11@@ -874,9 +874,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then 21@@ -911,9 +911,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
12 fi 22 fi
13 23
14 if [ $asm = auto -a $ARCH = ARM ] ; then 24 if [ $asm = auto -a $ARCH = ARM ] ; then
15- # set flags so neon is built by default 25- # set flags so neon is built by default
16- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" 26- [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
17- 27-
18 if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6 28 cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM
19 cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2 29 if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then
20 cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON 30 define HAVE_ARMV6
31--
322.4.0
33
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index bc9775ab2a..a669295044 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -6,7 +6,7 @@ LICENSE = "GPLv2"
6LICENSE_FLAGS = "commercial" 6LICENSE_FLAGS = "commercial"
7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
8 8
9DEPENDS = "yasm-native" 9DEPENDS = "nasm-native"
10 10
11SRC_URI = "git://github.com/mirror/x264;branch=stable \ 11SRC_URI = "git://github.com/mirror/x264;branch=stable \
12 file://don-t-default-to-cortex-a9-with-neon.patch \ 12 file://don-t-default-to-cortex-a9-with-neon.patch \
@@ -14,9 +14,9 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \
14 " 14 "
15UPSTREAM_CHECK_COMMITS = "1" 15UPSTREAM_CHECK_COMMITS = "1"
16 16
17SRCREV = "2b741f81e51f92d053d87a49f59ff1026553a0f6" 17SRCREV = "e9a5903edf8ca59ef20e6f4894c196f135af735e"
18 18
19PV = "r2731+git${SRCPV}" 19PV = "r2854+git${SRCPV}"
20 20
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22 22