diff options
author | Khem Raj <raj.khem@gmail.com> | 2016-11-08 07:19:32 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-15 15:19:54 +0000 |
commit | e6b59a1ac46ffad01e7c98c796148b0e12a5a0f2 (patch) | |
tree | 43e207c0afafd11b89368098df7971259d4d61e8 /meta/recipes-multimedia/x264/x264_git.bb | |
parent | dd24fbfb477fe3876f2205cfcf9d55f7327dead5 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-multimedia/x264/x264_git.bb')
-rw-r--r-- | meta/recipes-multimedia/x264/x264_git.bb | 11 |
1 files changed, 4 insertions, 7 deletions
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 | ||
9 | DEPENDS = "yasm-native" | 9 | DEPENDS = "yasm-native" |
10 | 10 | ||
11 | SRC_URI = "git://git.videolan.org/x264.git \ | 11 | SRC_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 | ||
15 | SRCREV = "c8a773ebfca148ef04f5a60d42cbd7336af0baf6" | 15 | SRCREV = "86b71982e131eaa70125f8d0e725fcade9c4c677" |
16 | 16 | ||
17 | PV = "r2491+git${SRCPV}" | 17 | PV = "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 | ||
45 | AS = "${TARGET_PREFIX}gcc" | ||
46 | |||
47 | do_install() { | 46 | do_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 | 50 | AS[unexport] = "1" |
52 | INSANE_SKIP_${PN}_append = " textrel" | ||
53 | |||