summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch20
-rw-r--r--meta-oe/recipes-multimedia/x264/x264_git.bb6
2 files changed, 25 insertions, 1 deletions
diff --git a/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
new file mode 100644
index 000000000..b844d88fe
--- /dev/null
+++ b/meta-oe/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
@@ -0,0 +1,20 @@
1-march flag is not in CFLAGS so this will always default to -mcpu=cortex-a8
2-mfpu=neon.
3
4Upstream-Status: Pending
5Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
6
7Index: git/configure
8===================================================================
9--- git.orig/configure 2013-02-10 16:26:40.666343682 +0200
10+++ git/configure 2013-02-10 16:27:49.198341677 +0200
11@@ -703,9 +703,6 @@
12 fi
13
14 if [ $asm = auto -a $ARCH = ARM ] ; then
15- # set flags so neon is built by default
16- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
17-
18 if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6
19 cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2
20 cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
diff --git a/meta-oe/recipes-multimedia/x264/x264_git.bb b/meta-oe/recipes-multimedia/x264/x264_git.bb
index 7d7579f42..056c25c41 100644
--- a/meta-oe/recipes-multimedia/x264/x264_git.bb
+++ b/meta-oe/recipes-multimedia/x264/x264_git.bb
@@ -4,9 +4,13 @@ HOMEPAGE = "http://www.videolan.org/developers/x264.html"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 5LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
6 6
7PR = "r1"
8
7DEPENDS = "yasm-native" 9DEPENDS = "yasm-native"
8 10
9SRC_URI = "git://git.videolan.org/x264.git" 11SRC_URI = "git://git.videolan.org/x264.git \
12 file://don-t-default-to-cortex-a9-with-neon.patch \
13 "
10SRCREV = "1cffe9f406cc54f4759fc9eeb85598fb8cae66c7" 14SRCREV = "1cffe9f406cc54f4759fc9eeb85598fb8cae66c7"
11 15
12PV = "r2230+git" 16PV = "r2230+git"