[oe-commits] Sylvain Paré : vlc: rework dependencies
git at git.openembedded.org
git at git.openembedded.org
Tue Dec 20 13:21:28 UTC 2011
Module: meta-openembedded.git
Branch: master
Commit: 5b1dff8b4f52873060b75813eeba864d64a70083
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=5b1dff8b4f52873060b75813eeba864d64a70083
Author: Sylvain Paré <sylvain.pare at gmail.com>
Date: Tue Dec 20 11:01:20 2011 +0000
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 at gmail.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
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 aecfb3a..7353f90 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 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"
More information about the Openembedded-commits
mailing list