From e6b59a1ac46ffad01e7c98c796148b0e12a5a0f2 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 8 Nov 2016 07:19:32 -0800 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-multimedia/x264/x264_git.bb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'meta/recipes-multimedia/x264/x264_git.bb') 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" DEPENDS = "yasm-native" -SRC_URI = "git://git.videolan.org/x264.git \ +SRC_URI = "git://github.com/mirror/x264;branch=stable \ file://don-t-default-to-cortex-a9-with-neon.patch \ " -SRCREV = "c8a773ebfca148ef04f5a60d42cbd7336af0baf6" +SRCREV = "86b71982e131eaa70125f8d0e725fcade9c4c677" PV = "r2491+git${SRCPV}" @@ -34,6 +34,7 @@ EXTRA_OECONF = '--prefix=${prefix} \ --enable-static \ --disable-lavf \ --disable-swscale \ + --disable-opencl \ --enable-pic \ ${X264_DISABLE_ASM} \ ' @@ -42,12 +43,8 @@ do_configure() { ./configure ${EXTRA_OECONF} } -AS = "${TARGET_PREFIX}gcc" - do_install() { oe_runmake install DESTDIR=${D} } -# PIC can't be enabled for few BSP's -INSANE_SKIP_${PN}_append = " textrel" - +AS[unexport] = "1" -- cgit v1.2.3-54-g00ecf