[oe] [PATCH v2][meta-oe] vlc: rework dependencies and removed ENTERPRISE_DISTRO as it should be covered by COMMERCIAL_LICENSE now

[Sylvain 'GarthPS' Paré]

 * re-adds dropped depends as they are available now
 * removes ENTERPRISE_DISTRO as sugested by Martin Jansa
 * and adds libxpm as dependency as current vlc's config depends on it.
 * bumps PR

Signed-off-by: Sylvain 'GarthPS' Paré <sylvain.pare at gmail.com>
---
 meta-oe/recipes-multimedia/vlc/vlc.inc       |    3 +--
 meta-oe/recipes-multimedia/vlc/vlc_1.1.11.bb |    2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc
index aecfb3a..c431f69 100644
--- a/meta-oe/recipes-multimedia/vlc/vlc.inc
+++ b/meta-oe/recipes-multimedia/vlc/vlc.inc
@@ -4,8 +4,7 @@ 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)}"
+           libmad libid3tag liba52 mpeg2dec libxpm"
 
 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 fb69e05..9f53159 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"
 
-- 
1.7.5.4