| Submitter | Ross Burton |
|---|---|
| Date | Sept. 6, 2012, 4:09 p.m. |
| Message ID | <1346947769-12659-1-git-send-email-ross.burton@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/36069/ |
| State | Accepted |
| Commit | 68f320b2c4c6a6e284e6f6f24791a197f3464f36 |
| Headers | show |
Comments
On 09/06/2012 09:09 AM, Ross Burton wrote: > They just need GTK+ not libglade, so fix the depends. > > The recipe also had multple checksums, so remove the old ones. > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb > index f3494e7..b87c755 100644 > --- a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb > +++ b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb > @@ -2,12 +2,14 @@ SUMMARY = "Resource discovery and announcement over SSDP" > DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP (Simpe Service Discovery Protocol)." > LICENSE = "LGPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" > -DEPENDS = "glib-2.0 libsoup-2.4 libglade gobject-introspection-stub" > +DEPENDS = "glib-2.0 libsoup-2.4 gobject-introspection-stub" > + > +PR = "r2" > > SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz" > > -SRC_URI[md5sum] = "725c32e8f92a072cc34f0e091937df2a" > -SRC_URI[sha256sum] = "8eaab799f699836770ec2fcc08abfef2f824a82ae959c6af7b39ffb6968b9fd7" > +SRC_URI[md5sum] = "aec6a56ac1d4f8a4837da83f2d152556" > +SRC_URI[sha256sum] = "94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea" > > inherit autotools pkgconfig > > @@ -17,9 +19,5 @@ FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" > > EXTRA_OECONF = "--disable-introspection" > > -PR = "r1" > - > -SRC_URI[md5sum] = "aec6a56ac1d4f8a4837da83f2d152556" > -SRC_URI[sha256sum] = "94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea" > - > - > +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}" > +PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+" > Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb index f3494e7..b87c755 100644 --- a/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb +++ b/meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb @@ -2,12 +2,14 @@ SUMMARY = "Resource discovery and announcement over SSDP" DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP (Simpe Service Discovery Protocol)." LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -DEPENDS = "glib-2.0 libsoup-2.4 libglade gobject-introspection-stub" +DEPENDS = "glib-2.0 libsoup-2.4 gobject-introspection-stub" + +PR = "r2" SRC_URI = "http://gupnp.org/sites/all/files/sources/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "725c32e8f92a072cc34f0e091937df2a" -SRC_URI[sha256sum] = "8eaab799f699836770ec2fcc08abfef2f824a82ae959c6af7b39ffb6968b9fd7" +SRC_URI[md5sum] = "aec6a56ac1d4f8a4837da83f2d152556" +SRC_URI[sha256sum] = "94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea" inherit autotools pkgconfig @@ -17,9 +19,5 @@ FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" EXTRA_OECONF = "--disable-introspection" -PR = "r1" - -SRC_URI[md5sum] = "aec6a56ac1d4f8a4837da83f2d152556" -SRC_URI[sha256sum] = "94de92bb4f7906ed2f047b0146a3b21d53d09908fe1f0149484f61c6afc598ea" - - +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+"
They just need GTK+ not libglade, so fix the depends. The recipe also had multple checksums, so remove the old ones. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-connectivity/gupnp/gssdp_0.10.0.bb | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)