| Submitter | Ross Burton |
|---|---|
| Date | Dec. 21, 2012, 1:43 p.m. |
| Message ID | <1356097422-11920-1-git-send-email-ross.burton@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/41457/ |
| State | Accepted, archived |
| Commit | a74e3eb4e13c19ec5f51fef0dad11a82f912389f |
| Headers | show |
Comments
On Friday 21 December 2012 13:43:37 Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@intel.com>
Why both versions?
Cheers,
Paul
On 23 December 2012 19:44, Paul Eggleton <paul.eggleton@linux.intel.com> wrote: > On Friday 21 December 2012 13:43:37 Ross Burton wrote: >> Signed-off-by: Ross Burton <ross.burton@intel.com> > > Why both versions? GUPnP uses the GNOME-style stable/development even/odd versioning so there's value in having both. Specifically, dLeyna requires the current development releases as that's where several critical bug fixes have landed (ideally those fixes would be pushed to the stable series, but I'm not in a position to suggest that anymore). Ross
On Thursday 03 January 2013 10:26:35 Burton, Ross wrote: > On 23 December 2012 19:44, Paul Eggleton <paul.eggleton@linux.intel.com> wrote: > > On Friday 21 December 2012 13:43:37 Ross Burton wrote: > >> Signed-off-by: Ross Burton <ross.burton@intel.com> > > > > Why both versions? > > GUPnP uses the GNOME-style stable/development even/odd versioning so > there's value in having both. Specifically, dLeyna requires the > current development releases as that's where several critical bug > fixes have landed (ideally those fixes would be pushed to the stable > series, but I'm not in a position to suggest that anymore). OK, I would definitely recommend noting that in the commit message in that case. Cheers, Paul
Patch
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc b/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc new file mode 100644 index 0000000..ae965b9 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp.inc @@ -0,0 +1,18 @@ +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 gobject-introspection-stub" + +inherit autotools pkgconfig + +require no-vala.inc + +EXTRA_OECONF = "--disable-introspection" + +PACKAGECONFIG ??= "${@base_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-multimedia/recipes-connectivity/gupnp/gssdp_0.12.2.1.bb b/meta-multimedia/recipes-connectivity/gupnp/gssdp_0.12.2.1.bb new file mode 100644 index 0000000..29cc721 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp_0.12.2.1.bb @@ -0,0 +1,5 @@ +require gssdp.inc + +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.12/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "8ac3a544ef0dcf8caaf7c249d2a50dc2" +SRC_URI[sha256sum] = "928aa257815d044fdbfc740f5799530d41897947b5d7854173f636b36d728414" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp_0.13.2.bb b/meta-multimedia/recipes-connectivity/gupnp/gssdp_0.13.2.bb new file mode 100644 index 0000000..c308fa0 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp_0.13.2.bb @@ -0,0 +1,8 @@ +require gssdp.inc + +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.13/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "758ed423cdd258a9a22d59c321b535ed" +SRC_URI[sha256sum] = "8f663f8a72b66254f5c20a3610ff853ac8d00bf6f253828e37e51579caa34dce" + +# This is a development release so don't prefer it +DEFAULT_PREFERENCE = "-1" diff --git a/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc b/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc new file mode 100644 index 0000000..a4f3fb6 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/no-vala.inc @@ -0,0 +1,5 @@ +do_configure_prepend () { + # Vala needs gobject-introspection so won't work. Instead of depending + # on vala-native just to run configure, comment out the Vala macro. + sed -i -e 's/\(^[ \t]*VALA_PROG_VAPIGEN\)/dnl \1/g' ${S}/configure.ac +}
Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta-multimedia/recipes-connectivity/gupnp/gssdp.inc | 18 ++++++++++++++++++ .../recipes-connectivity/gupnp/gssdp_0.12.2.1.bb | 5 +++++ .../recipes-connectivity/gupnp/gssdp_0.13.2.bb | 8 ++++++++ .../recipes-connectivity/gupnp/no-vala.inc | 5 +++++ 4 files changed, 36 insertions(+) create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gssdp.inc create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gssdp_0.12.2.1.bb create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gssdp_0.13.2.bb create mode 100644 meta-multimedia/recipes-connectivity/gupnp/no-vala.inc