From d56f417498e5b582973117479f53eec458ab911b Mon Sep 17 00:00:00 2001 From: Fabien Lahoudere Date: Wed, 13 Sep 2017 22:05:36 +0200 Subject: [PATCH] libupnp: Add recipe for version 1.8.2 This version is needed for gerbera (and possibly vlc), however this version break mpd, so keep old version as libupnp1.6 and use it for mpd until there is new version of mpd supporting 1.8 version. Signed-off-by: Fabien Lahoudere Signed-off-by: Martin Jansa Signed-off-by: Khem Raj --- .../{libupnp => libupnp1.6}/sepbuildfix.patch | 0 ...libupnp_1.6.21.bb => libupnp1.6_1.6.21.bb} | 4 +++- .../libupnp/libupnp_git.bb | 20 +++++++++++++++++++ .../recipes-multimedia/musicpd/mpd_0.19.21.bb | 2 +- 4 files changed, 24 insertions(+), 2 deletions(-) rename meta-multimedia/recipes-connectivity/libupnp/{libupnp => libupnp1.6}/sepbuildfix.patch (100%) rename meta-multimedia/recipes-connectivity/libupnp/{libupnp_1.6.21.bb => libupnp1.6_1.6.21.bb} (88%) create mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch b/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch similarity index 100% rename from meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch rename to meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb b/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb similarity index 88% rename from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb rename to meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb index a1988295ae..c1b0429bdf 100644 --- a/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +++ b/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb @@ -8,11 +8,13 @@ HOMEPAGE = "http://pupnp.sourceforge.net/" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=b3190d5244e08e78e4c8ee78544f4863" -SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/${BP}.tar.bz2 \ +SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/libupnp-${PV}.tar.bz2 \ file://sepbuildfix.patch \ " SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e" SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b" +S = "${WORKDIR}/libupnp-${PV}" + inherit autotools diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb b/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb new file mode 100644 index 0000000000..7a524f2d50 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "Portable SDK for UPnP* Devices" +DESCRIPTION = "The Portable SDK for UPnP Devices is an SDK for development of \ +UPnP device and control point applications. It consists of the core UPnP \ +protocols along with a UPnP-specific eXtensible Markup Language (XML) parser \ +supporting the Document Object Model (DOM) Level 2 API and an optional, \ +integrated mini web server for serving UPnP related documents." +HOMEPAGE = "http://pupnp.sourceforge.net/" +LICENSE = "BSD" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=b3190d5244e08e78e4c8ee78544f4863" + +PV = "1.8.2+git${SRCPV}" +SRCREV = "56d6042abae861e8838a4e6b6b5b575b99e38f34" +SRC_URI = "git://github.com/mrjimenez/pupnp.git;protocol=https" + +S="${WORKDIR}/git" + +inherit autotools + +EXTRA_OECONF += "--enable-reuseaddr" \ No newline at end of file diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb index 77ab5ebcef..2eb21a369e 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb @@ -36,7 +36,7 @@ DEPENDS += " \ dbus \ expat \ zlib \ - libupnp \ + libupnp1.6 \ " # While this item does not require it, it depends on mpg123 which does