summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Crapet <Matthieu.Crapet@ingenico.com>2014-06-30 16:23:21 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-03 17:41:17 +0100
commit70c933e3abbaadf3142e039ccf8f675b4a458417 (patch)
treeb2c258356100dbff33a114c8ef5f9d0e11075441
parent5f1f863866a9591604ed782074ee99ef14f08446 (diff)
downloadpoky-70c933e3abbaadf3142e039ccf8f675b4a458417.tar.gz
libav: add PACKAGECONFIG for theora, libvorbis, speex and openssl
Dropped libvorvis dependency because there is already a (better) builtin vorbis codec. Don't confuse codec names: "vorbis" (builtin) and "libvorbis" (using external library). Changes: - add --enable-nonfree when faac or openssl are used - add DESCRIPTION - sort PACKAGECONFIG entries Tested with libav-0.8.11 & libav-9.13. Note: Be sure to have a recent version of bitbake (2014-06-11 or better) including this: http://cgit.openembedded.org/bitbake/commit/?id=2e742c03e8dfdfa67899e7f5d579ed14bd87e139 It affects behavior of bb.utils.contains_any (From OE-Core rev: 62eede9de6fa1c76fa97ca5c6ba2d31309759b10) Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/libav/libav.inc30
1 files changed, 22 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
index a05a2a6601..1d617a2482 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -1,6 +1,12 @@
1SUMMARY = "A complete, cross-platform solution to record, convert and stream audio and video" 1SUMMARY = "Open source audio and video processing tools and librairies"
2DESCRIPTION = "Libav is a friendly and community-driven effort to provide its users \
3 with a set of portable, functional and high-performance libraries for \
4 dealing with multimedia formats of all sorts. It originates from the \
5 FFmpeg codebase, but goes its own way these days, providing its users \
6 with reliable releases and a clear vision how to go forward."
2HOMEPAGE = "http://libav.org/" 7HOMEPAGE = "http://libav.org/"
3SECTION = "libs" 8SECTION = "libs"
9
4LICENSE = "GPLv2+" 10LICENSE = "GPLv2+"
5LICENSE_FLAGS = "commercial" 11LICENSE_FLAGS = "commercial"
6 12
@@ -9,7 +15,7 @@ PROVIDES = "ffmpeg"
9 15
10ARM_INSTRUCTION_SET = "arm" 16ARM_INSTRUCTION_SET = "arm"
11 17
12DEPENDS = "zlib libogg libvorbis libtheora yasm-native" 18DEPENDS = "zlib libogg yasm-native"
13 19
14INC_PR = "r8" 20INC_PR = "r8"
15 21
@@ -23,21 +29,29 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
23EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" 29EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
24EXTRA_FFCONF ?= "" 30EXTRA_FFCONF ?= ""
25 31
26PACKAGECONFIG ??= "bzip2 x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 32PACKAGECONFIG ??= "bzip2 x264 theora ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
27PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
28PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2" 33PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2"
29PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger" 34PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac"
30PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" 35PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm"
31PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" 36PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
32PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" 37PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis"
33PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame" 38PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame"
34PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" 39PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl"
40PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger"
41PACKAGECONFIG[speex] = "--enable-libspeex,--disable-libspeex,speex"
42PACKAGECONFIG[theora] = "--enable-libtheora,--disable-libtheora,libtheora"
43PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
35PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl" 44PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl"
45PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
46
47# Check codecs that require --enable-nonfree
48USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ], 'yes', '', d)}"
36 49
37EXTRA_OECONF = " \ 50EXTRA_OECONF = " \
38 --enable-shared \ 51 --enable-shared \
39 --enable-pthreads \ 52 --enable-pthreads \
40 --enable-gpl \ 53 --enable-gpl \
54 ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
41 --enable-avfilter \ 55 --enable-avfilter \
42 \ 56 \
43 --cross-prefix=${TARGET_PREFIX} \ 57 --cross-prefix=${TARGET_PREFIX} \