aboutsummaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorRafaël Carré <funman@videolan.org>2016-03-03 16:50:31 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-03-07 13:02:19 +0100
commit997688e21cafc03b248fab009b7a3ad79d02a50f (patch)
tree356a6f8cca8a8839138753290ad809cd1fae783b /meta-multimedia
parentbd1b046033680d8c86d2a4e28faf0449fcce99f8 (diff)
downloadmeta-openembedded-contrib-997688e21cafc03b248fab009b7a3ad79d02a50f.tar.gz
meta-openembedded-contrib-997688e21cafc03b248fab009b7a3ad79d02a50f.tar.bz2
meta-openembedded-contrib-997688e21cafc03b248fab009b7a3ad79d02a50f.zip
vlc: add libpng PACKAGECONFIG (on by default)
WARNING: vlc-2.2.2-r0 do_package_qa: QA Issue: vlc rdepends on libpng, but it isn't a build dependency, missing libpng in DEPENDS or PACKAGECONFIG? [build-deps] Signed-off-by: Rafaël Carré <funman@videolan.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index c77f2d1b81..8142e16510 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -25,7 +25,6 @@ EXTRA_OECONF = "\
--disable-screen --disable-caca \
--enable-httpd --enable-vlm \
--enable-freetype \
- --enable-png \
--enable-tremor \
--enable-v4l2 --disable-aa --disable-faad \
--enable-dbus \
@@ -38,7 +37,7 @@ EXTRA_OECONF = "\
ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
"
-PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}"
+PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}"
PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image "
PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
@@ -72,6 +71,7 @@ PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype"
PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"
PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver"
PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama"
+PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
do_configure_prepend() {
cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true