libupnp: Bump to version 1.8.2

PATCH In review Fabien Lahoudere 2 participants 8 messages Sep 11, 2017 – Sep 13, 2017

lore

Share & tools

lore

Fabien Lahoudere

author

2017-09-11 12:50 UTC #0 lore raw

PATCH v2 1/1 libupnp: Bump to version 1.8.2

Signed-off-by Fabien Lahoudere <[email protected]>

---
 .../libupnp/libupnp/sepbuildfix.patch              | 34 ----------------------
 .../{libupnp_1.6.21.bb => libupnp_1.8.2.bb}        | 12 ++++----
 2 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch
 rename meta-multimedia/recipes-connectivity/libupnp/{libupnp_1.6.21.bb => libupnp_1.8.2.bb} (66%)

meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 ~~-34~~

deleted file mode 100644
index 0493cea0e..000000000
@@ -1,34 +0,0 @@
-From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-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 <[email protected]>
----
- 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
-

meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +7 -5

similarity index 66%
rename from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb
rename to meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb
index a1988295a..61b209ab8 100644
@@ -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 \
-           file://sepbuildfix.patch \
-"
+SRC_URI = "https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz "
 
-SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e"
-SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b"
+SRC_URI[md5sum] = "db8061f7cbd7f9af993ac4e87ad084cb"
+SRC_URI[sha256sum] = "438ad86bfd933cb1e9be1c41bf3bd69f049daba11d71bbb5d715336e00106cb4"
+
+S="${WORKDIR}/pupnp-release-${PV}"
 
 inherit autotools
+
+EXTRA_OECONF += "--enable-reuseaddr"
\ No newline at end of file

Signature · 1 line

2.11.0

Martin Jansa

2017-09-11 16:51 UTC #1 lore raw

This probably break mpd build:
http://errors.yoctoproject.org/Errors/Details/155531/

Quoted 98 lines · Fabien Lahoudere

Signed-off-by Fabien Lahoudere <[email protected]>
---
 .../libupnp/libupnp/sepbuildfix.patch              | 34
----------------------
 .../{libupnp_1.6.21.bb => libupnp_1.8.2.bb}        | 12 ++++----
 2 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp/
sepbuildfix.patch
 rename meta-multimedia/recipes-connectivity/libupnp/{libupnp_1.6.21.bb
=> libupnp_1.8.2.bb} (66%)
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -1
deleted file mode 100644
index 0493cea0e..000000000
--- a/meta-multimedia/recipes-connectivity/libupnp/libupnp/
sepbuildfix.patch
+++ /dev/null
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -4
@@ -1,34 +0,0 @@
-From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-Date: Tue, 9 Jun 2015 12:20:45 -0700
-Subject: [PATCH] Fix builds when using separate source and build
directories.
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 ~~-17~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Andre McCurdy <[email protected]>
----
- 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
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -4
-
---
-1.9.1
-
(quoted diff) +0 -0
1.6.21.bb b/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb similarity index 66%
rename from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb rename to meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb index a1988295a..61b209ab8 100644
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +1 -3
@@ -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 \
-           file://sepbuildfix.patch \
-"
+SRC_URI = "https://github.com/mrjimenez/pupnp/archive/release-${PV}.
tar.gz "
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +0 -2
-SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e"
-SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2bd
a427567e2a1fb4559bf73ccff0a4f9a39b"
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +2 -0
+SRC_URI[md5sum] = "db8061f7cbd7f9af993ac4e87ad084cb"
+SRC_URI[sha256sum] = "438ad86bfd933cb1e9be1c41bf3bd6
9f049daba11d71bbb5d715336e00106cb4"
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +4 -1
+
+S="${WORKDIR}/pupnp-release-${PV}"
 
 inherit autotools
+
+EXTRA_OECONF += "--enable-reuseaddr"
\ No newline at end of file
--
2.11.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Please fix this ASAP, because I've already merged gerbera recipe (tested together with this libupnp change), but now with libupnp upgrade dropped from master-next because of this issue gerbera fails as well in master due to old upnp:

