From 5b1dff8b4f52873060b75813eeba864d64a70083 Mon Sep 17 00:00:00 2001 From: Sylvain Paré Date: Tue, 20 Dec 2011 11:01:20 +0000 Subject: vlc: rework dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * re-adds dropped depends as they are available now * adds libxpm as dependency as current vlc's config depends on it. * bumps PR * NOTE about ENTERPRISE_DISTRO : is that supposed to be still used or should this be replaced by something which respects COMMERCIAL_LICENSE setting ? Signed-off-by: Sylvain 'GarthPS' Paré Signed-off-by: Koen Kooi --- meta-oe/recipes-multimedia/vlc/vlc.inc | 5 ++--- meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc index aecfb3a537..7353f908e6 100644 --- a/meta-oe/recipes-multimedia/vlc/vlc.inc +++ b/meta-oe/recipes-multimedia/vlc/vlc.inc @@ -3,9 +3,8 @@ HOMEPAGE = "http://www.videolan.org" LICENSE = "GPLv2" SECTION = "multimedia" -DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \ -" -# ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" +DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm \ + ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2" diff --git a/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb index fb69e05de5..9f531592ec 100644 --- a/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb +++ b/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb @@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ed7e492ee44e70125a5d42e118354a13" require vlc.inc +PR = "r1" + # work around build failure EXTRA_OECONF += " --enable-libxml2=no" -- cgit v1.2.3-54-g00ecf