diff options
author | Rafaël Carré <funman@videolan.org> | 2016-03-03 16:50:31 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-03-07 13:02:19 +0100 |
commit | 997688e21cafc03b248fab009b7a3ad79d02a50f (patch) | |
tree | 356a6f8cca8a8839138753290ad809cd1fae783b /meta-multimedia | |
parent | bd1b046033680d8c86d2a4e28faf0449fcce99f8 (diff) | |
download | meta-openembedded-997688e21cafc03b248fab009b7a3ad79d02a50f.tar.gz |
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.inc | 4 |
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 = "\ | |||
25 | --disable-screen --disable-caca \ | 25 | --disable-screen --disable-caca \ |
26 | --enable-httpd --enable-vlm \ | 26 | --enable-httpd --enable-vlm \ |
27 | --enable-freetype \ | 27 | --enable-freetype \ |
28 | --enable-png \ | ||
29 | --enable-tremor \ | 28 | --enable-tremor \ |
30 | --enable-v4l2 --disable-aa --disable-faad \ | 29 | --enable-v4l2 --disable-aa --disable-faad \ |
31 | --enable-dbus \ | 30 | --enable-dbus \ |
@@ -38,7 +37,7 @@ EXTRA_OECONF = "\ | |||
38 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ | 37 | ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ |
39 | " | 38 | " |
40 | 39 | ||
41 | PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}" | 40 | PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}" |
42 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" | 41 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" |
43 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image " | 42 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image " |
44 | PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" | 43 | PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" |
@@ -72,6 +71,7 @@ PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" | |||
72 | PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" | 71 | PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" |
73 | PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" | 72 | PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" |
74 | PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" | 73 | PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama" |
74 | PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" | ||
75 | 75 | ||
76 | do_configure_prepend() { | 76 | do_configure_prepend() { |
77 | cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true | 77 | cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true |