From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- .../gupnp/files/move_vapigen.patch | 102 --------------------- .../recipes-connectivity/gupnp/gssdp_1.0.2.bb | 24 ----- .../recipes-connectivity/gupnp/gssdp_1.2.2.bb | 20 ++++ .../recipes-connectivity/gupnp/gupnp-av_0.12.10.bb | 7 -- .../recipes-connectivity/gupnp/gupnp-av_0.12.11.bb | 7 ++ .../gupnp/gupnp-dlna/move_vapigen.patch | 102 +++++++++++++++++++++ .../gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch | 101 ++++++++++++++++++++ .../recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb | 14 --- .../recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb | 16 ++++ .../gupnp/gupnp-tools_0.10.0.bb | 13 +++ .../gupnp/gupnp-tools_0.8.13.bb | 13 --- .../recipes-connectivity/gupnp/gupnp.inc | 14 +-- .../recipes-connectivity/gupnp/gupnp_1.0.2.bb | 8 -- .../recipes-connectivity/gupnp/gupnp_1.2.2.bb | 8 ++ .../recipes-connectivity/rygel/rygel_0.37.0.bb | 69 -------------- .../recipes-connectivity/rygel/rygel_0.38.3.bb | 69 ++++++++++++++ 16 files changed, 340 insertions(+), 247 deletions(-) delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch create mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb delete mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb create mode 100644 meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb (limited to 'meta-openembedded/meta-multimedia/recipes-connectivity') diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch deleted file mode 100644 index 9bfc31b8e..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/files/move_vapigen.patch +++ /dev/null @@ -1,102 +0,0 @@ -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 -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 -+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 -+ -+# 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 --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 -- --# 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/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb deleted file mode 100644 index 6088ef195..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.0.2.bb +++ /dev/null @@ -1,24 +0,0 @@ -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" - -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.0/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "b30c9a406853c6a3a012d151d6e7ad2c" -SRC_URI[sha256sum] = "a1e17c09c7e1a185b0bd84fd6ff3794045a3cd729b707c23e422ff66471535dc" - -inherit autotools pkgconfig gobject-introspection vala gtk-doc - -# Copy vapigen.m4 so that it doesn't get removed by vala class -# (normally this would be the right thing to do, but in gssdp the vapigen.m4 has only a custom macro) -do_configure_prepend() { - cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true -} - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)}" -PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk,gtk+3" - -PACKAGES =+ "gssdp-tools" - -FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb new file mode 100644 index 000000000..ddaddd209 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.2.bb @@ -0,0 +1,20 @@ +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" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "f00a470ebcba96f34def8f83ac5891ed" +SRC_URI[sha256sum] = "cabb9e3b456b8354a55e23eb0207545d974643cda6d623523470ebbc4188b0a4" + +GTKDOC_MESON_OPTION = 'gtk_doc' + +inherit meson pkgconfig gobject-introspection vala gtk-doc + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sniffer', '', d)}" +PACKAGECONFIG[sniffer] = "-Dsniffer=true,-Dsniffer=false,gtk+3," + +PACKAGES =+ "gssdp-tools" + +FILES_gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb deleted file mode 100644 index cfd0227e4..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.10.bb +++ /dev/null @@ -1,7 +0,0 @@ -require gupnp-av.inc - -SRC_URI = "${GNOME_MIRROR}/${BPN}/0.12/${BPN}-${PV}.tar.xz" -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/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.bb new file mode 100644 index 000000000..1881656b4 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.bb @@ -0,0 +1,7 @@ +require gupnp-av.inc + +SRC_URI = "${GNOME_MIRROR}/${BPN}/0.12/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "f09e99ae20271b0a8cadce806098ae8b" +SRC_URI[sha256sum] = "689dcf1492ab8991daea291365a32548a77d1a2294d85b33622b55cca9ce6fdc" +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://libgupnp-av/gupnp-av.h;beginline=1;endline=22;md5=2b47b7b5f799d2ebabe62b895e848820" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch new file mode 100644 index 000000000..9bfc31b8e --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/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 +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 ++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 ++ ++# 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 +-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 +- +-# 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/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch new file mode 100644 index 000000000..ff5a6d9c6 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch @@ -0,0 +1,101 @@ +From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001 +From: Jens Georg +Date: Sat, 1 Dec 2018 21:33:21 +0100 +Subject: [PATCH] Swtich to new GUPnP API + +Signed-off-by: Khem Raj +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e] +--- + configure.ac | 2 +- + gupnp-igd-1.0-uninstalled.pc.in | 2 +- + gupnp-igd-1.0.pc.in | 2 +- + libgupnp-igd/Makefile.am | 2 +- + tests/gtest/gupnp-simple-igd.c | 6 ++++-- + 5 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f03921f..aa7f0ca 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -11,7 +11,7 @@ AC_STDC_HEADERS + AC_PROG_LIBTOOL + AC_FUNC_MMAP + +-PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0) ++PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0) + + # glib-genmarshal + GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` +diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in +index 483956f..6db3bee 100644 +--- a/gupnp-igd-1.0-uninstalled.pc.in ++++ b/gupnp-igd-1.0-uninstalled.pc.in +@@ -5,7 +5,7 @@ includedir=${pcfiledir}/ + + Name: gupnp-igd-1.0 + Description: GUPnP Simple IGD library +-Requires: gupnp-1.0 ++Requires: gupnp-1.2 + Version: @VERSION@ + Libs: ${libdir}/libgupnp-av-1.0.la + Cflags: -I${includedir} +diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in +index 6660d63..aa74ed3 100644 +--- a/gupnp-igd-1.0.pc.in ++++ b/gupnp-igd-1.0.pc.in +@@ -5,7 +5,7 @@ includedir=@includedir@ + + Name: gupnp-igd-1.0 + Description: GUPnP Simple IGD library +-Requires: gupnp-1.0 ++Requires: gupnp-1.2 + Version: @VERSION@ + Libs: -L${libdir} -lgupnp-igd-1.0 + Cflags: -I${includedir}/gupnp-igd-1.0 +diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am +index fe020b5..e10d857 100644 +--- a/libgupnp-igd/Makefile.am ++++ b/libgupnp-igd/Makefile.am +@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0 + GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES) + GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS) + GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0 +-GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0 ++GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2 + GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir) + + if HAVE_INTROSPECTION +diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c +index 9b32b2a..d051d13 100644 +--- a/tests/gtest/gupnp-simple-igd.c ++++ b/tests/gtest/gupnp-simple-igd.c +@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, + GUPnPDeviceInfo *subdev1; + GUPnPDeviceInfo *subdev2; + const gchar *xml_path = "."; ++ GError *error = NULL; + + g_signal_connect (igd, "context-available", + G_CALLBACK (ignore_non_localhost), NULL); + + if (mainctx) + g_main_context_push_thread_default (mainctx); +- context = gupnp_context_new (NULL, "lo", 0, NULL); ++ context = gupnp_context_new ("lo", 0, NULL); + g_assert (context); + + if (g_getenv ("XML_PATH")) +@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, + gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml"); + */ + +- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path); ++ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error); + g_assert (dev); ++ g_assert (error == NULL); + + subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev), + "urn:schemas-upnp-org:device:WANDevice:1"); +-- +2.25.1 + diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb deleted file mode 100644 index 0aa594dc7..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.4.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Helpers for interacting with Internet Gateway Devices over UPnP" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://libgupnp-igd/gupnp-simple-igd.c;beginline=1;endline=21;md5=aa292c0d9390463a6e1055dc5fc68e80" - -DEPENDS = "glib-2.0 gupnp sqlite3" - -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "124371136b5a7b1056a3681780a62772" -SRC_URI[sha256sum] = "38c4a6d7718d17eac17df95a3a8c337677eda77e58978129ad3182d769c38e44" - -inherit autotools pkgconfig gtk-doc gobject-introspection - -EXTRA_OECONF = "--disable-python" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb new file mode 100644 index 000000000..1a98ace80 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb @@ -0,0 +1,16 @@ +SUMMARY = "Helpers for interacting with Internet Gateway Devices over UPnP" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ + file://libgupnp-igd/gupnp-simple-igd.c;beginline=1;endline=21;md5=aa292c0d9390463a6e1055dc5fc68e80" + +DEPENDS = "glib-2.0 gssdp gupnp sqlite3" + +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.2/${BPN}-${PV}.tar.xz \ + file://0001-Swtich-to-new-GUPnP-API.patch \ + " +SRC_URI[md5sum] = "d164e096d0f140bb1f5d9503727b424a" +SRC_URI[sha256sum] = "8b4a1aa38bacbcac2c1755153147ead7ee9af7d4d1f544b6577cfc35e10e3b20" + +inherit autotools pkgconfig gtk-doc gobject-introspection + +EXTRA_OECONF = "--disable-python" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb new file mode 100644 index 000000000..bf84e7b73 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb @@ -0,0 +1,13 @@ +SUMMARY = "Tools for GUPnP" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://src/network-light/main.c;beginline=1;endline=21;md5=2c39b3a000495dabd4932f231c7efed8" +DEPENDS = "gupnp gupnp-av gtk+3 glib-2.0-native intltool-native" +RRECOMMENDS_${PN} = "adwaita-icon-theme" + +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "8c66d4aca756478615761a26ed7c8dba" +SRC_URI[sha256sum] = "41da7ff5ba8e2425adcb64ca5e04c81f57ca20ec6fdb84923939fdad42c6a18d" +inherit features_check meson pkgconfig gettext gtk-icon-cache + +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb deleted file mode 100644 index 7a6b872f1..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.8.13.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Tools for GUPnP" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://src/network-light/main.c;beginline=1;endline=21;md5=2c39b3a000495dabd4932f231c7efed8" -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] = "212d85ebce89b32468b59e1164050d40" -SRC_URI[sha256sum] = "aa3decb9d532c0e2e505adc592f431fd81c0231ded2981129e87da13712479ed" -inherit features_check autotools pkgconfig gettext - -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc index 6ce963161..2920581c5 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc @@ -4,22 +4,16 @@ LICENSE = "LGPLv2+" DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2" -inherit autotools pkgconfig vala gobject-introspection - -# Copy vapigen.m4 so that it doesn't get removed by vala class -# (normally this would be the right thing to do, but in gupnp the vapigen.m4 has only a custom macro) -do_configure_prepend() { - cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true -} +inherit meson pkgconfig vala gobject-introspection FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dev += "${bindir}/gupnp-binding-tool" +FILES_${PN}-dev += "${bindir}/gupnp-binding-tool*" -RDEPENDS_${PN}-dev = "python-textutils python-xml" +RDEPENDS_${PN}-dev = "python3 python3-xml" SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" gupnp_sysroot_preprocess () { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/gupnp-binding-tool ${SYSROOT_DESTDIR}${bindir_crossscripts}/ + install -m 755 ${D}${bindir}/gupnp-binding-tool* ${SYSROOT_DESTDIR}${bindir_crossscripts}/ } diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb deleted file mode 100644 index 1bdf7d79b..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -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/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb new file mode 100644 index 000000000..e60349716 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.2.bb @@ -0,0 +1,8 @@ +require gupnp.inc + +SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "2ade3d29c624ad98d70113e6e93908a5" +SRC_URI[sha256sum] = "9a80bd953e5c8772ad26b72f8da01cbe7241a113edd6084903f413ce751c9989" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ + file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb deleted file mode 100644 index 6ee02fcc0..000000000 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.37.0.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "A UPnP AV media server and renderer" -DESCRIPTION = "Rygel is a home media solution (UPnP AV MediaServer) that \ -allow you to easily share audio, video and pictures to other devices. \ -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 = "LGPL-2.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 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" - -SRC_URI[archive.md5sum] = "f897167ad82e2e741582f2c393a76843" -SRC_URI[archive.sha256sum] = "dfd3d885da3ac383ba0cfbf119995f4a0c2bca2cc8f8cfcd3df10cfec8f35cd7" - -inherit gnomebase vala gobject-introspection gettext systemd - -EXTRA_OECONF = "--disable-tracker-plugin --with-media-engine=gstreamer" - -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[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" -PACKAGECONFIG[gtk+3] = ",--without-ui,gtk+3" -PACKAGECONFIG[lms] = "--enable-lms-plugin,--disable-lms-plugin" - -LIBV = "2.6" - -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}${nonarch_libdir}/systemd/user/rygel.service ]; then - mkdir -p ${D}${systemd_unitdir}/system - mv ${D}${nonarch_libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system - rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/user \ - ${D}${nonarch_libdir}/systemd \ - ${D}${nonarch_libdir} - fi -} - -FILES_${PN} += "${libdir}/rygel-${LIBV}/engines ${datadir}/dbus-1 ${datadir}/icons" -FILES_${PN}-dbg += "${libdir}/rygel-${LIBV}/engines/.debug ${libdir}/rygel-${LIBV}/plugins/.debug" - -PACKAGES += "${PN}-meta" -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') - pkgs = [] - - pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), 'librygel-(.*)\.so$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) - pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), '(.*)\.plugin$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) - - metapkg = d.getVar('PN') + '-meta' - d.setVar('RDEPENDS_' + metapkg, ' '.join(pkgs)) -} diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb new file mode 100644 index 000000000..3fc845051 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.38.3.bb @@ -0,0 +1,69 @@ +SUMMARY = "A UPnP AV media server and renderer" +DESCRIPTION = "Rygel is a home media solution (UPnP AV MediaServer) that \ +allow you to easily share audio, video and pictures to other devices. \ +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 = "LGPL-2.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 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" + +inherit gnomebase vala gobject-introspection gettext systemd + +SRC_URI[archive.md5sum] = "7f95401903a3f855b464d5152b9d4c07" +SRC_URI[archive.sha256sum] = "08c21a577f7bdad26446a75ffa32778b26842c3b1188165f0b19818559747d00" + +EXTRA_OECONF = "--disable-tracker-plugin --with-media-engine=gstreamer" + +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[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" +PACKAGECONFIG[gtk+3] = ",--without-ui,gtk+3" +PACKAGECONFIG[lms] = "--enable-lms-plugin,--disable-lms-plugin" + +LIBV = "2.6" + +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}${nonarch_libdir}/systemd/user/rygel.service ]; then + mkdir -p ${D}${systemd_unitdir}/system + mv ${D}${nonarch_libdir}/systemd/user/rygel.service ${D}${systemd_unitdir}/system + rmdir --ignore-fail-on-non-empty ${D}${nonarch_libdir}/systemd/user \ + ${D}${nonarch_libdir}/systemd \ + ${D}${nonarch_libdir} + fi +} + +FILES_${PN} += "${libdir}/rygel-${LIBV}/engines ${datadir}/dbus-1 ${datadir}/icons" +FILES_${PN}-dbg += "${libdir}/rygel-${LIBV}/engines/.debug ${libdir}/rygel-${LIBV}/plugins/.debug" + +PACKAGES += "${PN}-meta" +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') + pkgs = [] + + pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), 'librygel-(.*)\.so$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + pkgs += do_split_packages(d, oe.path.join(rygel_libdir, "plugins"), '(.*)\.plugin$', d.expand('${PN}-plugin-%s'), 'Rygel plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}')) + + metapkg = d.getVar('PN') + '-meta' + d.setVar('RDEPENDS_' + metapkg, ' '.join(pkgs)) +} -- cgit v1.2.3