-- Found UPnP:
gerbera/1.0+gitAUTOINC+4435b165d1-r0/recipe-sysroot/usr/lib/libupnp.so (found version "1.6.21")
CMake Error at CMakeLists.txt:380 (message):
gerbera requires libupnp 1.8.0 or above.

Quoted 107 lines · Martin Jansa

This probably break mpd build:
http://errors.yoctoproject.org/Errors/Details/155531/
Quoted 99 lines · Fabien Lahoudere
Signed-off-by Fabien Lahoudere <[email protected]>
---
 .../libupnp/libupnp/sepbuildfix.patch              | 34
----------------------
 .../{libupnp_1.6.21.bb => libupnp_1.8.2.bb}        | 12 ++++----
 2 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 meta-multimedia/recipes-connec
tivity/libupnp/libupnp/sepbuildfix.patch
 rename meta-multimedia/recipes-connectivity/libupnp/{libupnp_1.6.21.bb
=> libupnp_1.8.2.bb} (66%)
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -1
deleted file mode 100644
index 0493cea0e..000000000
--- a/meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbu
ildfix.patch
+++ /dev/null
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -4
@@ -1,34 +0,0 @@
-From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-Date: Tue, 9 Jun 2015 12:20:45 -0700
-Subject: [PATCH] Fix builds when using separate source and build
directories.
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 ~~-17~~
-
-Upstream-Status: Pending
-
-Signed-off-by: Andre McCurdy <[email protected]>
----
- 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
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -4
-
---
-1.9.1
-
(quoted diff) +0 -0
21.bb b/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb similarity index 66%
rename from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21. bb
rename to meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb index a1988295a..61b209ab8 100644
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +1 -3
@@ -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 \
-           file://sepbuildfix.patch \
-"
+SRC_URI = "https://github.com/mrjimenez/pupnp/archive/release-${PV}.ta
r.gz "
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +0 -2
-SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e"
-SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2b
da427567e2a1fb4559bf73ccff0a4f9a39b"
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +2 -0
+SRC_URI[md5sum] = "db8061f7cbd7f9af993ac4e87ad084cb"
+SRC_URI[sha256sum] = "438ad86bfd933cb1e9be1c41bf3bd
69f049daba11d71bbb5d715336e00106cb4"
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +4 -1
+
+S="${WORKDIR}/pupnp-release-${PV}"
 
 inherit autotools
+
+EXTRA_OECONF += "--enable-reuseaddr"
\ No newline at end of file
--
2.11.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Martin Jansa

2017-09-13 14:21 UTC #3 lore raw

PATCH 1/1 Revert "gerbera: Add recipe"

* depends on newer libupnp which wasn't merged yet, because it breaks mpd

This reverts commit e890ecb1d2bb4f2d23f4d5cc7e40e0b1806da984.

---
 .../gerbera/files/gerbera.service                  | 13 ---------
 .../recipes-multimedia/gerbera/gerbera_git.bb      | 34 ----------------------
 2 files changed, 47 deletions(-)
 delete mode 100644 meta-multimedia/recipes-multimedia/gerbera/files/gerbera.service
 delete mode 100644 meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb

meta-multimedia/recipes-multimedia/gerbera/files/gerbera.service deleted +0 ~~-13~~

deleted file mode 100644
index 1b5a3ad3e..000000000
@@ -1,13 +0,0 @@
-[Unit]
-Description=Start Gerbera, an UPnP media server
-After=multi-user.target network-online.target
-Wants=network-online.target
-
-[Service]
-ExecStart=/usr/bin/gerbera
-Environment='HOME=/root'
-Type=simple
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file

meta-multimedia/recipes-multimedia/gerbera/gerbera_git.bb deleted +0 ~~-34~~

