* [PATCH] gst-plugins: fixed pattern for meta package dependencies. @ 2009-05-21 13:21 Ihar Hrachyshka 2009-05-21 14:07 ` Koen Kooi 2009-05-21 15:47 ` Phil Blundell 0 siblings, 2 replies; 13+ messages in thread From: Ihar Hrachyshka @ 2009-05-21 13:21 UTC (permalink / raw) To: openembedded-devel This fixes package name matching so that gst-plugins-*-meta packages include all the plugin ones. The current matching implementation doesn't make meta packages depend on gst-plugins with 'locale' and 'dev' in their names (f.e. gstfbdevsink). Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> --- recipes/gstreamer/gst-plugins.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc index bcb3e39..0156cff 100644 --- a/recipes/gstreamer/gst-plugins.inc +++ b/recipes/gstreamer/gst-plugins.inc @@ -33,7 +33,7 @@ python populate_packages_prepend () { metapkg_rdepends = [] packages = bb.data.getVar('PACKAGES', d, 1).split() for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count('dev') and not pkg.count( 'locale' ): + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-locale'): metapkg_rdepends.append(pkg) bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) -- 1.6.3.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-21 13:21 [PATCH] gst-plugins: fixed pattern for meta package dependencies Ihar Hrachyshka @ 2009-05-21 14:07 ` Koen Kooi 2009-05-21 14:23 ` Otavio Salvador ` (2 more replies) 2009-05-21 15:47 ` Phil Blundell 1 sibling, 3 replies; 13+ messages in thread From: Koen Kooi @ 2009-05-21 14:07 UTC (permalink / raw) To: openembedded-devel On 21-05-09 15:21, Ihar Hrachyshka wrote: > This fixes package name matching so that gst-plugins-*-meta > packages include all the plugin ones. The current matching > implementation doesn't make meta packages depend on gst-plugins > with 'locale' and 'dev' in their names (f.e. gstfbdevsink). This patch looks OK, but you need to bump PR for the affected recipes as well. (Someone will probably mention INC_PR soon ;)) regards, Koen > Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> > --- > recipes/gstreamer/gst-plugins.inc | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc > index bcb3e39..0156cff 100644 > --- a/recipes/gstreamer/gst-plugins.inc > +++ b/recipes/gstreamer/gst-plugins.inc > @@ -33,7 +33,7 @@ python populate_packages_prepend () { > metapkg_rdepends = [] > packages = bb.data.getVar('PACKAGES', d, 1).split() > for pkg in packages[1:]: > - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count('dev') and not pkg.count( 'locale' ): > + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-locale'): > metapkg_rdepends.append(pkg) > bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) > bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-21 14:07 ` Koen Kooi @ 2009-05-21 14:23 ` Otavio Salvador 2009-05-21 14:23 ` Ihar Hrachyshka 2009-05-21 14:50 ` Ihar Hrachyshka 2 siblings, 0 replies; 13+ messages in thread From: Otavio Salvador @ 2009-05-21 14:23 UTC (permalink / raw) To: openembedded-devel; +Cc: openembedded-devel +1 for INC_PR :-) On Thu, May 21, 2009 at 11:07 AM, Koen Kooi <k.kooi@student.utwente.nl> wrote: > On 21-05-09 15:21, Ihar Hrachyshka wrote: >> >> This fixes package name matching so that gst-plugins-*-meta >> packages include all the plugin ones. The current matching >> implementation doesn't make meta packages depend on gst-plugins >> with 'locale' and 'dev' in their names (f.e. gstfbdevsink). > > This patch looks OK, but you need to bump PR for the affected recipes as > well. (Someone will probably mention INC_PR soon ;)) > > regards, > > Koen > >> Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> >> --- >> recipes/gstreamer/gst-plugins.inc | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/recipes/gstreamer/gst-plugins.inc >> b/recipes/gstreamer/gst-plugins.inc >> index bcb3e39..0156cff 100644 >> --- a/recipes/gstreamer/gst-plugins.inc >> +++ b/recipes/gstreamer/gst-plugins.inc >> @@ -33,7 +33,7 @@ python populate_packages_prepend () { >> metapkg_rdepends = [] >> packages = bb.data.getVar('PACKAGES', d, 1).split() >> for pkg in packages[1:]: >> - if not pkg in blacklist and not pkg in metapkg_rdepends >> and not pkg.count('dev') and not pkg.count( 'locale' ): >> + if not pkg in blacklist and not pkg in metapkg_rdepends >> and not pkg.endswith('-dev') and not pkg.endswith('-locale'): >> metapkg_rdepends.append(pkg) >> bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), >> d) >> bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) > > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > -- Otavio Salvador O.S. Systems E-mail: otavio@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-21 14:07 ` Koen Kooi 2009-05-21 14:23 ` Otavio Salvador @ 2009-05-21 14:23 ` Ihar Hrachyshka 2009-05-21 14:50 ` Ihar Hrachyshka 2 siblings, 0 replies; 13+ messages in thread From: Ihar Hrachyshka @ 2009-05-21 14:23 UTC (permalink / raw) To: openembedded-devel On Thu, May 21, 2009 at 5:07 PM, Koen Kooi <k.kooi@student.utwente.nl> wrote: > On 21-05-09 15:21, Ihar Hrachyshka wrote: >> >> This fixes package name matching so that gst-plugins-*-meta >> packages include all the plugin ones. The current matching >> implementation doesn't make meta packages depend on gst-plugins >> with 'locale' and 'dev' in their names (f.e. gstfbdevsink). > > This patch looks OK, but you need to bump PR for the affected recipes as > well. (Someone will probably mention INC_PR soon ;)) Ok, I'll resend it in a while. > > regards, > > Koen > >> Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> >> --- >> recipes/gstreamer/gst-plugins.inc | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/recipes/gstreamer/gst-plugins.inc >> b/recipes/gstreamer/gst-plugins.inc >> index bcb3e39..0156cff 100644 >> --- a/recipes/gstreamer/gst-plugins.inc >> +++ b/recipes/gstreamer/gst-plugins.inc >> @@ -33,7 +33,7 @@ python populate_packages_prepend () { >> metapkg_rdepends = [] >> packages = bb.data.getVar('PACKAGES', d, 1).split() >> for pkg in packages[1:]: >> - if not pkg in blacklist and not pkg in metapkg_rdepends >> and not pkg.count('dev') and not pkg.count( 'locale' ): >> + if not pkg in blacklist and not pkg in metapkg_rdepends >> and not pkg.endswith('-dev') and not pkg.endswith('-locale'): >> metapkg_rdepends.append(pkg) >> bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), >> d) >> bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) > > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-21 14:07 ` Koen Kooi 2009-05-21 14:23 ` Otavio Salvador 2009-05-21 14:23 ` Ihar Hrachyshka @ 2009-05-21 14:50 ` Ihar Hrachyshka 2009-05-21 15:37 ` Ihar Hrachyshka 2 siblings, 1 reply; 13+ messages in thread From: Ihar Hrachyshka @ 2009-05-21 14:50 UTC (permalink / raw) To: openembedded-devel This fixes package name matching so that gst-plugins-*-meta packages include all the plugin ones. The current matching implementation doesn't make meta packages depend on gst-plugins with 'locale' and 'dev' in their names (f.e. gstfbdevsink). Also use INC_PR for gstremer-plugins as requested on ML. Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> --- recipes/gstreamer/gst-plugins-bad_0.10.11.bb | 2 ++ recipes/gstreamer/gst-plugins-bad_0.10.6.bb | 3 ++- recipes/gstreamer/gst-plugins-base_0.10.17.bb | 2 ++ recipes/gstreamer/gst-plugins-base_0.10.22.bb | 2 ++ recipes/gstreamer/gst-plugins-base_0.10.23.bb | 2 ++ recipes/gstreamer/gst-plugins-good_0.10.13.bb | 2 +- recipes/gstreamer/gst-plugins-good_0.10.14.bb | 2 ++ recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb | 3 ++- recipes/gstreamer/gst-plugins-ugly_0.10.10.bb | 2 +- recipes/gstreamer/gst-plugins-ugly_0.10.11.bb | 2 ++ recipes/gstreamer/gst-plugins.inc | 4 +++- 11 files changed, 21 insertions(+), 5 deletions(-) diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb index dbfe6a9..a90b88e 100644 --- a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb +++ b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ file://ivorbis-thumb.patch;patch=1" DEPENDS += "gst-plugins-base directfb" diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb index df7bf75..bfc7217 100644 --- a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb +++ b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb @@ -1,5 +1,6 @@ require gst-plugins.inc -PR = "r2" + +PR = "${INC_PR}.1" SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ file://gst-plugins-directfb-fix.patch;patch=1;pnum=2 \ diff --git a/recipes/gstreamer/gst-plugins-base_0.10.17.bb b/recipes/gstreamer/gst-plugins-base_0.10.17.bb index 0a1f17f..3b07668 100644 --- a/recipes/gstreamer/gst-plugins-base_0.10.17.bb +++ b/recipes/gstreamer/gst-plugins-base_0.10.17.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + PROVIDES += "gst-plugins" # gst-plugins-base only builds the alsa plugin diff --git a/recipes/gstreamer/gst-plugins-base_0.10.22.bb b/recipes/gstreamer/gst-plugins-base_0.10.22.bb index 3086d93..bcbfd68 100644 --- a/recipes/gstreamer/gst-plugins-base_0.10.22.bb +++ b/recipes/gstreamer/gst-plugins-base_0.10.22.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + PROVIDES += "gst-plugins" PR = "r2" diff --git a/recipes/gstreamer/gst-plugins-base_0.10.23.bb b/recipes/gstreamer/gst-plugins-base_0.10.23.bb index d3bfb6c..26dcfe3 100644 --- a/recipes/gstreamer/gst-plugins-base_0.10.23.bb +++ b/recipes/gstreamer/gst-plugins-base_0.10.23.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + PROVIDES += "gst-plugins" # gst-plugins-base only builds the alsa plugin diff --git a/recipes/gstreamer/gst-plugins-good_0.10.13.bb b/recipes/gstreamer/gst-plugins-good_0.10.13.bb index b77d1fc..d077d06 100644 --- a/recipes/gstreamer/gst-plugins-good_0.10.13.bb +++ b/recipes/gstreamer/gst-plugins-good_0.10.13.bb @@ -1,6 +1,6 @@ require gst-plugins.inc -PR = "r1" +PR = "${INC_PR}.1" inherit gconf diff --git a/recipes/gstreamer/gst-plugins-good_0.10.14.bb b/recipes/gstreamer/gst-plugins-good_0.10.14.bb index d9f0349..d077d06 100644 --- a/recipes/gstreamer/gst-plugins-good_0.10.14.bb +++ b/recipes/gstreamer/gst-plugins-good_0.10.14.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + inherit gconf EXTRA_OECONF += " --enable-experimental --enable-gst_v4l2 --enable-gconftool --enable-external --with-check=no" diff --git a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb index 77c4184..40a4eb2 100644 --- a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb +++ b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb @@ -1,7 +1,8 @@ require gst-plugins.inc DEPENDS += "gst-plugins-base libsidplay" PROVIDES += "gst-plugin-sid" -PR = "r5" + +PR = "${INC_PR}.1" SRC_URI = "\ http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.bz2 \ diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb index 0678e22..9c28d20 100644 --- a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb @@ -1,6 +1,6 @@ require gst-plugins.inc -PR = "r1" +PR = "${INC_PR}.1" DEPENDS += "gst-plugins-base mpeg2dec libsidplay" diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb index 0624041..9c28d20 100644 --- a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + DEPENDS += "gst-plugins-base mpeg2dec libsidplay" SRC_URI += "\ diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc index bcb3e39..536555c 100644 --- a/recipes/gstreamer/gst-plugins.inc +++ b/recipes/gstreamer/gst-plugins.inc @@ -3,6 +3,8 @@ DESCRIPTION = "Plugins for GStreamer" DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis" DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" +INC_PR = "r5" + PACKAGES_DYNAMIC = "gst-plugin-*" SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" @@ -33,7 +35,7 @@ python populate_packages_prepend () { metapkg_rdepends = [] packages = bb.data.getVar('PACKAGES', d, 1).split() for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count('dev') and not pkg.count( 'locale' ): + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-locale'): metapkg_rdepends.append(pkg) bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) -- 1.6.3.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-21 14:50 ` Ihar Hrachyshka @ 2009-05-21 15:37 ` Ihar Hrachyshka 2009-05-21 15:44 ` Koen Kooi 2009-05-21 15:44 ` Ihar Hrachyshka 0 siblings, 2 replies; 13+ messages in thread From: Ihar Hrachyshka @ 2009-05-21 15:37 UTC (permalink / raw) To: openembedded-devel I just got that locale packages _don't_ end with 'locale'. Resending reworked patch. On Thu, May 21, 2009 at 5:50 PM, Ihar Hrachyshka <ihar.hrachyshka@gmail.com> wrote: > This fixes package name matching so that gst-plugins-*-meta > packages include all the plugin ones. The current matching > implementation doesn't make meta packages depend on gst-plugins > with 'locale' and 'dev' in their names (f.e. gstfbdevsink). > Also use INC_PR for gstremer-plugins as requested on ML. > > Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> > --- > recipes/gstreamer/gst-plugins-bad_0.10.11.bb | 2 ++ > recipes/gstreamer/gst-plugins-bad_0.10.6.bb | 3 ++- > recipes/gstreamer/gst-plugins-base_0.10.17.bb | 2 ++ > recipes/gstreamer/gst-plugins-base_0.10.22.bb | 2 ++ > recipes/gstreamer/gst-plugins-base_0.10.23.bb | 2 ++ > recipes/gstreamer/gst-plugins-good_0.10.13.bb | 2 +- > recipes/gstreamer/gst-plugins-good_0.10.14.bb | 2 ++ > recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb | 3 ++- > recipes/gstreamer/gst-plugins-ugly_0.10.10.bb | 2 +- > recipes/gstreamer/gst-plugins-ugly_0.10.11.bb | 2 ++ > recipes/gstreamer/gst-plugins.inc | 4 +++- > 11 files changed, 21 insertions(+), 5 deletions(-) > > diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb > index dbfe6a9..a90b88e 100644 > --- a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb > +++ b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb > @@ -1,5 +1,7 @@ > require gst-plugins.inc > > +PR = "${INC_PR}.1" > + > SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ > file://ivorbis-thumb.patch;patch=1" > DEPENDS += "gst-plugins-base directfb" > diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb > index df7bf75..bfc7217 100644 > --- a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb > +++ b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb > @@ -1,5 +1,6 @@ > require gst-plugins.inc > -PR = "r2" > + > +PR = "${INC_PR}.1" > > SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ > file://gst-plugins-directfb-fix.patch;patch=1;pnum=2 \ > diff --git a/recipes/gstreamer/gst-plugins-base_0.10.17.bb b/recipes/gstreamer/gst-plugins-base_0.10.17.bb > index 0a1f17f..3b07668 100644 > --- a/recipes/gstreamer/gst-plugins-base_0.10.17.bb > +++ b/recipes/gstreamer/gst-plugins-base_0.10.17.bb > @@ -1,5 +1,7 @@ > require gst-plugins.inc > > +PR = "${INC_PR}.1" > + > PROVIDES += "gst-plugins" > > # gst-plugins-base only builds the alsa plugin > diff --git a/recipes/gstreamer/gst-plugins-base_0.10.22.bb b/recipes/gstreamer/gst-plugins-base_0.10.22.bb > index 3086d93..bcbfd68 100644 > --- a/recipes/gstreamer/gst-plugins-base_0.10.22.bb > +++ b/recipes/gstreamer/gst-plugins-base_0.10.22.bb > @@ -1,5 +1,7 @@ > require gst-plugins.inc > > +PR = "${INC_PR}.1" > + > PROVIDES += "gst-plugins" > > PR = "r2" > diff --git a/recipes/gstreamer/gst-plugins-base_0.10.23.bb b/recipes/gstreamer/gst-plugins-base_0.10.23.bb > index d3bfb6c..26dcfe3 100644 > --- a/recipes/gstreamer/gst-plugins-base_0.10.23.bb > +++ b/recipes/gstreamer/gst-plugins-base_0.10.23.bb > @@ -1,5 +1,7 @@ > require gst-plugins.inc > > +PR = "${INC_PR}.1" > + > PROVIDES += "gst-plugins" > > # gst-plugins-base only builds the alsa plugin > diff --git a/recipes/gstreamer/gst-plugins-good_0.10.13.bb b/recipes/gstreamer/gst-plugins-good_0.10.13.bb > index b77d1fc..d077d06 100644 > --- a/recipes/gstreamer/gst-plugins-good_0.10.13.bb > +++ b/recipes/gstreamer/gst-plugins-good_0.10.13.bb > @@ -1,6 +1,6 @@ > require gst-plugins.inc > > -PR = "r1" > +PR = "${INC_PR}.1" > > inherit gconf > > diff --git a/recipes/gstreamer/gst-plugins-good_0.10.14.bb b/recipes/gstreamer/gst-plugins-good_0.10.14.bb > index d9f0349..d077d06 100644 > --- a/recipes/gstreamer/gst-plugins-good_0.10.14.bb > +++ b/recipes/gstreamer/gst-plugins-good_0.10.14.bb > @@ -1,5 +1,7 @@ > require gst-plugins.inc > > +PR = "${INC_PR}.1" > + > inherit gconf > > EXTRA_OECONF += " --enable-experimental --enable-gst_v4l2 --enable-gconftool --enable-external --with-check=no" > diff --git a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb > index 77c4184..40a4eb2 100644 > --- a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb > +++ b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb > @@ -1,7 +1,8 @@ > require gst-plugins.inc > DEPENDS += "gst-plugins-base libsidplay" > PROVIDES += "gst-plugin-sid" > -PR = "r5" > + > +PR = "${INC_PR}.1" > > SRC_URI = "\ > http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.bz2 \ > diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb > index 0678e22..9c28d20 100644 > --- a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb > +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb > @@ -1,6 +1,6 @@ > require gst-plugins.inc > > -PR = "r1" > +PR = "${INC_PR}.1" > > DEPENDS += "gst-plugins-base mpeg2dec libsidplay" > > diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb > index 0624041..9c28d20 100644 > --- a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb > +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb > @@ -1,5 +1,7 @@ > require gst-plugins.inc > > +PR = "${INC_PR}.1" > + > DEPENDS += "gst-plugins-base mpeg2dec libsidplay" > > SRC_URI += "\ > diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc > index bcb3e39..536555c 100644 > --- a/recipes/gstreamer/gst-plugins.inc > +++ b/recipes/gstreamer/gst-plugins.inc > @@ -3,6 +3,8 @@ DESCRIPTION = "Plugins for GStreamer" > DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis" > DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" > > +INC_PR = "r5" > + > PACKAGES_DYNAMIC = "gst-plugin-*" > > SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" > @@ -33,7 +35,7 @@ python populate_packages_prepend () { > metapkg_rdepends = [] > packages = bb.data.getVar('PACKAGES', d, 1).split() > for pkg in packages[1:]: > - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count('dev') and not pkg.count( 'locale' ): > + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-locale'): > metapkg_rdepends.append(pkg) > bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) > bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) > -- > 1.6.3.1 > > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-21 15:37 ` Ihar Hrachyshka @ 2009-05-21 15:44 ` Koen Kooi 2009-05-21 16:07 ` Ihar Hrachyshka 2009-05-21 15:44 ` Ihar Hrachyshka 1 sibling, 1 reply; 13+ messages in thread From: Koen Kooi @ 2009-05-21 15:44 UTC (permalink / raw) To: openembedded-devel On 21-05-09 17:37, Ihar Hrachyshka wrote: > I just got that locale packages _don't_ end with 'locale'. Resending > reworked patch. *facepalm* I just realized the same *after* applying the patch. Oops... > > On Thu, May 21, 2009 at 5:50 PM, Ihar Hrachyshka > <ihar.hrachyshka@gmail.com> wrote: >> This fixes package name matching so that gst-plugins-*-meta >> packages include all the plugin ones. The current matching >> implementation doesn't make meta packages depend on gst-plugins >> with 'locale' and 'dev' in their names (f.e. gstfbdevsink). >> Also use INC_PR for gstremer-plugins as requested on ML. >> >> Signed-off-by: Ihar Hrachyshka<ihar.hrachyshka@gmail.com> >> --- >> recipes/gstreamer/gst-plugins-bad_0.10.11.bb | 2 ++ >> recipes/gstreamer/gst-plugins-bad_0.10.6.bb | 3 ++- >> recipes/gstreamer/gst-plugins-base_0.10.17.bb | 2 ++ >> recipes/gstreamer/gst-plugins-base_0.10.22.bb | 2 ++ >> recipes/gstreamer/gst-plugins-base_0.10.23.bb | 2 ++ >> recipes/gstreamer/gst-plugins-good_0.10.13.bb | 2 +- >> recipes/gstreamer/gst-plugins-good_0.10.14.bb | 2 ++ >> recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb | 3 ++- >> recipes/gstreamer/gst-plugins-ugly_0.10.10.bb | 2 +- >> recipes/gstreamer/gst-plugins-ugly_0.10.11.bb | 2 ++ >> recipes/gstreamer/gst-plugins.inc | 4 +++- >> 11 files changed, 21 insertions(+), 5 deletions(-) >> >> diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb >> index dbfe6a9..a90b88e 100644 >> --- a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb >> +++ b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb >> @@ -1,5 +1,7 @@ >> require gst-plugins.inc >> >> +PR = "${INC_PR}.1" >> + >> SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ >> file://ivorbis-thumb.patch;patch=1" >> DEPENDS += "gst-plugins-base directfb" >> diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb >> index df7bf75..bfc7217 100644 >> --- a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb >> +++ b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb >> @@ -1,5 +1,6 @@ >> require gst-plugins.inc >> -PR = "r2" >> + >> +PR = "${INC_PR}.1" >> >> SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ >> file://gst-plugins-directfb-fix.patch;patch=1;pnum=2 \ >> diff --git a/recipes/gstreamer/gst-plugins-base_0.10.17.bb b/recipes/gstreamer/gst-plugins-base_0.10.17.bb >> index 0a1f17f..3b07668 100644 >> --- a/recipes/gstreamer/gst-plugins-base_0.10.17.bb >> +++ b/recipes/gstreamer/gst-plugins-base_0.10.17.bb >> @@ -1,5 +1,7 @@ >> require gst-plugins.inc >> >> +PR = "${INC_PR}.1" >> + >> PROVIDES += "gst-plugins" >> >> # gst-plugins-base only builds the alsa plugin >> diff --git a/recipes/gstreamer/gst-plugins-base_0.10.22.bb b/recipes/gstreamer/gst-plugins-base_0.10.22.bb >> index 3086d93..bcbfd68 100644 >> --- a/recipes/gstreamer/gst-plugins-base_0.10.22.bb >> +++ b/recipes/gstreamer/gst-plugins-base_0.10.22.bb >> @@ -1,5 +1,7 @@ >> require gst-plugins.inc >> >> +PR = "${INC_PR}.1" >> + >> PROVIDES += "gst-plugins" >> >> PR = "r2" >> diff --git a/recipes/gstreamer/gst-plugins-base_0.10.23.bb b/recipes/gstreamer/gst-plugins-base_0.10.23.bb >> index d3bfb6c..26dcfe3 100644 >> --- a/recipes/gstreamer/gst-plugins-base_0.10.23.bb >> +++ b/recipes/gstreamer/gst-plugins-base_0.10.23.bb >> @@ -1,5 +1,7 @@ >> require gst-plugins.inc >> >> +PR = "${INC_PR}.1" >> + >> PROVIDES += "gst-plugins" >> >> # gst-plugins-base only builds the alsa plugin >> diff --git a/recipes/gstreamer/gst-plugins-good_0.10.13.bb b/recipes/gstreamer/gst-plugins-good_0.10.13.bb >> index b77d1fc..d077d06 100644 >> --- a/recipes/gstreamer/gst-plugins-good_0.10.13.bb >> +++ b/recipes/gstreamer/gst-plugins-good_0.10.13.bb >> @@ -1,6 +1,6 @@ >> require gst-plugins.inc >> >> -PR = "r1" >> +PR = "${INC_PR}.1" >> >> inherit gconf >> >> diff --git a/recipes/gstreamer/gst-plugins-good_0.10.14.bb b/recipes/gstreamer/gst-plugins-good_0.10.14.bb >> index d9f0349..d077d06 100644 >> --- a/recipes/gstreamer/gst-plugins-good_0.10.14.bb >> +++ b/recipes/gstreamer/gst-plugins-good_0.10.14.bb >> @@ -1,5 +1,7 @@ >> require gst-plugins.inc >> >> +PR = "${INC_PR}.1" >> + >> inherit gconf >> >> EXTRA_OECONF += " --enable-experimental --enable-gst_v4l2 --enable-gconftool --enable-external --with-check=no" >> diff --git a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb >> index 77c4184..40a4eb2 100644 >> --- a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb >> +++ b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb >> @@ -1,7 +1,8 @@ >> require gst-plugins.inc >> DEPENDS += "gst-plugins-base libsidplay" >> PROVIDES += "gst-plugin-sid" >> -PR = "r5" >> + >> +PR = "${INC_PR}.1" >> >> SRC_URI = "\ >> http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.bz2 \ >> diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb >> index 0678e22..9c28d20 100644 >> --- a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb >> +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb >> @@ -1,6 +1,6 @@ >> require gst-plugins.inc >> >> -PR = "r1" >> +PR = "${INC_PR}.1" >> >> DEPENDS += "gst-plugins-base mpeg2dec libsidplay" >> >> diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb >> index 0624041..9c28d20 100644 >> --- a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb >> +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb >> @@ -1,5 +1,7 @@ >> require gst-plugins.inc >> >> +PR = "${INC_PR}.1" >> + >> DEPENDS += "gst-plugins-base mpeg2dec libsidplay" >> >> SRC_URI += "\ >> diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc >> index bcb3e39..536555c 100644 >> --- a/recipes/gstreamer/gst-plugins.inc >> +++ b/recipes/gstreamer/gst-plugins.inc >> @@ -3,6 +3,8 @@ DESCRIPTION = "Plugins for GStreamer" >> DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis" >> DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" >> >> +INC_PR = "r5" >> + >> PACKAGES_DYNAMIC = "gst-plugin-*" >> >> SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" >> @@ -33,7 +35,7 @@ python populate_packages_prepend () { >> metapkg_rdepends = [] >> packages = bb.data.getVar('PACKAGES', d, 1).split() >> for pkg in packages[1:]: >> - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count('dev') and not pkg.count( 'locale' ): >> + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-locale'): >> metapkg_rdepends.append(pkg) >> bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) >> bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) >> -- >> 1.6.3.1 >> >> > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-21 15:44 ` Koen Kooi @ 2009-05-21 16:07 ` Ihar Hrachyshka 0 siblings, 0 replies; 13+ messages in thread From: Ihar Hrachyshka @ 2009-05-21 16:07 UTC (permalink / raw) To: openembedded-devel On Thu, May 21, 2009 at 6:44 PM, Koen Kooi <k.kooi@student.utwente.nl> wrote: > On 21-05-09 17:37, Ihar Hrachyshka wrote: >> >> I just got that locale packages _don't_ end with 'locale'. Resending >> reworked patch. > > *facepalm* I just realized the same *after* applying the patch. Oops... Just fix it by yourself. > >> >> On Thu, May 21, 2009 at 5:50 PM, Ihar Hrachyshka >> <ihar.hrachyshka@gmail.com> wrote: >>> >>> This fixes package name matching so that gst-plugins-*-meta >>> packages include all the plugin ones. The current matching >>> implementation doesn't make meta packages depend on gst-plugins >>> with 'locale' and 'dev' in their names (f.e. gstfbdevsink). >>> Also use INC_PR for gstremer-plugins as requested on ML. >>> >>> Signed-off-by: Ihar Hrachyshka<ihar.hrachyshka@gmail.com> >>> --- >>> recipes/gstreamer/gst-plugins-bad_0.10.11.bb | 2 ++ >>> recipes/gstreamer/gst-plugins-bad_0.10.6.bb | 3 ++- >>> recipes/gstreamer/gst-plugins-base_0.10.17.bb | 2 ++ >>> recipes/gstreamer/gst-plugins-base_0.10.22.bb | 2 ++ >>> recipes/gstreamer/gst-plugins-base_0.10.23.bb | 2 ++ >>> recipes/gstreamer/gst-plugins-good_0.10.13.bb | 2 +- >>> recipes/gstreamer/gst-plugins-good_0.10.14.bb | 2 ++ >>> recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb | 3 ++- >>> recipes/gstreamer/gst-plugins-ugly_0.10.10.bb | 2 +- >>> recipes/gstreamer/gst-plugins-ugly_0.10.11.bb | 2 ++ >>> recipes/gstreamer/gst-plugins.inc | 4 +++- >>> 11 files changed, 21 insertions(+), 5 deletions(-) >>> >>> diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb >>> b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb >>> index dbfe6a9..a90b88e 100644 >>> --- a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb >>> +++ b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb >>> @@ -1,5 +1,7 @@ >>> require gst-plugins.inc >>> >>> +PR = "${INC_PR}.1" >>> + >>> SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ >>> file://ivorbis-thumb.patch;patch=1" >>> DEPENDS += "gst-plugins-base directfb" >>> diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb >>> b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb >>> index df7bf75..bfc7217 100644 >>> --- a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb >>> +++ b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb >>> @@ -1,5 +1,6 @@ >>> require gst-plugins.inc >>> -PR = "r2" >>> + >>> +PR = "${INC_PR}.1" >>> >>> SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ >>> file://gst-plugins-directfb-fix.patch;patch=1;pnum=2 \ >>> diff --git a/recipes/gstreamer/gst-plugins-base_0.10.17.bb >>> b/recipes/gstreamer/gst-plugins-base_0.10.17.bb >>> index 0a1f17f..3b07668 100644 >>> --- a/recipes/gstreamer/gst-plugins-base_0.10.17.bb >>> +++ b/recipes/gstreamer/gst-plugins-base_0.10.17.bb >>> @@ -1,5 +1,7 @@ >>> require gst-plugins.inc >>> >>> +PR = "${INC_PR}.1" >>> + >>> PROVIDES += "gst-plugins" >>> >>> # gst-plugins-base only builds the alsa plugin >>> diff --git a/recipes/gstreamer/gst-plugins-base_0.10.22.bb >>> b/recipes/gstreamer/gst-plugins-base_0.10.22.bb >>> index 3086d93..bcbfd68 100644 >>> --- a/recipes/gstreamer/gst-plugins-base_0.10.22.bb >>> +++ b/recipes/gstreamer/gst-plugins-base_0.10.22.bb >>> @@ -1,5 +1,7 @@ >>> require gst-plugins.inc >>> >>> +PR = "${INC_PR}.1" >>> + >>> PROVIDES += "gst-plugins" >>> >>> PR = "r2" >>> diff --git a/recipes/gstreamer/gst-plugins-base_0.10.23.bb >>> b/recipes/gstreamer/gst-plugins-base_0.10.23.bb >>> index d3bfb6c..26dcfe3 100644 >>> --- a/recipes/gstreamer/gst-plugins-base_0.10.23.bb >>> +++ b/recipes/gstreamer/gst-plugins-base_0.10.23.bb >>> @@ -1,5 +1,7 @@ >>> require gst-plugins.inc >>> >>> +PR = "${INC_PR}.1" >>> + >>> PROVIDES += "gst-plugins" >>> >>> # gst-plugins-base only builds the alsa plugin >>> diff --git a/recipes/gstreamer/gst-plugins-good_0.10.13.bb >>> b/recipes/gstreamer/gst-plugins-good_0.10.13.bb >>> index b77d1fc..d077d06 100644 >>> --- a/recipes/gstreamer/gst-plugins-good_0.10.13.bb >>> +++ b/recipes/gstreamer/gst-plugins-good_0.10.13.bb >>> @@ -1,6 +1,6 @@ >>> require gst-plugins.inc >>> >>> -PR = "r1" >>> +PR = "${INC_PR}.1" >>> >>> inherit gconf >>> >>> diff --git a/recipes/gstreamer/gst-plugins-good_0.10.14.bb >>> b/recipes/gstreamer/gst-plugins-good_0.10.14.bb >>> index d9f0349..d077d06 100644 >>> --- a/recipes/gstreamer/gst-plugins-good_0.10.14.bb >>> +++ b/recipes/gstreamer/gst-plugins-good_0.10.14.bb >>> @@ -1,5 +1,7 @@ >>> require gst-plugins.inc >>> >>> +PR = "${INC_PR}.1" >>> + >>> inherit gconf >>> >>> EXTRA_OECONF += " --enable-experimental --enable-gst_v4l2 >>> --enable-gconftool --enable-external --with-check=no" >>> diff --git a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb >>> b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb >>> index 77c4184..40a4eb2 100644 >>> --- a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb >>> +++ b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb >>> @@ -1,7 +1,8 @@ >>> require gst-plugins.inc >>> DEPENDS += "gst-plugins-base libsidplay" >>> PROVIDES += "gst-plugin-sid" >>> -PR = "r5" >>> + >>> +PR = "${INC_PR}.1" >>> >>> SRC_URI = "\ >>> >>> http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.bz2 >>> \ >>> diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb >>> b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb >>> index 0678e22..9c28d20 100644 >>> --- a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb >>> +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb >>> @@ -1,6 +1,6 @@ >>> require gst-plugins.inc >>> >>> -PR = "r1" >>> +PR = "${INC_PR}.1" >>> >>> DEPENDS += "gst-plugins-base mpeg2dec libsidplay" >>> >>> diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb >>> b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb >>> index 0624041..9c28d20 100644 >>> --- a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb >>> +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb >>> @@ -1,5 +1,7 @@ >>> require gst-plugins.inc >>> >>> +PR = "${INC_PR}.1" >>> + >>> DEPENDS += "gst-plugins-base mpeg2dec libsidplay" >>> >>> SRC_URI += "\ >>> diff --git a/recipes/gstreamer/gst-plugins.inc >>> b/recipes/gstreamer/gst-plugins.inc >>> index bcb3e39..536555c 100644 >>> --- a/recipes/gstreamer/gst-plugins.inc >>> +++ b/recipes/gstreamer/gst-plugins.inc >>> @@ -3,6 +3,8 @@ DESCRIPTION = "Plugins for GStreamer" >>> DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis" >>> DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad >>> libid3tag', d)}" >>> >>> +INC_PR = "r5" >>> + >>> PACKAGES_DYNAMIC = "gst-plugin-*" >>> >>> SRC_URI = >>> "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" >>> @@ -33,7 +35,7 @@ python populate_packages_prepend () { >>> metapkg_rdepends = [] >>> packages = bb.data.getVar('PACKAGES', d, 1).split() >>> for pkg in packages[1:]: >>> - if not pkg in blacklist and not pkg in metapkg_rdepends >>> and not pkg.count('dev') and not pkg.count( 'locale' ): >>> + if not pkg in blacklist and not pkg in metapkg_rdepends >>> and not pkg.endswith('-dev') and not pkg.endswith('-locale'): >>> metapkg_rdepends.append(pkg) >>> bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), >>> d) >>> bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) >>> -- >>> 1.6.3.1 >>> >>> >> >> _______________________________________________ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > ^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-21 15:37 ` Ihar Hrachyshka 2009-05-21 15:44 ` Koen Kooi @ 2009-05-21 15:44 ` Ihar Hrachyshka 1 sibling, 0 replies; 13+ messages in thread From: Ihar Hrachyshka @ 2009-05-21 15:44 UTC (permalink / raw) To: openembedded-devel This fixes package name matching so that gst-plugins-*-meta packages include all the plugin ones. The current matching implementation doesn't make meta packages depend on gst-plugins with 'locale' and 'dev' in their names (f.e. gstfbdevsink). Also use INC_PR for gstremer-plugins as requested on ML. Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@gmail.com> --- recipes/gstreamer/gst-plugins-bad_0.10.11.bb | 2 ++ recipes/gstreamer/gst-plugins-bad_0.10.6.bb | 3 ++- recipes/gstreamer/gst-plugins-base_0.10.17.bb | 2 ++ recipes/gstreamer/gst-plugins-base_0.10.22.bb | 2 ++ recipes/gstreamer/gst-plugins-base_0.10.23.bb | 2 ++ recipes/gstreamer/gst-plugins-good_0.10.13.bb | 2 +- recipes/gstreamer/gst-plugins-good_0.10.14.bb | 2 ++ recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb | 3 ++- recipes/gstreamer/gst-plugins-ugly_0.10.10.bb | 2 +- recipes/gstreamer/gst-plugins-ugly_0.10.11.bb | 2 ++ recipes/gstreamer/gst-plugins.inc | 4 +++- 11 files changed, 21 insertions(+), 5 deletions(-) diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb index dbfe6a9..a90b88e 100644 --- a/recipes/gstreamer/gst-plugins-bad_0.10.11.bb +++ b/recipes/gstreamer/gst-plugins-bad_0.10.11.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ file://ivorbis-thumb.patch;patch=1" DEPENDS += "gst-plugins-base directfb" diff --git a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb index df7bf75..bfc7217 100644 --- a/recipes/gstreamer/gst-plugins-bad_0.10.6.bb +++ b/recipes/gstreamer/gst-plugins-bad_0.10.6.bb @@ -1,5 +1,6 @@ require gst-plugins.inc -PR = "r2" + +PR = "${INC_PR}.1" SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ file://gst-plugins-directfb-fix.patch;patch=1;pnum=2 \ diff --git a/recipes/gstreamer/gst-plugins-base_0.10.17.bb b/recipes/gstreamer/gst-plugins-base_0.10.17.bb index 0a1f17f..3b07668 100644 --- a/recipes/gstreamer/gst-plugins-base_0.10.17.bb +++ b/recipes/gstreamer/gst-plugins-base_0.10.17.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + PROVIDES += "gst-plugins" # gst-plugins-base only builds the alsa plugin diff --git a/recipes/gstreamer/gst-plugins-base_0.10.22.bb b/recipes/gstreamer/gst-plugins-base_0.10.22.bb index 3086d93..bcbfd68 100644 --- a/recipes/gstreamer/gst-plugins-base_0.10.22.bb +++ b/recipes/gstreamer/gst-plugins-base_0.10.22.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + PROVIDES += "gst-plugins" PR = "r2" diff --git a/recipes/gstreamer/gst-plugins-base_0.10.23.bb b/recipes/gstreamer/gst-plugins-base_0.10.23.bb index d3bfb6c..26dcfe3 100644 --- a/recipes/gstreamer/gst-plugins-base_0.10.23.bb +++ b/recipes/gstreamer/gst-plugins-base_0.10.23.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + PROVIDES += "gst-plugins" # gst-plugins-base only builds the alsa plugin diff --git a/recipes/gstreamer/gst-plugins-good_0.10.13.bb b/recipes/gstreamer/gst-plugins-good_0.10.13.bb index b77d1fc..d077d06 100644 --- a/recipes/gstreamer/gst-plugins-good_0.10.13.bb +++ b/recipes/gstreamer/gst-plugins-good_0.10.13.bb @@ -1,6 +1,6 @@ require gst-plugins.inc -PR = "r1" +PR = "${INC_PR}.1" inherit gconf diff --git a/recipes/gstreamer/gst-plugins-good_0.10.14.bb b/recipes/gstreamer/gst-plugins-good_0.10.14.bb index d9f0349..d077d06 100644 --- a/recipes/gstreamer/gst-plugins-good_0.10.14.bb +++ b/recipes/gstreamer/gst-plugins-good_0.10.14.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + inherit gconf EXTRA_OECONF += " --enable-experimental --enable-gst_v4l2 --enable-gconftool --enable-external --with-check=no" diff --git a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb index 77c4184..40a4eb2 100644 --- a/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb +++ b/recipes/gstreamer/gst-plugins-ugly-sid_0.10.7.bb @@ -1,7 +1,8 @@ require gst-plugins.inc DEPENDS += "gst-plugins-base libsidplay" PROVIDES += "gst-plugin-sid" -PR = "r5" + +PR = "${INC_PR}.1" SRC_URI = "\ http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.bz2 \ diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb index 0678e22..9c28d20 100644 --- a/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.10.bb @@ -1,6 +1,6 @@ require gst-plugins.inc -PR = "r1" +PR = "${INC_PR}.1" DEPENDS += "gst-plugins-base mpeg2dec libsidplay" diff --git a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb index 0624041..9c28d20 100644 --- a/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb +++ b/recipes/gstreamer/gst-plugins-ugly_0.10.11.bb @@ -1,5 +1,7 @@ require gst-plugins.inc +PR = "${INC_PR}.1" + DEPENDS += "gst-plugins-base mpeg2dec libsidplay" SRC_URI += "\ diff --git a/recipes/gstreamer/gst-plugins.inc b/recipes/gstreamer/gst-plugins.inc index bcb3e39..1eb80cb 100644 --- a/recipes/gstreamer/gst-plugins.inc +++ b/recipes/gstreamer/gst-plugins.inc @@ -3,6 +3,8 @@ DESCRIPTION = "Plugins for GStreamer" DEPENDS = "gstreamer libmikmod liboil libogg tremor libvorbis" DEPENDS += "${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}" +INC_PR = "r5" + PACKAGES_DYNAMIC = "gst-plugin-*" SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2" @@ -33,7 +35,7 @@ python populate_packages_prepend () { metapkg_rdepends = [] packages = bb.data.getVar('PACKAGES', d, 1).split() for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count('dev') and not pkg.count( 'locale' ): + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.count('locale'): metapkg_rdepends.append(pkg) bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) -- 1.6.3.1 ^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-21 13:21 [PATCH] gst-plugins: fixed pattern for meta package dependencies Ihar Hrachyshka 2009-05-21 14:07 ` Koen Kooi @ 2009-05-21 15:47 ` Phil Blundell 2009-05-21 15:48 ` Phil Blundell 1 sibling, 1 reply; 13+ messages in thread From: Phil Blundell @ 2009-05-21 15:47 UTC (permalink / raw) To: openembedded-devel > for pkg in packages[1:]: > - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.count('dev') and not pkg.count( 'locale' ): > + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-locale'): > metapkg_rdepends.append(pkg) > bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) > bb.data.setVar('DESCRIPTION_' + metapkg, pn + ' meta package', d) This kind of matching on the package name is a bit unwholesome in general. It would be better to handle these excluded packages by maintaining them in the blacklist at the point where they're actually created, rather than trying to recreate that information again after the fact. For the -dev ones, that's easy: you can just add a hook function that operates on the local blacklist variable. For the locale things it might be slightly more complicated since that logic is in package.bbclass, but I think it should still be relatively straightforward to get it to expose a list of the locale packages that it's generated. p. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-21 15:47 ` Phil Blundell @ 2009-05-21 15:48 ` Phil Blundell 2009-05-24 18:37 ` Ihar Hrachyshka 0 siblings, 1 reply; 13+ messages in thread From: Phil Blundell @ 2009-05-21 15:48 UTC (permalink / raw) To: openembedded-devel On Thu, 2009-05-21 at 16:47 +0100, Phil Blundell wrote: > This kind of matching on the package name is a bit unwholesome in > general. It would be better to handle these excluded packages by > maintaining them in the blacklist at the point where they're actually > created, rather than trying to recreate that information again after the > fact. Or, actually, in this specific case, just maintain a positive list of the plugin packages that you _do_ want the metapackage to depend on, and make it depend on those packages alone rather than starting from ${PACKAGES} and filtering things out. p. ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-21 15:48 ` Phil Blundell @ 2009-05-24 18:37 ` Ihar Hrachyshka 2009-05-24 19:59 ` Phil Blundell 0 siblings, 1 reply; 13+ messages in thread From: Ihar Hrachyshka @ 2009-05-24 18:37 UTC (permalink / raw) To: openembedded-devel On Thu, May 21, 2009 at 6:48 PM, Phil Blundell <pb@reciva.com> wrote: > On Thu, 2009-05-21 at 16:47 +0100, Phil Blundell wrote: >> This kind of matching on the package name is a bit unwholesome in >> general. It would be better to handle these excluded packages by >> maintaining them in the blacklist at the point where they're actually >> created, rather than trying to recreate that information again after the >> fact. > > Or, actually, in this specific case, just maintain a positive list of > the plugin packages that you _do_ want the metapackage to depend on, and > make it depend on those packages alone rather than starting from > ${PACKAGES} and filtering things out. I think -meta package should depend on *all* the plugins. That's what -meta is made for. I think it's not very efficient to test every new gst-plugins-* release if there are any new or obsolete plugins there. > > p. > > > > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > ^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] gst-plugins: fixed pattern for meta package dependencies. 2009-05-24 18:37 ` Ihar Hrachyshka @ 2009-05-24 19:59 ` Phil Blundell 0 siblings, 0 replies; 13+ messages in thread From: Phil Blundell @ 2009-05-24 19:59 UTC (permalink / raw) To: openembedded-devel On Sun, 2009-05-24 at 21:37 +0300, Ihar Hrachyshka wrote: > On Thu, May 21, 2009 at 6:48 PM, Phil Blundell <pb@reciva.com> wrote: > > On Thu, 2009-05-21 at 16:47 +0100, Phil Blundell wrote: > >> This kind of matching on the package name is a bit unwholesome in > >> general. It would be better to handle these excluded packages by > >> maintaining them in the blacklist at the point where they're actually > >> created, rather than trying to recreate that information again after the > >> fact. > > > > Or, actually, in this specific case, just maintain a positive list of > > the plugin packages that you _do_ want the metapackage to depend on, and > > make it depend on those packages alone rather than starting from > > ${PACKAGES} and filtering things out. > > I think -meta package should depend on *all* the plugins. That's what > -meta is made for. I think it's not very efficient to test every new > gst-plugins-* release if there are any new or obsolete plugins there. Yes, indeed, clearly -meta should depend on all the plugins: as you say, that's exactly what it's for. The point I was making was that, rather than starting with ${PACKAGES} (i.e. all the subpackages) and trying to find suitable heuristics to take out the things that aren't plugins, you would be better off just computing a list of packages that _are_ plugins and using that directly. p. ^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2009-05-24 20:07 UTC | newest] Thread overview: 13+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-05-21 13:21 [PATCH] gst-plugins: fixed pattern for meta package dependencies Ihar Hrachyshka 2009-05-21 14:07 ` Koen Kooi 2009-05-21 14:23 ` Otavio Salvador 2009-05-21 14:23 ` Ihar Hrachyshka 2009-05-21 14:50 ` Ihar Hrachyshka 2009-05-21 15:37 ` Ihar Hrachyshka 2009-05-21 15:44 ` Koen Kooi 2009-05-21 16:07 ` Ihar Hrachyshka 2009-05-21 15:44 ` Ihar Hrachyshka 2009-05-21 15:47 ` Phil Blundell 2009-05-21 15:48 ` Phil Blundell 2009-05-24 18:37 ` Ihar Hrachyshka 2009-05-24 19:59 ` Phil Blundell
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.