summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/x264
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-08-05 17:42:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-13 23:05:58 +0100
commit70711312008eda97ece45af73d68ba86f714a13f (patch)
tree4a276ce584cd1c62abbef1e4389d8872dd6de500 /meta/recipes-multimedia/x264
parent2d493e9b24d7fac9547429294a78d4f10c2cc62f (diff)
downloadpoky-70711312008eda97ece45af73d68ba86f714a13f.tar.gz
x264: add from meta-oe, update and tweak
This is required by the default configuration of libav being brought over from meta-oe. Changes from the meta-oe recipe: * Update to the latest revision from the stable branch (upstream does not seem to provide stable releases.) * Add LICENSE_FLAGS = "commercial" * Enable PIC to fix text relocation warnings and disable warning for i586 (since PIC can't be used there) * Make SUMMARY value slightly shorter * Indent SRC_URI consistently with other recipes in OE-Core (From OE-Core rev: a3ca077285003fbc04d134e875a58a745271e47f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/x264')
-rw-r--r--meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch20
-rw-r--r--meta/recipes-multimedia/x264/x264_git.bb52
2 files changed, 72 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
new file mode 100644
index 0000000000..b844d88fe8
--- /dev/null
+++ b/meta/recipes-multimedia/x264/x264/don-t-default-to-cortex-a9-with-neon.patch
@@ -0,0 +1,20 @@
1-march flag is not in CFLAGS so this will always default to -mcpu=cortex-a8
2-mfpu=neon.
3
4Upstream-Status: Pending
5Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
6
7Index: git/configure
8===================================================================
9--- git.orig/configure 2013-02-10 16:26:40.666343682 +0200
10+++ git/configure 2013-02-10 16:27:49.198341677 +0200
11@@ -703,9 +703,6 @@
12 fi
13
14 if [ $asm = auto -a $ARCH = ARM ] ; then
15- # set flags so neon is built by default
16- echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
17-
18 if cc_check '' '' '__asm__("rev ip, ip");' ; then define HAVE_ARMV6
19 cc_check '' '' '__asm__("movt r0, #0");' && define HAVE_ARMV6T2
20 cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
diff --git a/meta/recipes-multimedia/x264/x264_git.bb b/meta/recipes-multimedia/x264/x264_git.bb
new file mode 100644
index 0000000000..295818ae98
--- /dev/null
+++ b/meta/recipes-multimedia/x264/x264_git.bb
@@ -0,0 +1,52 @@
1SUMMARY = "A free software library and application for encoding video streams into the H.264/MPEG-4 AVC format"
2HOMEPAGE = "http://www.videolan.org/developers/x264.html"
3
4LICENSE = "GPLv2"
5LICENSE_FLAGS = "commercial"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7
8DEPENDS = "yasm-native"
9
10SRC_URI = "git://git.videolan.org/x264.git \
11 file://don-t-default-to-cortex-a9-with-neon.patch \
12 "
13
14SRCREV = "585324fee380109acd9986388f857f413a60b896"
15
16PV = "r2265+git${SRCPV}"
17
18S = "${WORKDIR}/git"
19
20inherit lib_package pkgconfig
21
22X264_DISABLE_ASM = ""
23X264_DISABLE_ASM_armv4 = "--disable-asm"
24X264_DISABLE_ASM_armv5 = "--disable-asm"
25
26EXTRA_OECONF = '--prefix=${prefix} \
27 --host=${HOST_SYS} \
28 --cross-prefix=${TARGET_PREFIX} \
29 --sysroot=${STAGING_DIR_TARGET} \
30 --enable-shared \
31 --enable-static \
32 --disable-lavf \
33 --disable-swscale \
34 --enable-pic \
35 ${X264_DISABLE_ASM} \
36 '
37
38do_configure() {
39 ./configure ${EXTRA_OECONF}
40}
41
42# Get rid of -e
43EXTRA_OEMAKE = ""
44AS = "${TARGET_PREFIX}gcc"
45
46do_install() {
47 oe_runmake install DESTDIR=${D}
48}
49
50# PIC can't be enabled for 32-bit x86
51INSANE_SKIP_${PN}_append_i586 = " textrel"
52