mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

x264: Update to latest on stable branch

Browse Source 
- 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>
This commit is contained in:
Khem Raj
2016-11-08 07:19:32 -08:00
committed by Richard Purdie
parent dd24fbfb47
commit e6b59a1ac4
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
View File

@@ -5,10 +5,10 @@ Upstream-Status: Pending
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
diff --git a/configure b/configure diff --git a/configure b/configure
index 2916036..f4ece40 100755 index 9d1586c..3109ec4 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -773,9 +773,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then @@ -874,9 +874,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
fi fi
if [ $asm = auto -a $ARCH = ARM ] ; then if [ $asm = auto -a $ARCH = ARM ] ; then
@@ -18,12 +18,3 @@ index 2916036..f4ece40 100755
if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6 if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6
cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2 cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2
cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
@@ -788,8 +785,6 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
fi
if [ $asm = auto -a $ARCH = AARCH64 ] ; then
- # set flags so neon is built by default
- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu|-arch)' || CFLAGS="$CFLAGS -arch arm64 -mfpu=neon"
if cc_check '' '' '__asm__("cmeq v0.8h, v0.8h, #0");' ; then define HAVE_NEON
ASFLAGS="$ASFLAGS -c"

11
meta/recipes-multimedia/x264/x264_git.bb
View File

@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "yasm-native" 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 \ file://don-t-default-to-cortex-a9-with-neon.patch \
" "
SRCREV = "c8a773ebfca148ef04f5a60d42cbd7336af0baf6" SRCREV = "86b71982e131eaa70125f8d0e725fcade9c4c677"
PV = "r2491+git${SRCPV}" PV = "r2491+git${SRCPV}"
@@ -34,6 +34,7 @@ EXTRA_OECONF = '--prefix=${prefix} \
--enable-static \ --enable-static \
--disable-lavf \ --disable-lavf \
--disable-swscale \ --disable-swscale \
--disable-opencl \
--enable-pic \ --enable-pic \
${X264_DISABLE_ASM} \ ${X264_DISABLE_ASM} \
' '
@@ -42,12 +43,8 @@ do_configure() {
./configure ${EXTRA_OECONF} ./configure ${EXTRA_OECONF}
} }
AS = "${TARGET_PREFIX}gcc"
do_install() { do_install() {
oe_runmake install DESTDIR=${D} oe_runmake install DESTDIR=${D}
} }
# PIC can't be enabled for few BSP's AS[unexport] = "1"
INSANE_SKIP_${PN}_append = " textrel"