summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-11-08 07:19:32 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-15 15:19:54 +0000
commite6b59a1ac46ffad01e7c98c796148b0e12a5a0f2 (patch)
tree43e207c0afafd11b89368098df7971259d4d61e8
parentdd24fbfb477fe3876f2205cfcf9d55f7327dead5 (diff)
downloadpoky-e6b59a1ac46ffad01e7c98c796148b0e12a5a0f2.tar.gz
x264: Update to latest on stable branch
- unexport AS variable - Switch URI to use github mirror for reliabality - Disable openCL code, its not used - TEXTRELs are fixed, therefore dont skip QA check (From OE-Core rev: 8f132ca02c0d8abe309b622cfeef5f21ecc0b242) Signed-off-by: Khem Raj <raj.khem@gmail.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.patch13
-rw-r--r--meta/recipes-multimedia/x264/x264_git.bb11
2 files changed, 6 insertions, 18 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 bf72fca682..73f2aac613 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
@@ -5,10 +5,10 @@ Upstream-Status: Pending
5Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 5Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
6 6
7diff --git a/configure b/configure 7diff --git a/configure b/configure
8index 2916036..f4ece40 100755 8index 9d1586c..3109ec4 100755
9--- a/configure 9--- a/configure
10+++ b/configure 10+++ b/configure
11@@ -773,9 +773,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then 11@@ -874,9 +874,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
@@ -18,12 +18,3 @@ index 2916036..f4ece40 100755
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 393310f684..e790681ad3 100644
--- a/meta/recipes-multimedia/x264/x264_git.bb
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
8 8
9DEPENDS = "yasm-native" 9DEPENDS = "yasm-native"
10 10
11SRC_URI = "git://git.videolan.org/x264.git \ 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 \
13 " 13 "
14 14
15SRCREV = "c8a773ebfca148ef04f5a60d42cbd7336af0baf6" 15SRCREV = "86b71982e131eaa70125f8d0e725fcade9c4c677"
16 16
17PV = "r2491+git${SRCPV}" 17PV = "r2491+git${SRCPV}"
18 18
@@ -34,6 +34,7 @@ EXTRA_OECONF = '--prefix=${prefix} \
34 --enable-static \ 34 --enable-static \
35 --disable-lavf \ 35 --disable-lavf \
36 --disable-swscale \ 36 --disable-swscale \
37 --disable-opencl \
37 --enable-pic \ 38 --enable-pic \
38 ${X264_DISABLE_ASM} \ 39 ${X264_DISABLE_ASM} \
39 ' 40 '
@@ -42,12 +43,8 @@ do_configure() {
42 ./configure ${EXTRA_OECONF} 43 ./configure ${EXTRA_OECONF}
43} 44}
44 45
45AS = "${TARGET_PREFIX}gcc"
46
47do_install() { 46do_install() {
48 oe_runmake install DESTDIR=${D} 47 oe_runmake install DESTDIR=${D}
49} 48}
50 49
51# PIC can't be enabled for few BSP's 50AS[unexport] = "1"
52INSANE_SKIP_${PN}_append = " textrel"
53