deleted file mode 100644
index 2bbedc0d1..000000000
@@ -1,34 +0,0 @@
-Description = "Gerbera - An UPnP media server"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8"
-
-SRC_URI = "git://github.com/v00d00/gerbera.git;protocol=https \
-	   file://gerbera.service "
-
-
-# Modify these as desired
-PV = "1.0+git${SRCPV}"
-SRCREV = "4435b165d121195aefd67d0287f7f9349e181d45"
-
-S = "${WORKDIR}/git"
-
-DEPENDS = "expat zlib curl libupnp e2fsprogs sqlite3 taglib "
-RDEPENDS_${PN} = "expat zlib curl libupnp e2fsprogs taglib "
-
-SYSTEMD_SERVICE_${PN} = "gerbera.service"
-SYSTEMD_AUTO_ENABLE = "enable"
-
-inherit cmake systemd
-
-EXTRA_OECMAKE = "-DWITH_JS=FALSE -DWITH_TAGLIB=FALSE -DWITH_MAGIC=FALSE -DWITH_EXIF=FALSE -DLIBUUID_INCLUDE_DIRS=${WORKDIR}/recipe-sysroot/usr/include -DLIBUUID_LIBRARIES=-luuid"
-
-do_install_append() {
-	install -d ${D}/root/.config/
-	install -d ${D}${systemd_system_unitdir}
-        install -m 0644 ${WORKDIR}/gerbera.service ${D}${systemd_system_unitdir}/
-}
-
-FILES_${PN} += " /root/.config/ \
-	         ${systemd_system_unitdir}/* \
-"
\ No newline at end of file

Signature · 1 line

2.14.1

Fabien Lahoudere

author

2017-09-13 14:24 UTC #4 lore raw

In reply to Martin Jansa

Ok I will try to update mpd now and see if it help.

Quoted 106 lines · Martin Jansa

Please fix this ASAP, because I've already merged gerbera recipe (tested together with this libupnp change), but now with libupnp upgrade dropped from master-next because of this issue gerbera fails as well in master due to old upnp:
-- Found UPnP: gerbera/1.0+gitAUTOINC+4435b165d1-r0/recipe-sysroot/usr/lib/libupnp.so (found version "1.6.21")
CMake Error at CMakeLists.txt:380 (message):
gerbera requires libupnp 1.8.0 or above.
Quoted 93 lines · Martin Jansa
This probably break mpd build:
http://errors.yoctoproject.org/Errors/Details/155531/
Quoted 87 lines · Fabien Lahoudere
Signed-off-by Fabien Lahoudere <[email protected]>
---
.../libupnp/libupnp/sepbuildfix.patch | 34 ---------------------- .../{libupnp_1.6.21.bb => libupnp_1.8.2.bb} | 12 ++++----
 2 files changed, 7 insertions(+), 39 deletions(-)
delete mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch rename meta-multimedia/recipes-connectivity/libupnp/{libupnp_1.6.21.bb => libupnp_1.8.2.bb} (66%)
meta- renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch +0 -0
multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted file mode 100644
index 0493cea0e..000000000
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 ~~-34~~
@@ -1,34 +0,0 @@
-From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-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 <[email protected]>
----
- 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
-
meta- renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +0 -0
multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb similarity index 66%
rename from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb rename to meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb index a1988295a..61b209ab8 100644
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +0 -0
@@ -8,11 +8,13 @@ HOMEPAGE = "http://pupnp.sourceforge.net/"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b3190d5244e08e78e4c8ee78544f4863"
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +5 -5
-SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/${BP}.tar.bz2 \
-           file://sepbuildfix.patch \
-"
+SRC_URI = "https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz "
 
-SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e"
-SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b"
+SRC_URI[md5sum] = "db8061f7cbd7f9af993ac4e87ad084cb"
+SRC_URI[sha256sum] = "438ad86bfd933cb1e9be1c41bf3bd69f049daba11d71bbb5d715336e00106cb4"
+
+S="${WORKDIR}/pupnp-release-${PV}"
inherit autotools
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +2 -1
+
+EXTRA_OECONF += "--enable-reuseaddr"
\ No newline at end of file
--
2.11.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Fabien Lahoudere

author

2017-09-13 15:09 UTC #5 lore raw

In reply to Martin Jansa

It seems libupnp breaks its API and mpd doesn't support it yet (I also test last release 0.20.10).

