summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/libav
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-multimedia/libav')
-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}"
34EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" 34EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
35EXTRA_FFCONF ?= "" 35EXTRA_FFCONF ?= ""
36 36
37PACKAGECONFIG ??= "bzip2 x264 theora ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 37PACKAGECONFIG ??= "avdevice avfilter avplay bzip2 gpl theora x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
38PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice"
39PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter"
40PACKAGECONFIG[avplay] = "--enable-avplay,--disable-avplay"
38PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2" 41PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2"
39PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" 42PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac"
43PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl"
40PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm" 44PACKAGECONFIG[gsm] = "--enable-libgsm,--disable-libgsm,libgsm"
41PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" 45PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
42PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis" 46PACKAGECONFIG[libvorbis] = "--enable-libvorbis,--disable-libvorbis,libvorbis"
@@ -56,14 +60,11 @@ USE_NONFREE = "${@bb.utils.contains_any('PACKAGECONFIG', [ 'faac', 'openssl' ],
56EXTRA_OECONF = " \ 60EXTRA_OECONF = " \
57 --enable-shared \ 61 --enable-shared \
58 --enable-pthreads \ 62 --enable-pthreads \
59 --enable-gpl \
60 ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \ 63 ${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
61 --enable-avfilter \
62 \ 64 \
63 --cross-prefix=${TARGET_PREFIX} \ 65 --cross-prefix=${TARGET_PREFIX} \
64 --prefix=${prefix} \ 66 --prefix=${prefix} \
65 \ 67 \
66 --enable-avplay \
67 --ld="${CCLD}" \ 68 --ld="${CCLD}" \
68 --arch=${TARGET_ARCH} \ 69 --arch=${TARGET_ARCH} \
69 --target-os="linux" \ 70 --target-os="linux" \
@@ -87,7 +88,9 @@ do_configure() {
87} 88}
88 89
89do_install_append() { 90do_install_append() {
90 install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/ 91 if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'avfilter', 'yes', '', d)}" ]; then
92 install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/
93 fi
91} 94}
92 95
93PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets" 96PACKAGES += "${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets"