From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- poky/meta/recipes-multimedia/x264/x264_git.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'poky/meta/recipes-multimedia/x264') diff --git a/poky/meta/recipes-multimedia/x264/x264_git.bb b/poky/meta/recipes-multimedia/x264/x264_git.bb index 4174cb281..34c7dc4f7 100644 --- a/poky/meta/recipes-multimedia/x264/x264_git.bb +++ b/poky/meta/recipes-multimedia/x264/x264_git.bb @@ -14,16 +14,16 @@ SRC_URI = "git://github.com/mirror/x264;branch=stable \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "e9a5903edf8ca59ef20e6f4894c196f135af735e" +SRCREV = "0a84d986e7020f8344f00752e3600b9769cc1e85" -PV = "r2854+git${SRCPV}" +PV = "r2917+git${SRCPV}" S = "${WORKDIR}/git" -inherit lib_package pkgconfig perlnative +inherit lib_package pkgconfig X264_DISABLE_ASM = "" -X264_DISABLE_ASM_x86_libc-musl = "--disable-asm" +X264_DISABLE_ASM_x86 = "--disable-asm" X264_DISABLE_ASM_armv4 = "--disable-asm" X264_DISABLE_ASM_armv5 = "--disable-asm" X264_DISABLE_ASM_powerpc = "${@bb.utils.contains("TUNE_FEATURES", "spe", "--disable-asm", "", d)}" -- cgit v1.2.3