vlc: rework dependencies

* 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é <sylvain.pare@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Sylvain Paré 2011-12-20 11:01:20 +00:00 committed by Koen Kooi
parent 6235a37941
commit 5b1dff8b4f
2 changed files with 4 additions and 3 deletions

View File

@ -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"

View File

@ -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"