summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorRafaël Carré <funman@videolan.org>2016-02-10 13:54:21 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-02-25 17:45:44 +0100
commit0f2b3139521570ad494a72399f8a9dae76e69b16 (patch)
tree1084b9c683e3bfebec4836cc1334ea108b3c199b /meta-multimedia
parent0b3612b0f2e4eea936f5c7058e8f1b870e25f9d3 (diff)
downloadmeta-openembedded-0f2b3139521570ad494a72399f8a9dae76e69b16.tar.gz
vlc: make x11 DISTRO_FEATURE optional (enabled by default)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc.inc9
1 files changed, 4 insertions, 5 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 46dbd5d62..2887a68d2 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"
7 7
8DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \ 8DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
9 virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \ 9 virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \
10 tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \ 10 tremor faad2 ffmpeg flac fluidsynth alsa-lib \
11 lua-native lua libidn \ 11 lua-native lua libidn \
12 avahi jpeg xz libmodplug mpeg2dec \ 12 avahi jpeg xz libmodplug mpeg2dec \
13 libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ 13 libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
14 tiff xcb-util-keysyms" 14 tiff"
15 15
16SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz" 16SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz"
17 17
18inherit autotools gettext pkgconfig distro_features_check 18inherit autotools gettext pkgconfig distro_features_check
19# depends on libxinerama libxpm xcb-util-keysyms
20REQUIRED_DISTRO_FEATURES = "x11"
21 19
22ARM_INSTRUCTION_SET = "arm" 20ARM_INSTRUCTION_SET = "arm"
23 21
@@ -41,7 +39,7 @@ EXTRA_OECONF = "\
41 ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ 39 ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
42" 40"
43 41
44PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread" 42PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
45PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" 43PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
46PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" 44PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
47PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 45PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
@@ -73,6 +71,7 @@ PACKAGECONFIG[fontconfig] = "--enable-fontconfig,--disable-fontconfig, fontconfi
73PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype" 71PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype"
74PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss" 72PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread libdvdcss"
75PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver" 73PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver"
74PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb, xcb-util-keysyms libxpm libxinerama"
76 75
77do_configure_prepend() { 76do_configure_prepend() {
78 cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true 77 cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true