summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorRafaël Carré <funman@videolan.org>2016-02-10 14:25:40 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-02-25 17:45:44 +0100
commit55e752b3ea43cd64f8ee7bc89e37a089b2a8a35f (patch)
tree2979f1456d6bc12bdc8d4219c67d9e37f1bc2403 /meta-multimedia
parent0f2b3139521570ad494a72399f8a9dae76e69b16 (diff)
downloadmeta-openembedded-55e752b3ea43cd64f8ee7bc89e37a089b2a8a35f.tar.gz
vlc: make sdl 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.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"
6LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 6LIC_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 dbus dbus-glib libxml2 gnutls \
10 tremor faad2 ffmpeg flac 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 \
@@ -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-sdl \
29 --enable-png \ 28 --enable-png \
30 --enable-tremor \ 29 --enable-tremor \
31 --enable-v4l2 --disable-aa --disable-faad \ 30 --enable-v4l2 --disable-aa --disable-faad \
@@ -39,8 +38,9 @@ EXTRA_OECONF = "\
39 ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ 38 ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
40" 39"
41 40
42PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 41PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl', '', d)}"
43PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" 42PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
43PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image "
44PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" 44PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
45PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 45PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
46PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555" 46PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555"