Patchwork [v3,meta-oe] vlc: rework dependencies

login
register
mail settings
Submitter Sylvain Paré
Date Dec. 20, 2011, 11:01 a.m.
Message ID <1324378880-6009-1-git-send-email-sylvain.pare@gmail.com>
Download mbox | patch
Permalink /patch/17295/
State Accepted
Commit 5b1dff8b4f52873060b75813eeba864d64a70083
Headers show

Comments

Sylvain Paré - Dec. 20, 2011, 11:01 a.m.
* 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>
---
 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(-)
Koen Kooi - Dec. 20, 2011, 1:14 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 20-12-11 12:01, Sylvain 'GarthPS' Paré schreef:
> * 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 ?

ENTERPRISE_DISTRO tries to guard against these things:

1) patent problems (e.g. GPLv3 patent clause)
2) 'security' (e.g. GPLv3 Tivo clause)
3) royalties for codecs (e.g. MPEG-LA)

Sometimes you get big parts of 3 included in the silicon price,so I'm not
sure how usefull it is to put only MPEG-LA things in ENTERPRISE_DISTRO,
maybe we need a different variable for that.

regards,

Koen

> 
> Signed-off-by: Sylvain 'GarthPS' Paré <sylvain.pare@gmail.com> --- 
> 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"
> 

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

iEYEARECAAYFAk7wikIACgkQMkyGM64RGpGs2wCgjvwnSaMyqYyPvVfX729PhKFl
EQUAoI1GgigRW8YbPItLcG0irfcQLGpU
=eiUh
-----END PGP SIGNATURE-----
Sylvain Paré - Dec. 20, 2011, 4:44 p.m.
I am not skilled for further discution about that.
But does my patch is ok otherwise ?

2011/12/20 Koen Kooi <koen@dominion.thruhere.net>

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 20-12-11 12:01, Sylvain 'GarthPS' Paré schreef:
> > * 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 ?
>
> ENTERPRISE_DISTRO tries to guard against these things:
>
> 1) patent problems (e.g. GPLv3 patent clause)
> 2) 'security' (e.g. GPLv3 Tivo clause)
> 3) royalties for codecs (e.g. MPEG-LA)
>
> Sometimes you get big parts of 3 included in the silicon price,so I'm not
> sure how usefull it is to put only MPEG-LA things in ENTERPRISE_DISTRO,
> maybe we need a different variable for that.
>
> regards,
>
> Koen
>
> >
> > Signed-off-by: Sylvain 'GarthPS' Paré <sylvain.pare@gmail.com> ---
> > 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"
> >
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iEYEARECAAYFAk7wikIACgkQMkyGM64RGpGs2wCgjvwnSaMyqYyPvVfX729PhKFl
> EQUAoI1GgigRW8YbPItLcG0irfcQLGpU
> =eiUh
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
Sylvain Paré - Dec. 20, 2011, 4:48 p.m.
sorry I checked at the wrong place..
thank you for applying.
Regards,
Sylvain

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

> I am not skilled for further discution about that.
> But does my patch is ok otherwise ?
>
>
> 2011/12/20 Koen Kooi <koen@dominion.thruhere.net>
>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Op 20-12-11 12:01, Sylvain 'GarthPS' Paré schreef:
>> > * 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 ?
>>
>> ENTERPRISE_DISTRO tries to guard against these things:
>>
>> 1) patent problems (e.g. GPLv3 patent clause)
>> 2) 'security' (e.g. GPLv3 Tivo clause)
>> 3) royalties for codecs (e.g. MPEG-LA)
>>
>> Sometimes you get big parts of 3 included in the silicon price,so I'm not
>> sure how usefull it is to put only MPEG-LA things in ENTERPRISE_DISTRO,
>> maybe we need a different variable for that.
>>
>> regards,
>>
>> Koen
>>
>> >
>> > Signed-off-by: Sylvain 'GarthPS' Paré <sylvain.pare@gmail.com> ---
>> > 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"
>> >
>>
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1.4.11 (Darwin)
>> Comment: GPGTools - http://gpgtools.org
>>
>> iEYEARECAAYFAk7wikIACgkQMkyGM64RGpGs2wCgjvwnSaMyqYyPvVfX729PhKFl
>> EQUAoI1GgigRW8YbPItLcG0irfcQLGpU
>> =eiUh
>> -----END PGP SIGNATURE-----
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>>
>
>

Patch

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"