summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch21
-rw-r--r--meta/recipes-multimedia/x264/x264_git.bb4
2 files changed, 17 insertions, 8 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 b844d88fe8..bf72fca682 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
@@ -4,13 +4,13 @@
4Upstream-Status: Pending 4Upstream-Status: Pending
5Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 5Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
6 6
7Index: git/configure 7diff --git a/configure b/configure
8=================================================================== 8index 2916036..f4ece40 100755
9--- git.orig/configure 2013-02-10 16:26:40.666343682 +0200 9--- a/configure
10+++ git/configure 2013-02-10 16:27:49.198341677 +0200 10+++ b/configure
11@@ -703,9 +703,6 @@ 11@@ -773,9 +773,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
12 fi 12 fi
13 13
14 if [ $asm = auto -a $ARCH = ARM ] ; then 14 if [ $asm = auto -a $ARCH = ARM ] ; then
15- # set flags so neon is built by default 15- # set flags so neon is built by default
16- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon" 16- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
@@ -18,3 +18,12 @@ Index: git/configure
18 if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6 18 if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6
19 cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2 19 cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2
20 cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON 20 cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
21@@ -788,8 +785,6 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
22 fi
23
24 if [ $asm = auto -a $ARCH = AARCH64 ] ; then
25- # set flags so neon is built by default
26- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-arch)' || CFLAGS="$CFLAGS -arch arm64 -mfpu=neon"
27
28 if cc_check '' '' '__asm__("cmeq v0.8h, v0.8h, #0");' ; then define HAVE_NEON
29 ASFLAGS="$ASFLAGS -c"
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
index 105ccae177..0a69909808 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -12,9 +12,9 @@ SRC_URI = "git://git.videolan.org/x264.git \
12 file://don-t-default-to-cortex-a9-with-neon.patch \ 12 file://don-t-default-to-cortex-a9-with-neon.patch \
13 " 13 "
14 14
15SRCREV = "ffc3ad4945da69f3caa2b40e4eed715a9a8d9526" 15SRCREV = "c8a773ebfca148ef04f5a60d42cbd7336af0baf6"
16 16
17PV = "r2265+git${SRCPV}" 17PV = "r2491+git${SRCPV}"
18 18
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
20 20