I will revert libupnp deletion and rename the one for gerbera support libupnp-1.8. Is that solution acceptable?

Quoted 106 lines · Martin Jansa

Please fix this ASAP, because I've already merged gerbera recipe (tested together with this libupnp change), but now with libupnp upgrade dropped from master-next because of this issue gerbera fails as well in master due to old upnp:
-- Found UPnP: gerbera/1.0+gitAUTOINC+4435b165d1-r0/recipe-sysroot/usr/lib/libupnp.so (found version "1.6.21")
CMake Error at CMakeLists.txt:380 (message):
gerbera requires libupnp 1.8.0 or above.
Quoted 93 lines · Martin Jansa
This probably break mpd build:
http://errors.yoctoproject.org/Errors/Details/155531/
Quoted 87 lines · Fabien Lahoudere
Signed-off-by Fabien Lahoudere <[email protected]>
---
.../libupnp/libupnp/sepbuildfix.patch | 34 ---------------------- .../{libupnp_1.6.21.bb => libupnp_1.8.2.bb} | 12 ++++----
 2 files changed, 7 insertions(+), 39 deletions(-)
delete mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch rename meta-multimedia/recipes-connectivity/libupnp/{libupnp_1.6.21.bb => libupnp_1.8.2.bb} (66%)
meta- renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch +0 -0
multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted file mode 100644
index 0493cea0e..000000000
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 ~~-34~~
@@ -1,34 +0,0 @@
-From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-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 <[email protected]>
----
- 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
-
meta- renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +0 -0
multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb similarity index 66%
rename from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb rename to meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb index a1988295a..61b209ab8 100644
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +0 -0
@@ -8,11 +8,13 @@ HOMEPAGE = "http://pupnp.sourceforge.net/"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b3190d5244e08e78e4c8ee78544f4863"
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +5 -5
-SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/${BP}.tar.bz2 \
-           file://sepbuildfix.patch \
-"
+SRC_URI = "https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz "
 
-SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e"
-SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b"
+SRC_URI[md5sum] = "db8061f7cbd7f9af993ac4e87ad084cb"
+SRC_URI[sha256sum] = "438ad86bfd933cb1e9be1c41bf3bd69f049daba11d71bbb5d715336e00106cb4"
+
+S="${WORKDIR}/pupnp-release-${PV}"
inherit autotools
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +2 -1
+
+EXTRA_OECONF += "--enable-reuseaddr"
\ No newline at end of file
--
2.11.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Martin Jansa

2017-09-13 15:31 UTC #6 lore raw

Only if both versions can be installed in parallel otherwise it will still fail for either gerbera or mpd.

Quoted 138 lines · Fabien Lahoudere

It seems libupnp breaks its API and mpd doesn't support it yet (I also test last release 0.20.10).
I will revert libupnp deletion and rename the one for gerbera support libupnp-1.8.
Is that solution acceptable?
Quoted 1 line · Martin Jansa
Please fix this ASAP, because I've already merged gerbera recipe (tested
together with this
Quoted 1 line
libupnp change), but now with libupnp upgrade dropped from master-next
because of this issue
Quoted 3 lines
gerbera fails as well in master due to old upnp:
-- Found UPnP: gerbera/1.0+gitAUTOINC+4435b165d1-r0/recipe-sysroot/usr/lib/libupnp.so
(found
Quoted 6 lines
version "1.6.21")
CMake Error at CMakeLists.txt:380 (message):
gerbera requires libupnp 1.8.0 or above.
On Mon, Sep 11, 2017 at 6:51 PM, Martin Jansa <[email protected]>
Quoted 4 lines · wrote:
Quoted 4 lines
This probably break mpd build:
http://errors.yoctoproject.org/Errors/Details/155531/
On Mon, Sep 11, 2017 at 2:50 PM, Fabien Lahoudere <
Quoted 3 lines · [email protected]> wrote:
Quoted 3 lines
Quoted 3 lines
Signed-off-by Fabien Lahoudere <[email protected]>
---
 .../libupnp/libupnp/sepbuildfix.patch              | 34
