diff options
| author | Sylvain Paré <sylvain.pare@gmail.com> | 2011-12-20 11:01:20 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-12-20 14:15:07 +0100 |
| commit | 5b1dff8b4f52873060b75813eeba864d64a70083 (patch) | |
| tree | a82b5546a08b3fd87c33d8ef7af180986aadb1c8 /meta-oe/recipes-multimedia | |
| parent | 6235a379418feb0a24bd33de8cc125b435099f69 (diff) | |
| download | meta-openembedded-5b1dff8b4f52873060b75813eeba864d64a70083.tar.gz | |
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>
Diffstat (limited to 'meta-oe/recipes-multimedia')
| -rw-r--r-- | meta-oe/recipes-multimedia/vlc/vlc.inc | 5 | ||||
| -rw-r--r-- | 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 aecfb3a53..7353f908e 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" | |||
| 3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
| 4 | SECTION = "multimedia" | 4 | SECTION = "multimedia" |
| 5 | 5 | ||
| 6 | DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac \ | 6 | DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm \ |
| 7 | " | 7 | ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" |
| 8 | # ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" | ||
| 9 | 8 | ||
| 10 | SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2" | 9 | SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2" |
| 11 | 10 | ||
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 fb69e05de..9f531592e 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" | |||
| 5 | 5 | ||
| 6 | require vlc.inc | 6 | require vlc.inc |
| 7 | 7 | ||
| 8 | PR = "r1" | ||
| 9 | |||
| 8 | # work around build failure | 10 | # work around build failure |
| 9 | EXTRA_OECONF += " --enable-libxml2=no" | 11 | EXTRA_OECONF += " --enable-libxml2=no" |
| 10 | 12 | ||