* [PATCH v2][meta-oe] vlc: rework dependencies and removed ENTERPRISE_DISTRO as it should be covered by COMMERCIAL_LICENSE now
@ 2011-12-20 10:32 Sylvain 'GarthPS' Paré
2011-12-20 10:39 ` Sylvain Paré
0 siblings, 1 reply; 2+ messages in thread
From: Sylvain 'GarthPS' Paré @ 2011-12-20 10:32 UTC (permalink / raw)
To: openembedded-devel
* 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.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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2][meta-oe] vlc: rework dependencies and removed ENTERPRISE_DISTRO as it should be covered by COMMERCIAL_LICENSE now
2011-12-20 10:32 [PATCH v2][meta-oe] vlc: rework dependencies and removed ENTERPRISE_DISTRO as it should be covered by COMMERCIAL_LICENSE now Sylvain 'GarthPS' Paré
@ 2011-12-20 10:39 ` Sylvain Paré
0 siblings, 0 replies; 2+ messages in thread
From: Sylvain Paré @ 2011-12-20 10:39 UTC (permalink / raw)
To: openembedded-devel
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
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-12-20 10:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-20 10:32 [PATCH v2][meta-oe] vlc: rework dependencies and removed ENTERPRISE_DISTRO as it should be covered by COMMERCIAL_LICENSE now Sylvain 'GarthPS' Paré
2011-12-20 10:39 ` Sylvain Paré
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.