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 ?

(From meta-openembedded rev: 5b1dff8b4f52873060b75813eeba864d64a70083)

Signed-off-by: Sylvain 'GarthPS' Paré <sylvain.pare@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc.inc
index aecfb3a..7353f90 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc.inc
+++ b/meta-openembedded/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-openembedded/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb b/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
index fb69e05..9f53159 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb
+++ b/meta-openembedded/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"