summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafaël Carré <funman@videolan.org>2015-11-19 14:14:53 +0100
committerArmin Kuster <akuster808@gmail.com>2015-12-20 14:14:27 -0800
commitc756136910fa4fe15b2b3493ad240d80da3e47d6 (patch)
tree42e7925d110a3f3d71c298ade7ee7ff9b3dded7c
parent3b116d73993563451b4e25a67a9bc199dfa79af3 (diff)
downloadmeta-openembedded-c756136910fa4fe15b2b3493ad240d80da3e47d6.tar.gz
VLC: make libnotify a configurable dependency
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.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index dd00174de..0d0baed12 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
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 libxpm libxinerama fluidsynth alsa-lib \
11 libdvdcss libdvdread lua-native lua libidn libnotify gtk+ \ 11 libdvdcss libdvdread lua-native lua libidn \
12 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"
@@ -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 dc1394 dv1394" 46PACKAGECONFIG ?= " live555 dc1394 dv1394 notify"
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"
@@ -70,6 +70,7 @@ PACKAGECONFIG[dc1394] = "--enable-dc1394,--disable-dc1394,libdc1394"
70PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394" 70PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libraw1394 libavc1394"
71PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg" 71PACKAGECONFIG[svg] = "--enable-svg,--disable-svg,librsvg"
72PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo" 72PACKAGECONFIG[svgdec] = "--enable-svgdec,--disable-svgdec,librsvg cairo"
73PACKAGECONFIG[notify] = "--enable-notify,--disable-notify, libnotify gtk+"
73 74
74do_configure_prepend() { 75do_configure_prepend() {
75 cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true 76 cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true