summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2015-12-02 10:45:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-08 10:20:50 +0000
commitfda98598f0d8afb94d573eca6c7c262b8c0d599f (patch)
tree2ae37b2c48bca32868179a1103b823e99c0ec577
parent7ba85f1c1373c45b363e566efc7e334152e16da5 (diff)
downloadpoky-fda98598f0d8afb94d573eca6c7c262b8c0d599f.tar.gz
poky-fda98598f0d8afb94d573eca6c7c262b8c0d599f.tar.bz2
poky-fda98598f0d8afb94d573eca6c7c262b8c0d599f.zip
libav: Add PACKAGECONFIG options: avdevice, avfilter, avplay, gpl
(From OE-Core rev: 896c27d45d77a2bb57b3cd350b60f1bd97dd13dc) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/libav/libav.inc13
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
index a8c78be031..e55038c2c2 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -34,9 +34,13 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
EXTRA_FFCONF ?= ""
-PACKAGECONFIG ??= "bzip2 x264 theora ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG ??= "avdevice avfilter avplay bzip2 gpl theora x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice"
+PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter"
+PACKAGECONFIG[avplay] = "--enable-avplay,--disable-avplay"
PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2"
PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac"
+PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm"
PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis"
@@ -56,14 +60,11 @@ USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ],
EXTRA_OECONF = " \
--enable-shared \
--enable-pthreads \
- --enable-gpl \
${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
- --enable-avfilter \
\
--cross-prefix=${TARGET_PREFIX} \
--prefix=${prefix} \
\
- --enable-avplay \
--ld="${CCLD}" \
--arch=${TARGET_ARCH} \
--target-os="linux" \
@@ -87,7 +88,9 @@ do_configure() {
}
do_install_append() {
- install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/
+ if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'avfilter', 'yes', '', d)}" ]; then
+ install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/
+ fi
}
PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets"