From 0f2b3139521570ad494a72399f8a9dae76e69b16 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Wed, 10 Feb 2016 13:54:21 +0100 Subject: vlc: make x11 DISTRO_FEATURE optional (enabled by default) Signed-off-by: Martin Jansa --- meta-multimedia/recipes-multimedia/vlc/vlc.inc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index 46dbd5d629..2887a68d23 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -7,17 +7,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \ virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \ - tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \ + tremor faad2 ffmpeg flac fluidsynth alsa-lib \ lua-native lua libidn \ avahi jpeg xz libmodplug mpeg2dec \ libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ - tiff xcb-util-keysyms" + tiff" SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz" inherit autotools gettext pkgconfig distro_features_check -# depends on libxinerama libxpm xcb-util-keysyms -REQUIRED_DISTRO_FEATURES = "x11" ARM_INSTRUCTION_SET = "arm" @@ -41,7 +39,7 @@ EXTRA_OECONF = "\ ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ " -PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread" +PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" @@ -73,6 +71,7 @@ PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfi 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" do_configure_prepend() { cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true -- cgit 1.2.3-korg