From ea971aca619d087ab3478e5f48711ed1961ef526 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Wed, 10 Feb 2016 14:25:40 +0100 Subject: vlc: make sdl optional (enabled by default) Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster --- meta-multimedia/recipes-multimedia/vlc/vlc.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index 2887a68d23..3267dade0f 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" -- cgit 1.2.3-korg