diff options
| author | jmbills <42755197+jmbills@users.noreply.github.com> | 2019-10-25 19:18:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-25 19:18:16 +0300 |
| commit | 0dbb60593ebb5a62190c0e6cff7f1770493303a2 (patch) | |
| tree | 0df2ce67404dbca3ddc4ee063dbfd9ae455be682 /meta-openembedded/meta-multimedia/recipes-connectivity/gupnp | |
| parent | 34a3942845ac3264ce27c648ae5486d302c3e6d8 (diff) | |
| parent | cc9cea46d74d280de03c713c8b555153fd811f09 (diff) | |
| download | openbmc-0dbb60593ebb5a62190c0e6cff7f1770493303a2.tar.xz | |
Merge branch 'intel' into intel2
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-connectivity/gupnp')
| -rw-r--r-- | meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc | 20 | ||||
| -rw-r--r-- | meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb | 25 |
2 files changed, 20 insertions, 25 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc deleted file mode 100644 index 23f17eddf..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc +++ /dev/null @@ -1,20 +0,0 @@ -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" - -inherit autotools pkgconfig gobject-introspection vala - -# Copy vapigen.m4 so that it doesn't get removed by vala class -# (normally this would be the right thing to do, but in gssdp the vapigen.m4 has only a custom macro) -do_configure_prepend() { - cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true -} - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}" -PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+" - -PACKAGES =+ "gssdp-tools" - -FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb index b60d1ea44..6088ef195 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb @@ -1,9 +1,24 @@ -require gssdp.inc - -inherit gtk-doc - -PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+3" +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" SRC_URI = "${GNOME_MIRROR}/${BPN}/1.0/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "b30c9a406853c6a3a012d151d6e7ad2c" SRC_URI[sha256sum] = "a1e17c09c7e1a185b0bd84fd6ff3794045a3cd729b707c23e422ff66471535dc" + +inherit autotools pkgconfig gobject-introspection vala gtk-doc + +# Copy vapigen.m4 so that it doesn't get removed by vala class +# (normally this would be the right thing to do, but in gssdp the vapigen.m4 has only a custom macro) +do_configure_prepend() { + cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true +} + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+3" + +PACKAGES =+ "gssdp-tools" + +FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" |