diff options
Diffstat (limited to 'meta/recipes-multimedia/x264/x264_git.bb')
| -rw-r--r-- | meta/recipes-multimedia/x264/x264_git.bb | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb index 0a69909808..2ac2b6f1a6 100644 --- a/meta/recipes-multimedia/x264/x264_git.bb +++ b/meta/recipes-multimedia/x264/x264_git.bb @@ -2,28 +2,32 @@ SUMMARY = "H.264/MPEG-4 AVC video encoder" DESCRIPTION = "A free software library and application for encoding video streams into the H.264/MPEG-4 AVC format." HOMEPAGE = "http://www.videolan.org/developers/x264.html" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LICENSE_FLAGS = "commercial" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" -DEPENDS = "yasm-native" +DEPENDS = "nasm-native" -SRC_URI = "git://git.videolan.org/x264.git \ +SRC_URI = "git://github.com/mirror/x264;branch=stable;protocol=https \ file://don-t-default-to-cortex-a9-with-neon.patch \ + file://Fix-X32-build-by-disabling-asm.patch \ " +UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "c8a773ebfca148ef04f5a60d42cbd7336af0baf6" +SRCREV = "baee400fa9ced6f5481a728138fed6e867b0ff7f" -PV = "r2491+git${SRCPV}" +PV = "r3039+git${SRCPV}" S = "${WORKDIR}/git" -inherit lib_package pkgconfig perlnative +inherit lib_package pkgconfig X264_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)}" +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)}" +X264_DISABLE_ASM:mipsarch = "${@bb.utils.contains("TUNE_FEATURES", "r6", "", "--disable-asm", d)}" EXTRA_OECONF = '--prefix=${prefix} \ --host=${HOST_SYS} \ @@ -34,22 +38,19 @@ EXTRA_OECONF = '--prefix=${prefix} \ --enable-static \ --disable-lavf \ --disable-swscale \ + --disable-opencl \ --enable-pic \ ${X264_DISABLE_ASM} \ ' do_configure() { + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} + install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} ./configure ${EXTRA_OECONF} } -# Get rid of -e -EXTRA_OEMAKE = "" -AS = "${TARGET_PREFIX}gcc" - do_install() { oe_runmake install DESTDIR=${D} } -# PIC can't be enabled for 32-bit x86 -INSANE_SKIP_${PN}_append_x86 = " textrel" - +AS[unexport] = "1" |