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

login
register
mail settings
Submitter Sylvain Paré
Date Dec. 20, 2011, 10:32 a.m.
Message ID <1324377146-5691-1-git-send-email-sylvain.pare@gmail.com>
Download mbox | patch
Permalink /patch/17293/
State Superseded
Headers show

Comments

Sylvain Paré - Dec. 20, 2011, 10:32 a.m.
* 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@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(-)
Sylvain Paré - Dec. 20, 2011, 10:39 a.m.
My bad, I did not get the point from Martin Jansa.
I will send a new patch

2011/12/20 Sylvain 'GarthPS' Paré <sylvain.pare@gmail.com>

>  * 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@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.bbb/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
>
>

Patch

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"