aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafaël Carré <funman@videolan.org>2016-02-10 14:25:40 +0100
committerArmin Kuster <akuster808@gmail.com>2016-04-17 12:47:02 -0700
commitea971aca619d087ab3478e5f48711ed1961ef526 (patch)
treee637ab7b10f81aaefefc91f575d584681754aa32
parent9a2f0196fcb9112c1c05e90d2eebb5d3dce9a8c3 (diff)
downloadmeta-openembedded-ea971aca619d087ab3478e5f48711ed1961ef526.tar.gz
meta-openembedded-ea971aca619d087ab3478e5f48711ed1961ef526.tar.bz2
meta-openembedded-ea971aca619d087ab3478e5f48711ed1961ef526.zip
vlc: make sdl optional (enabled by default)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 2887a68d2..3267dade0 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -6,7 +6,7 @@ LICENSE = "GPL-2.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
- virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \
+ dbus dbus-glib libxml2 gnutls \
tremor faad2 ffmpeg flac fluidsynth alsa-lib \
lua-native lua libidn \
avahi jpeg xz libmodplug mpeg2dec \
@@ -25,7 +25,6 @@ EXTRA_OECONF = "\
--disable-screen --disable-caca \
--enable-httpd --enable-vlm \
--enable-freetype \
- --enable-sdl \
--enable-png \
--enable-tremor \
--enable-v4l2 --disable-aa --disable-faad \
@@ -39,8 +38,9 @@ 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', '', d)}"
+PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@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"
PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"