----------------------
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
 .../{libupnp_1.6.21.bb => libupnp_1.8.2.bb}        | 12 ++++----
 2 files changed, 7 insertions(+), 39 deletions(-)
 delete mode 100644 meta-multimedia/recipes-
connectivity/libupnp/libupnp/sepbuildfix.patch
Quoted 1 line
Quoted 1 line
Quoted 1 line
 rename meta-multimedia/recipes-connectivity/libupnp/{libupnp_
1.6.21.bb => libupnp_1.8.2.bb}
Quoted 3 lines
Quoted 3 lines
Review
Quoted 3 lines
(66%)
(quoted diff) +0 -0
b/meta-
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted file mode 100644
index 0493cea0e..000000000
--- a/meta-multimedia/recipes-connectivity/libupnp/libupnp/
sepbuildfix.patch
Quoted 3 lines
Quoted 3 lines
Review line 1
Quoted 3 lines
+++ /dev/null
(quoted diff) +0 -1
@@ -1,34 +0,0 @@
-From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00
2001
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch
Quoted 3 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -3
-From: Andre McCurdy <[email protected]>
-Date: Tue, 9 Jun 2015 12:20:45 -0700
-Subject: [PATCH] Fix builds when using separate source and build
directories.
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -9
-
-Upstream-Status: Pending
-
-Signed-off-by: Andre McCurdy <[email protected]>
----
- configure.ac           | 10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
Quoted 8 lines
Quoted 8 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch
Quoted 8 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -8
-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\""
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch
Quoted 3 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -3
--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\""
Quoted 2 lines
Quoted 2 lines
Review line 26
Quoted 2 lines
(quoted diff) +0 -2
--cp upnp/inc/upnpconfig.h build/inc/upnpconfig.h
-+echo "configure: copying \"autoconfig.h\"          to
\"\$srcdir/build/inc/autoconfig.h\""
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch
Quoted 3 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -3
-+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\""
Quoted 6 lines
Quoted 6 lines
Review
Quoted 6 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -5
-+cp upnp/inc/upnpconfig.h $srcdir/build/inc/upnpconfig.h
-
---
-1.9.1
-
(quoted diff) +0 -0
1.6.21.bb b/meta-
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb similarity index 66%
rename from meta-multimedia/recipes-connectivity/libupnp/libupnp_
1.6.21.bb
Quoted 1 line
Quoted 1 line
Quoted 1 line
rename to meta-multimedia/recipes-connectivity/libupnp/libupnp_
1.8.2.bb
Quoted 6 lines
Quoted 6 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb HOMEPAGE = "http://pupnp.sourceforge.net/" · line 9
Quoted 6 lines
index a1988295a..61b209ab8 100644
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +0 -0
@@ -8,11 +8,13 @@ HOMEPAGE = "http://pupnp.sourceforge.net/"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=
b3190d5244e08e78e4c8ee78544f4863"
Quoted 5 lines
Quoted 5 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb HOMEPAGE = "http://pupnp.sourceforge.net/"
Quoted 5 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +1 -3
-SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/${BP}.tar.bz2 \
-           file://sepbuildfix.patch \
-"
+SRC_URI = "https://github.com/mrjimenez/
pupnp/archive/release-${PV}.tar.gz "
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb HOMEPAGE = "http://pupnp.sourceforge.net/" · line 14
Quoted 3 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +0 -2
-SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e"
-SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2bd
a427567e2a1fb4559bf73ccff0a4f9a39b"
Quoted 2 lines
Quoted 2 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb HOMEPAGE = "http://pupnp.sourceforge.net/" · line 12
Quoted 2 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +2 -0
+SRC_URI[md5sum] = "db8061f7cbd7f9af993ac4e87ad084cb"
+SRC_URI[sha256sum] = "438ad86bfd933cb1e9be1c41bf3bd6
9f049daba11d71bbb5d715336e00106cb4"
Quoted 20 lines
Quoted 18 lines
Quoted 16 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +4 -1
+
+S="${WORKDIR}/pupnp-release-${PV}"
 
 inherit autotools
