summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafaël Carré <funman@videolan.org>2015-11-19 14:14:52 +0100
committerArmin Kuster <akuster808@gmail.com>2015-12-20 14:14:09 -0800
commit3b116d73993563451b4e25a67a9bc199dfa79af3 (patch)
tree787c0b7c852d4735569c1830a8593f8f140cea78
parent677c422dc1c7dcc518a9865cbd70fbc3c16942cc (diff)
downloadmeta-openembedded-3b116d73993563451b4e25a67a9bc199dfa79af3.tar.gz
vlc: remove libdc1394 libraw1394 from DEPENDS
They are only needed if the modules introduced in ea31946 are enabled. Add these modules to default PACKAGECONFIG to keep existing defaults. 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.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 9adcdb107..dd00174de 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -9,7 +9,7 @@ DEPENDS = "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 libxpm libxinerama fluidsynth alsa-lib \
11 libdvdcss libdvdread lua-native lua libidn libnotify gtk+ \ 11 libdvdcss libdvdread lua-native lua libidn libnotify gtk+ \
12 libdc1394 libraw1394 avahi libjpeg-turbo xz libmodplug mpeg2dec \ 12 avahi libjpeg-turbo 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 xcb-util-keysyms"
15 15
@@ -43,7 +43,7 @@ EXTRA_OECONF = "\
43 ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ 43 ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
44" 44"
45 45
46PACKAGECONFIG ?= " live555" 46PACKAGECONFIG ?= " live555 dc1394 dv1394"
47PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" 47PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
48PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" 48PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
49PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 49PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"