diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-multimedia/recipes-connectivity')
16 files changed, 178 insertions, 220 deletions
diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch new file mode 100644 index 0000000000..9bfc31b8eb --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch @@ -0,0 +1,102 @@ +OE-Core's vala class known one type of vapigen.m4 and deletes it since its +not cross compile friendly, but this is a different case here where its not +same vapigen.m4 just name is same and it tends to inherit vala bbclass so +save it + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Index: gupnp-dlna-0.10.5/m4/vapigen-custom.m4 +=================================================================== +--- /dev/null ++++ gupnp-dlna-0.10.5/m4/vapigen-custom.m4 +@@ -0,0 +1,43 @@ ++ ++dnl vala.m4 ++dnl ++dnl Copyright 2010 Marc-Andre Lureau ++dnl Copyright 2011 Rodney Dawes <dobey.pwns@gmail.com> ++dnl ++dnl This library is free software; you can redistribute it and/or ++dnl modify it under the terms of the GNU Lesser General Public ++dnl License as published by the Free Software Foundation; either ++dnl version 2.1 of the License, or (at your option) any later version. ++dnl ++dnl This library is distributed in the hope that it will be useful, ++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of ++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++dnl Lesser General Public License for more details. ++dnl ++dnl You should have received a copy of the GNU Lesser General Public ++dnl License along with this library; if not, write to the Free Software ++dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ ++dnl dropped everything but VALA_PROG_VAPIGEN - Jens Georg <mail@jensge.org> ++ ++# Check whether the Vala API Generator exists in `PATH'. If it is found, ++# the variable VAPIGEN is set. Optionally a minimum release number of the ++# generator can be requested. ++# ++# VALA_PROG_VAPIGEN([MINIMUM-VERSION]) ++# ------------------------------------ ++AC_DEFUN([GUPNP_PROG_VAPIGEN], ++[AC_PATH_PROG([VAPIGEN], [vapigen], []) ++ AS_IF([test -z "$VAPIGEN"], ++ [AC_MSG_WARN([No Vala API Generator found. You will not be able to generate .vapi files.])], ++ [AS_IF([test -n "$1"], ++ [AC_MSG_CHECKING([$VAPIGEN is at least version $1]) ++ am__vapigen_version=`$VAPIGEN --version | sed 's/Vala API Generator *//'` ++ AS_VERSION_COMPARE([$1], ["$am__vapigen_version"], ++ [AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([no]) ++ AC_MSG_WARN([Vala API Generator $1 not found.]) ++ VAPIGEN="" ++ ])])]) ++]) +Index: gupnp-dlna-0.10.5/m4/vapigen.m4 +=================================================================== +--- gupnp-dlna-0.10.5.orig/m4/vapigen.m4 ++++ /dev/null +@@ -1,43 +0,0 @@ +- +-dnl vala.m4 +-dnl +-dnl Copyright 2010 Marc-Andre Lureau +-dnl Copyright 2011 Rodney Dawes <dobey.pwns@gmail.com> +-dnl +-dnl This library is free software; you can redistribute it and/or +-dnl modify it under the terms of the GNU Lesser General Public +-dnl License as published by the Free Software Foundation; either +-dnl version 2.1 of the License, or (at your option) any later version. +-dnl +-dnl This library is distributed in the hope that it will be useful, +-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-dnl Lesser General Public License for more details. +-dnl +-dnl You should have received a copy of the GNU Lesser General Public +-dnl License along with this library; if not, write to the Free Software +-dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +- +-dnl dropped everything but VALA_PROG_VAPIGEN - Jens Georg <mail@jensge.org> +- +-# Check whether the Vala API Generator exists in `PATH'. If it is found, +-# the variable VAPIGEN is set. Optionally a minimum release number of the +-# generator can be requested. +-# +-# VALA_PROG_VAPIGEN([MINIMUM-VERSION]) +-# ------------------------------------ +-AC_DEFUN([GUPNP_PROG_VAPIGEN], +-[AC_PATH_PROG([VAPIGEN], [vapigen], []) +- AS_IF([test -z "$VAPIGEN"], +- [AC_MSG_WARN([No Vala API Generator found. You will not be able to generate .vapi files.])], +- [AS_IF([test -n "$1"], +- [AC_MSG_CHECKING([$VAPIGEN is at least version $1]) +- am__vapigen_version=`$VAPIGEN --version | sed 's/Vala API Generator *//'` +- AS_VERSION_COMPARE([$1], ["$am__vapigen_version"], +- [AC_MSG_RESULT([yes])], +- [AC_MSG_RESULT([yes])], +- [AC_MSG_RESULT([no]) +- AC_MSG_WARN([Vala API Generator $1 not found.]) +- VAPIGEN="" +- ])])]) +-]) diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_0.14.8.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_0.14.8.bb deleted file mode 100644 index 9457abc5c2..0000000000 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_0.14.8.bb +++ /dev/null @@ -1,9 +0,0 @@ -require gssdp.inc - -inherit gtk-doc - -PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+3" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/0.14/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "b8658e480d047caf2d92baa4a51b9ae7" -SRC_URI[sha256sum] = "4c3ffa01435e84dc31c954e669e1ca0749b962f76a333e74f5c2cb0de5803a13" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb new file mode 100644 index 0000000000..b60d1ea447 --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb @@ -0,0 +1,9 @@ +require gssdp.inc + +inherit gtk-doc + +PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+3" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.0/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "b30c9a406853c6a3a012d151d6e7ad2c" +SRC_URI[sha256sum] = "a1e17c09c7e1a185b0bd84fd6ff3794045a3cd729b707c23e422ff66471535dc" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.6.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb index b8cfa27d4a..cfd0227e47 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.6.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb @@ -1,8 +1,7 @@ require gupnp-av.inc SRC_URI = "${GNOME_MIRROR}/${BPN}/0.12/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "f56cdb269376a9e6cb062eb9960ccf57" -SRC_URI[sha256sum] = "e0553d60dd7c7277c65c02a68a270c4dcb9036a4c7075c902fc8111c6a5e6a44" - +SRC_URI[md5sum] = "215f626508d76b767f5da7c9b92e87d8" +SRC_URI[sha256sum] = "8038ef84dddbe7ad91c205bf91dddf684f072df8623f39b6555a6bb72837b85a" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://libgupnp-av/gupnp-av.h;beginline=1;endline=22;md5=2b47b7b5f799d2ebabe62b895e848820" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb index 053604e120..3cafd69764 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.9.4.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb @@ -5,9 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ DEPENDS = "libxml2 glib-2.0" -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.9/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "f93665e535a512e4d515a86311435cb6" -SRC_URI[sha256sum] = "69969713f36c0e815fbbbcfdfb3ad9bd447cfd10d0fd86227d82dfd8edb6c807" +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz \ + file://move_vapigen.patch \ +" +SRC_URI[md5sum] = "2d0dc1e4189d0243ac3838ece1e8fea0" +SRC_URI[sha256sum] = "123e368227c11d5c17fc1aa76cbdaffa345355eb51d172cd39fc74a5b468ff6a" inherit autotools pkgconfig gobject-introspection vala diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb index 440e8262da..0aa594dc78 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.2.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb @@ -6,11 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ DEPENDS = "glib-2.0 gupnp sqlite3" SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "f881323304185c02634034e3bda714ba" -SRC_URI[sha256sum] = "73b6a98a0f13b29b34c3bfc07f99f78b1319211cb95a8585752873af2b9067d3" +SRC_URI[md5sum] = "124371136b5a7b1056a3681780a62772" +SRC_URI[sha256sum] = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44" inherit autotools pkgconfig gtk-doc gobject-introspection EXTRA_OECONF = "--disable-python" - -PNBLACKLIST[gupnp-igd] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130645/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.10.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb index ba7f8257f7..9360d65b5e 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.10.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb @@ -6,9 +6,6 @@ DEPENDS = "gupnp gupnp-av gtk+3 intltool-native" RRECOMMENDS_${PN} = "adwaita-icon-theme" SRC_URI = "http://download.gnome.org/sources/${BPN}/0.8/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "ad8423d036e98bc6f877528d6b846f6a" -SRC_URI[sha256sum] = "592c53289ff1cd70e676405c56ca87b28d2da37a385d34a3bb9b944ba9108d17" - -inherit autotools pkgconfig - -PNBLACKLIST[gupnp-tools] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130670/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" +SRC_URI[md5sum] = "212d85ebce89b32468b59e1164050d40" +SRC_URI[sha256sum] = "aa3decb9d532c0e2e505adc592f431fd81c0231ded2981129e87da13712479ed" +inherit autotools pkgconfig gettext diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_0.20.14.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_0.20.14.bb deleted file mode 100644 index ed07175932..0000000000 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_0.20.14.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gupnp.inc - -SRC_URI = "${GNOME_MIRROR}/${BPN}/0.20/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "63346ef90ac5cd925c3a941f51d8bca6" -SRC_URI[sha256sum] = "77ffb940ba77c4a6426d09d41004c75d92652dcbde86c84ac1c847dbd9ad59bd" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb new file mode 100644 index 0000000000..1bdf7d79bc --- /dev/null +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb @@ -0,0 +1,8 @@ +require gupnp.inc + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.0/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "afd96fe73856b38aaf1baf7526e08edd" +SRC_URI[sha256sum] = "5173fda779111c6b01cd4a5e41b594322be9d04f8c74d3361f0a0c2069c77610" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/CVE-2016-8863.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/CVE-2016-8863.patch deleted file mode 100644 index abb4a72a41..0000000000 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/CVE-2016-8863.patch +++ /dev/null @@ -1,57 +0,0 @@ -libupnp-1.6.19: Fix CVE-2016-8863 - -[No upstream tracking] -- https://bugzilla.redhat.com/show_bug.cgi?id=1388771 - -gena_device: Fix out-of-bound access in create_url_list() - -If there is an invalid URL in URLS->buf after a valid one, uri_parse is -called with out pointing after the allocated memory. As uri_parse writes -to *out before returning an error the loop in create_url_list must be -stopped early to prevent an out-of-bound access - -Upstream-Status: Backported [https://sourceforge.net/p/pupnp/code/ci/9c099c2923ab4d98530ab5204af1738be5bddba7] -CVE: CVE-2016-8863 -Signed-off-by: Andrej Valek <andrej.valek@siemens.com> -Signed-off-by: Pascal Bach <pascal.bach@siemens.com> - -diff --git a/upnp/src/gena/gena_device.c b/upnp/src/gena/gena_device.c -index 39edc0b..0fd60ad 100644 ---- a/upnp/src/gena/gena_device.c -+++ b/upnp/src/gena/gena_device.c -@@ -1133,7 +1133,7 @@ static int create_url_list( - /*! [out] . */ - URL_list *out) - { -- size_t URLcount = 0; -+ size_t URLcount = 0, URLcount2 = 0; - size_t i; - int return_code = 0; - uri_type temp; -@@ -1175,16 +1175,23 @@ static int create_url_list( - } - memcpy( out->URLs, URLS->buff, URLS->size ); - out->URLs[URLS->size] = 0; -- URLcount = 0; - for( i = 0; i < URLS->size; i++ ) { - if( ( URLS->buff[i] == '<' ) && ( i + 1 < URLS->size ) ) { - if( ( ( return_code = - parse_uri( &out->URLs[i + 1], URLS->size - i + 1, -- &out->parsedURLs[URLcount] ) ) == -+ &out->parsedURLs[URLcount2] ) ) == - HTTP_SUCCESS ) -- && ( out->parsedURLs[URLcount].hostport.text.size != -+ && ( out->parsedURLs[URLcount2].hostport.text.size != - 0 ) ) { -- URLcount++; -+ URLcount2++; -+ if (URLcount2 >= URLcount) -+ /* -+ * break early here in case there is a bogus URL that -+ * was skipped above. This prevents to access -+ * out->parsedURLs[URLcount] which is beyond the -+ * allocation. -+ */ -+ break; - } else { - if( return_code == UPNP_E_OUTOF_MEMORY ) { - free( out->URLs ); diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/avoid-redefining-strnlen-and-strndup.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/avoid-redefining-strnlen-and-strndup.patch deleted file mode 100644 index 3c3f230a34..0000000000 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/avoid-redefining-strnlen-and-strndup.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 22fba4f2765f92cd592a58e1fe5c450b187e30e1 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy <armccurdy@gmail.com> -Date: Wed, 3 Jun 2015 21:39:03 -0700 -Subject: [PATCH] avoid redefining strnlen() and strndup() - -Rely on string.h definitions instead. Workaround for compiler errors such as: - - | i686-rdk-linux-libtool: compile: i686-rdk-linux-gcc -m32 -march=atom -mtune=atom -fschedule-insns -fsched-pressure -msse3 -mfpmath=sse --sysroot=/home/andre/build/tmp/sysroots/7401 -DHAVE_CONFIG_H -I. -I/home/andre/build/tmp/work/core2-32-rdk-linux/libupnp/1.6.19-r0/libupnp-1.6.19/upnp -I.. -I../upnp/inc -I/home/andre/build/tmp/work/core2-32-rdk-linux/libupnp/1.6.19-r0/libupnp-1.6.19/upnp/inc -I/home/andre/build/tmp/work/core2-32-rdk-linux/libupnp/1.6.19-r0/libupnp-1.6.19/threadutil/inc -I/home/andre/build/tmp/work/core2-32-rdk-linux/libupnp/1.6.19-r0/libupnp-1.6.19/ixml/inc -I/home/andre/build/tmp/work/core2-32-rdk-linux/libupnp/1.6.19-r0/libupnp-1.6.19/upnp/src/inc -pthread -O2 -pipe -g -feliminate-unused-debug-types -Os -Wall -c /home/andre/build/tmp/work/core2-32-rdk-linux/libupnp/1.6.19-r0/libupnp-1.6.19/upnp/src/gena/gena_callback2.c -o src/gena/libupnp_la-gena_callback2.o >/dev/null 2>&1 - | In file included from /home/andre/build/tmp/sysroots/7401/usr/include/string.h:634:0, - | from /home/andre/build/tmp/work/core2-32-rdk-linux/libupnp/1.6.19-r0/libupnp-1.6.19/upnp/src/api/UpnpString.c:23: - | /home/andre/build/tmp/work/core2-32-rdk-linux/libupnp/1.6.19-r0/libupnp-1.6.19/upnp/src/api/UpnpString.c:47:15: error: expected identifier or '(' before '__extension__' - | extern char *strndup(__const char *__string, size_t __n); - | ^ - | make[3]: *** [src/api/libupnp_la-UpnpString.lo] Error 1 - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> ---- - upnp/src/api/UpnpString.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/upnp/src/api/UpnpString.c b/upnp/src/api/UpnpString.c -index 41c9898..2fa09d7 100644 ---- a/upnp/src/api/UpnpString.c -+++ b/upnp/src/api/UpnpString.c -@@ -32,7 +32,7 @@ - /* VC has strnlen which is already included but with (potentially) different linkage */ - /* strnlen() is a GNU extension. */ - #if HAVE_STRNLEN -- extern size_t strnlen(const char *s, size_t maxlen); -+// extern size_t strnlen(const char *s, size_t maxlen); - #else /* HAVE_STRNLEN */ - static size_t strnlen(const char *s, size_t n) - { -@@ -44,7 +44,7 @@ - - /* strndup() is a GNU extension. */ - #if HAVE_STRNDUP && !defined(WIN32) -- extern char *strndup(__const char *__string, size_t __n); -+// extern char *strndup(__const char *__string, size_t __n); - #else /* HAVE_STRNDUP && !defined(WIN32) */ - static char *strndup(const char *__string, size_t __n) - { --- -1.9.1 - diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch index cd9768d542..0493cea0e0 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp/sepbuildfix.patch +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6/sepbuildfix.patch @@ -7,54 +7,28 @@ Upstream-Status: Pending Signed-off-by: Andre McCurdy <armccurdy@gmail.com> --- - configure.ac | 8 ++++---- - ixml/Makefile.am | 2 +- - threadutil/Makefile.am | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) + configure.ac | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac -index e2c3f47..11d5e22 100644 +index a8731b5..54a3c3d 100644 --- a/configure.ac +++ b/configure.ac -@@ -714,8 +714,8 @@ AC_OUTPUT +@@ -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 -diff --git a/ixml/Makefile.am b/ixml/Makefile.am -index 49da766..0e9ab2c 100644 ---- a/ixml/Makefile.am -+++ b/ixml/Makefile.am -@@ -7,7 +7,7 @@ - - SUBDIRS = doc - --AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc -+AM_CPPFLAGS = -I$(top_srcdir)/upnp/inc -I$(srcdir)/inc -I$(srcdir)/src/inc - AM_CFLAGS = - - LDADD = libixml.la -diff --git a/threadutil/Makefile.am b/threadutil/Makefile.am -index a4ed325..42d0726 100644 ---- a/threadutil/Makefile.am -+++ b/threadutil/Makefile.am -@@ -4,7 +4,7 @@ - # (C) Copyright 2005 Remi Turboult <r3mi@users.sourceforge.net> - # - --AM_CPPFLAGS = -I$(srcdir)/inc -I$(srcdir)/src/inc -+AM_CPPFLAGS = -I$(top_srcdir)/upnp/inc -I$(srcdir)/inc -I$(srcdir)/src/inc - - if ENABLE_DEBUG - AM_CPPFLAGS += -DDEBUG -DSTATS -- 1.9.1 diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.19.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb index 71fc70dd19..c1b0429bdf 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_1.6.19.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp1.6_1.6.21.bb @@ -8,13 +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://avoid-redefining-strnlen-and-strndup.patch \ +SRC_URI = "${SOURCEFORGE_MIRROR}/pupnp/libupnp-${PV}.tar.bz2 \ file://sepbuildfix.patch \ - file://CVE-2016-8863.patch \ " -SRC_URI[md5sum] = "ee16e5d33a3ea7506f38d71facc057dd" -SRC_URI[sha256sum] = "b3142b39601243b50532eec90f4a27dba85eb86f58d4b849ac94edeb29d9b22a" +SRC_URI[md5sum] = "513adadb07fa039a8aeb0ceb7b7b0f6e" +SRC_URI[sha256sum] = "af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b" + +S = "${WORKDIR}/libupnp-${PV}" inherit autotools diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/libupnp/libupnp_git.bb new file mode 100644 index 0000000000..7a524f2d50 --- /dev/null +++ b/import-layers/meta-openembedded/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/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb deleted file mode 100644 index bb361a1582..0000000000 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/miniupnpd/miniupnpd_2.0.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "Lightweight UPnP IGD daemon" -DESCRIPTION = "The miniUPnP daemon is an UPnP IGD (internet gateway device) \ -which provide NAT traversal services to any UPnP enabled client on \ -the network." - -SECTION = "networking" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=aa71c78c373ccfe0ff207af0cd966d91" - -inherit autotools gettext pkgconfig - -DEPENDS += "iptables net-tools util-linux libmnl libnetfilter-conntrack" - -SRC_URI = "http://miniupnp.tuxfamily.org/files/download.php?file=${P}.tar.gz \ -" -SRC_URI[md5sum] = "1c07a215dd9b362e75a9efc05e2fb3b4" -SRC_URI[sha256sum] = "d96aa3a00e0f5490826bba3cb97e68cd27479e5839adac4b9bcb66eae786bfb7" - -IPV6 = "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', '--ipv6', '', d)}" - -do_compile() { - cd ${S} - CONFIG_OPTIONS="${IPV6} --leasefile" ./genconfig.sh - oe_runmake -f Makefile.linux -} - -do_install() { - install -d ${D}/${sbindir} - install ${S}/miniupnpd ${D}/${sbindir} - install -d ${D}/${sysconfdir}/${BPN} - install ${S}/netfilter/iptables_init.sh ${D}/${sysconfdir}/${BPN} - install ${S}/netfilter/iptables_removeall.sh ${D}/${sysconfdir}/${BPN} - install ${S}/netfilter/ip6tables_init.sh ${D}/${sysconfdir}/${BPN} - install ${S}/netfilter/ip6tables_removeall.sh ${D}/${sysconfdir}/${BPN} - install -m 0644 -b ${S}/miniupnpd.conf ${D}/${sysconfdir}/${BPN} - install -d ${D}/${sysconfdir}/init.d - install ${S}/linux/miniupnpd.init.d.script ${D}/${sysconfdir}/init.d/miniupnpd -} diff --git a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb index 38fac65d5e..d2eda6bf95 100644 --- a/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.28.2.bb +++ b/import-layers/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.34.0.bb @@ -5,26 +5,27 @@ Additionally, media player software may use Rygel to become a MediaRenderer \ that may be controlled remotely by a UPnP or DLNA Controller." HOMEPAGE = "http://live.gnome.org/Rygel" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://src/rygel/rygel-main.vala;endline=27;md5=99324118da4c012d25edae2f779ae9b3" +LICENSE = "LGPL1.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libxml2 glib-2.0 gssdp gupnp gupnp-av gupnp-dlna gstreamer1.0 gstreamer1.0-plugins-base ossp-uuid libgee libsoup-2.4 libmediaart-2.0 libunistring sqlite3 intltool-native" RDEPENDS_${PN} = "gstreamer1.0-plugins-base-playback shared-mime-info" RRECOMMENDS_${PN} = "rygel-plugin-media-export" GNOME_COMPRESS_TYPE = "xz" -SRC_URI[archive.md5sum] = "9fbe4fb53b6cfa2f3f3723b7649a2215" -SRC_URI[archive.sha256sum] = "9ea23df7186caac5f1aad3137edf6d507d339b9a469fc3133df4043fa66b61f5" +SRC_URI[archive.md5sum] = "7d8923324b280cd5452803d61176a34a" +SRC_URI[archive.sha256sum] = "fbb2d46cbe4e750df6610b4c66b2278f06d1f71a257c7903e676ccb394dad418" -inherit gnomebase vala gobject-introspection +inherit gnomebase vala gobject-introspection gettext systemd EXTRA_OECONF = "--disable-tracker-plugin --with-media-engine=gstreamer" -PACKAGECONFIG ?= "external mpris mediathek ruih media-export gst-launch gtk+3" +PACKAGECONFIG ?= "external mpris ruih media-export gst-launch" + +PACKAGECONFIG_append = "${@bb.utils.contains("DISTRO_FEATURES", "x11", " gtk+3", "", d)}" + PACKAGECONFIG[external] = "--enable-external-plugin,--disable-external-plugin" PACKAGECONFIG[mpris] = "--enable-mpris-plugin,--disable-mpris-plugin" -PACKAGECONFIG[mediathek] = "--enable-mediathek-plugin,--disable-mediathek-plugin" PACKAGECONFIG[ruih] = "--enable-ruih-plugin,--disable-ruih-plugin" PACKAGECONFIG[media-export] = "--enable-media-export-plugin,--disable-media-export-plugin" PACKAGECONFIG[gst-launch] = "--enable-gst-launch-plugin,--disable-gst-launch-plugin" @@ -36,6 +37,11 @@ do_install_append() { # Remove .la files for loadable modules rm -f ${D}/${libdir}/rygel-${LIBV}/engines/*.la rm -f ${D}/${libdir}/rygel-${LIBV}/plugins/*.la + if [ -e ${D}${libdir}/systemd/user/rygel.service ]; then + mkdir -p ${D}${systemd_unitdir}/system + mv ${D}${libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system + rmdir ${D}${libdir}/systemd/user ${D}${libdir}/systemd + fi } FILES_${PN} += "${libdir}/rygel-${LIBV}/engines ${datadir}/dbus-1 ${datadir}/icons" @@ -46,6 +52,8 @@ ALLOW_EMPTY_${PN}-meta = "1" PACKAGES_DYNAMIC = "${PN}-plugin-*" +SYSTEMD_SERVICE_${PN} = "rygel.service" + python populate_packages_prepend () { rygel_libdir = d.expand('${libdir}/rygel-${LIBV}') postinst = d.getVar('plugin_postinst') |