+
+EXTRA_OECONF += "--enable-reuseaddr"
\ No newline at end of file
--
2.11.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Fabien Lahoudere

author

2017-09-13 16:00 UTC #7 lore raw

I send "[meta-multimedia][PATCH v3 0/2] Add libupnp1.8 recipe" that allow to build mpd and gerbera here.

Quoted 124 lines · Martin Jansa

Only if both versions can be installed in parallel otherwise it will still fail for either gerbera or mpd.
Quoted 118 lines · Fabien Lahoudere
It seems libupnp breaks its API and mpd doesn't support it yet (I also test last release 0.20.10).
I will revert libupnp deletion and rename the one for gerbera support libupnp-1.8. Is that solution acceptable?
Quoted 4 lines · Martin Jansa
Please fix this ASAP, because I've already merged gerbera recipe (tested together with this libupnp change), but now with libupnp upgrade dropped from master-next because of this issue gerbera fails as well in master due to old upnp:
Quoted 18 lines
-- Found UPnP: gerbera/1.0+gitAUTOINC+4435b165d1-r0/recipe-sysroot/usr/lib/libupnp.so (found version "1.6.21")
CMake Error at CMakeLists.txt:380 (message):
gerbera requires libupnp 1.8.0 or above.
Quoted 11 lines · Martin Jansa
This probably break mpd build:
http://errors.yoctoproject.org/Errors/Details/155531/
Quoted 7 lines · Fabien Lahoudere
Signed-off-by Fabien Lahoudere <[email protected]>
---
.../libupnp/libupnp/sepbuildfix.patch | 34 ---------------------- .../{libupnp_1.6.21.bb => libupnp_1.8.2.bb} | 12 ++++----
 2 files changed, 7 insertions(+), 39 deletions(-)
delete mode 100644 meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch rename meta-multimedia/recipes-connectivity/libupnp/{libupnp_1.6.21.bb =>
libupnp_1.8.2.bb}
Quoted 3 lines
Quoted 3 lines
Review
Quoted 3 lines
(66%)
(quoted diff) +0 -0
b/meta-
Quoted 24 lines
Quoted 24 lines
Quoted 24 lines
multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted file mode 100644
index 0493cea0e..000000000
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 ~~-18~~
@@ -1,34 +0,0 @@
-From e198f0a87660a048164ca0e16d18517d0aee846e Mon Sep 17 00:00:00 2001
-From: Andre McCurdy <[email protected]>
-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 <[email protected]>
----
- 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
- #
Quoted 8 lines
Quoted 8 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch
Quoted 8 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -8
- # 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\""
Quoted 3 lines
Quoted 3 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch
Quoted 3 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -3
-+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\""
Quoted 46 lines
Quoted 44 lines
Quoted 42 lines
meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch deleted +0 -5
-+cp upnp/inc/upnpconfig.h $srcdir/build/inc/upnpconfig.h
-
---
-1.9.1
-
meta- renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +0 -0
multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb similarity index 66%
rename from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb rename to meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb index a1988295a..61b209ab8 100644
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +0 -0
@@ -8,11 +8,13 @@ HOMEPAGE = "http://pupnp.sourceforge.net/"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=b3190d5244e08e78e4c8ee78544f4863"
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +5 -5
-SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/${BP}.tar.bz2 \
-           file://sepbuildfix.patch \
-"
+SRC_URI = "https://github.com/mrjimenez/pupnp/archive/release-${PV}.tar.gz "
 
-SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e"
-SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b"
+SRC_URI[md5sum] = "db8061f7cbd7f9af993ac4e87ad084cb"
+SRC_URI[sha256sum] = "438ad86bfd933cb1e9be1c41bf3bd69f049daba11d71bbb5d715336e00106cb4"
+
+S="${WORKDIR}/pupnp-release-${PV}"
inherit autotools
meta-multimedia/recipes-connectivity/libupnp/libupnp_1.8.2.bb renamed from meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.21.bb +2 -1
+
+EXTRA_OECONF += "--enable-reuseaddr"
\ No newline at end of file
--
2.11.0
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel