From d56f417498e5b582973117479f53eec458ab911b Mon Sep 17 00:00:00 2001 From: Fabien Lahoudere Date: Wed, 13 Sep 2017 22:05:36 +0200 Subject: 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/libupnp/sepbuildfix.patch | 34 ---------------------- .../libupnp/libupnp1.6/sepbuildfix.patch | 34 ++++++++++++++++++++++ .../libupnp/libupnp1.6_1.6.21.bb | 20 +++++++++++++ .../recipes-connectivity/libupnp/libupnp_1.6.21.bb | 18 ------------ .../recipes-connectivity/libupnp/libupnp_git.bb | 20 +++++++++++++ .../recipes-multimedia/musicpd/mpd_0.19.21.bb | 2 +- 6 files changed, 75 insertions(+), 53 deletions(-) delete mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch create mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch create mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb delete mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb create mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb (limited to 'meta-multimedia') diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch b/meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted file mode 100644 index 0493cea0e0..0000000000 --- a/meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Tue, 9 Jun 2015 12:20:45 -0700 -Subject: [PATCH] Fix builds when using separate source and build directories. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy ---- - configure.ac | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a8731b5..54a3c3d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -744,9 +744,9 @@ AC_OUTPUT - # - # Files copied for windows compilation. - # --echo "configure: copying \"autoconfig.h\" to \"build/inc/autoconfig.h\"" --test -d build/inc || mkdir -p build/inc --cp autoconfig.h build/inc/autoconfig.h --echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"build/inc/upnpconfig.h\"" --cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h -+echo "configure: copying \"autoconfig.h\" to \"\$srcdir/build/inc/autoconfig.h\"" -+test -d $srcdir/build/inc || mkdir -p $srcdir/build/inc -+cp autoconfig.h $srcdir/build/inc/autoconfig.h -+echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"\$srcdir/build/inc/upnpconfig.h\"" -+cp upnp/inc/upnpconfig.h $srcdir/build/inc/upnpconfig.h - --- -1.9.1 - diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch b/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch new file mode 100644 index 0000000000..0493cea0e0 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch @@ -0,0 +1,34 @@ +From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00 2001 +From: Andre McCurdy +Date: Tue, 9 Jun 2015 12:20:45 -0700 +Subject: [PATCH] Fix builds when using separate source and build directories. + +Upstream-Status: Pending + +Signed-off-by: Andre McCurdy +--- + configure.ac | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a8731b5..54a3c3d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -744,9 +744,9 @@ AC_OUTPUT + # + # Files copied for windows compilation. + # +-echo "configure: copying \"autoconfig.h\" to \"build/inc/autoconfig.h\"" +-test -d build/inc || mkdir -p build/inc +-cp autoconfig.h build/inc/autoconfig.h +-echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"build/inc/upnpconfig.h\"" +-cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h ++echo "configure: copying \"autoconfig.h\" to \"\$srcdir/build/inc/autoconfig.h\"" ++test -d $srcdir/build/inc || mkdir -p $srcdir/build/inc ++cp autoconfig.h $srcdir/build/inc/autoconfig.h ++echo "configure: copying \"upnp/inc/upnpconfig.h\" to \"\$srcdir/build/inc/upnpconfig.h\"" ++cp upnp/inc/upnpconfig.h $srcdir/build/inc/upnpconfig.h + +-- +1.9.1 + diff --git a/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb b/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb new file mode 100644 index 0000000000..c1b0429bdf --- /dev/null +++ b/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.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" + +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_1.6.21.bb b/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb deleted file mode 100644 index a1988295ae..0000000000 --- a/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +++ /dev/null @@ -1,18 +0,0 @@ -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" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/${BP}.tar.bz2 \ - file://sepbuildfix.patch \ -" - -SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e" -SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b" - -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 -- cgit 1.2.3-korg