Patchwork [[meta-oe] ] vlc: re-add dropped depends as they are available now and add libxpm as dependency as current vlc's config depends on it.

login
mail settings
Submitter Sylvain Paré
Date Dec. 19, 2011, 4:28 p.m.
Message ID <1324312094-24426-1-git-send-email-sylvain.pare@gmail.com>
Download mbox | patch
Permalink /patch/17255/
State Superseded
Headers show

Comments

Sylvain Paré - Dec. 19, 2011, 4:28 p.m.
Signed-off-by: Sylvain 'GarthPS' Paré <sylvain.pare@gmail.com>
---
 meta-oe/recipes-multimedia/vlc/vlc.inc |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
Koen Kooi - Dec. 19, 2011, 6:35 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 19-12-11 17:28, Sylvain 'GarthPS' Paré schreef:
> Signed-off-by: Sylvain 'GarthPS' Paré <sylvain.pare@gmail.com> --- 
> meta-oe/recipes-multimedia/vlc/vlc.inc |    5 ++--- 1 files changed, 2
> insertions(+), 3 deletions(-)
> 
> diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc
> b/meta-oe/recipes-multimedia/vlc/vlc.inc index aecfb3a..375e42e 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)}" +
> ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag
> liba52 mpeg2dec', d)}"
> 
> SRC_URI =
> "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
> 
> @@ -13,7 +12,7 @@ inherit autotools gettext
> 
> ARM_INSTRUCTION_SET = "arm"
> 
> -DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1" +DEPENDS +=
> "libdvdcss libdvdread lua5.1-native lua5.1 libxpm"
> 
> LEAD_SONAME = "libvlc.so.5"
> 

Missing PR bump
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7vg+8ACgkQMkyGM64RGpFwmACgsufoFQDWp5Z6G+WUzWBeY8Yo
Z9EAn0JPLjlqRnmiFcH/mGy40iU+JyjR
=I5gy
-----END PGP SIGNATURE-----

Patch

diff --git a/meta-oe/recipes-multimedia/vlc/vlc.inc b/meta-oe/recipes-multimedia/vlc/vlc.inc
index aecfb3a..375e42e 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)}"
+           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
 
 SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
 
@@ -13,7 +12,7 @@  inherit autotools gettext
 
 ARM_INSTRUCTION_SET = "arm"
 
-DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1"
+DEPENDS += "libdvdcss libdvdread lua5.1-native lua5.1 libxpm"
 
 LEAD_SONAME = "libvlc.so.5"