diff options
Diffstat (limited to 'meta-multimedia/recipes-connectivity/gupnp')
18 files changed, 212 insertions, 305 deletions
diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch b/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch new file mode 100644 index 0000000000..63126520e9 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp/0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch @@ -0,0 +1,32 @@ +From 78270f9159a9ec7284ca39a2fbb1774347942de1 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Wed, 24 Apr 2024 19:08:43 +0200 +Subject: [PATCH] gssdp-enums.c.template: use basename instead of filename + +This would prevent the build path from leaking into the source code. + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/13] +--- + libgssdp/gssdp-enums.c.template | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgssdp/gssdp-enums.c.template b/libgssdp/gssdp-enums.c.template +index 600d426..2dfb859 100644 +--- a/libgssdp/gssdp-enums.c.template ++++ b/libgssdp/gssdp-enums.c.template +@@ -3,8 +3,8 @@ + + /*** END file-header ***/ + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ +-#include "@filename@" ++/* enumerations from "@basename@" */ ++#include "@basename@" + /*** END file-production ***/ + /*** BEGIN value-header ***/ + GType +-- +2.44.0 + diff --git a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.3.bb b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.3.bb deleted file mode 100644 index 7d82c3e2e6..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.2.3.bb +++ /dev/null @@ -1,20 +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.2/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "ef3295a965c06ce0f683522391fbb910" -SRC_URI[sha256sum] = "a263dcb6730e3b3dc4bbbff80cf3fab4cd364021981d419db6dd5a8e148aa7e8" - -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-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb new file mode 100644 index 0000000000..e6ea472709 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb @@ -0,0 +1,33 @@ +SUMMARY = "Resource discovery and announcement over SSDP" +DESCRIPTION = "GSSDP implements resource discovery and announcement over SSDP \ + (Simpe Service Discovery Protocol)." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/gssdp/" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/gssdp/-/issues" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI:append = " file://0001-gssdp-enums.c.template-use-basename-instead-of-filen.patch" +SRC_URI[archive.sha256sum] = "2fedb5afdb22cf14d5498a39a773ca89788a250fcf70118783df821e1f3f3446" + +GTKDOC_MESON_OPTION = 'gtk_doc' + +DEPENDS = " \ + glib-2.0 \ + libsoup-3.0 \ +" + +inherit gnomebase pkgconfig gobject-introspection vala gi-docgen features_check + +# manpages require pandoc-native +EXTRA_OEMESON += "-Dmanpages=false" + +SNIFFER = "${@bb.utils.contains("BBFILE_COLLECTIONS", "gnome-layer", "sniffer", "", d)}" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', "${SNIFFER}", "", d)}" +PACKAGECONFIG[sniffer] = "-Dsniffer=true,-Dsniffer=false,gtk4," + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'sniffer', 'opengl', '', d)}" + +PACKAGES =+ "gssdp-tools" + +FILES:gssdp-tools = "${bindir}/gssdp* ${datadir}/gssdp/*.glade" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc deleted file mode 100644 index 0544501569..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av.inc +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "Helpers for AV applications using UPnP" -DESCRIPTION = "GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP." -LICENSE = "LGPLv2" -DEPENDS = "gupnp" - -inherit autotools pkgconfig gobject-introspection vala - -# 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-av the vapigen.m4 has only a custom macro) -do_configure_prepend() { - cp -f ${S}/m4/vapigen.m4 ${S}/m4/vapigen-custom.m4 || true -} - diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av/0001-all-Drop-xmlRecoverMemory.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av/0001-all-Drop-xmlRecoverMemory.patch new file mode 100644 index 0000000000..92b52ad98a --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av/0001-all-Drop-xmlRecoverMemory.patch @@ -0,0 +1,44 @@ +From d99f71a4a52da7582d5e26992a1ab303b280d28a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 30 Jun 2023 03:23:12 -0700 +Subject: [PATCH] Drop xmlRecoverMemory + +newer libxml has deprecated xmlRecoverMemory therefore replace it with xmlReadMemory + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp/-/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gupnp-didl-lite-parser.c | 2 +- + gupnp-feature-list-parser.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gupnp-didl-lite-parser.c b/gupnp-didl-lite-parser.c +index 3a5727f..840d718 100644 +--- a/libgupnp-av/gupnp-didl-lite-parser.c ++++ b/libgupnp-av/gupnp-didl-lite-parser.c +@@ -230,7 +230,7 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser, + GUPnPAVXMLDoc *xml_doc = NULL; + gboolean result; + +- doc = xmlRecoverMemory (didl, strlen (didl)); ++ doc = xmlReadMemory (didl, strlen (didl), NULL, NULL, XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + g_set_error (error, + G_MARKUP_ERROR, +diff --git a/gupnp-feature-list-parser.c b/gupnp-feature-list-parser.c +index 16208b5..f804fe7 100644 +--- a/libgupnp-av/gupnp-feature-list-parser.c ++++ b/libgupnp-av/gupnp-feature-list-parser.c +@@ -114,7 +114,7 @@ gupnp_feature_list_parser_parse_text + xmlNode *element; + GList *feature_list = NULL; + +- doc = xmlRecoverMemory (text, strlen (text)); ++ doc = xmlReadMemory (text, strlen (text), NULL, NULL, XML_PARSE_NONET | XML_PARSE_RECOVER); + if (doc == NULL) { + g_set_error (error, + G_MARKUP_ERROR, +-- +2.41.0 + diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.bb deleted file mode 100644 index 1881656b47..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.12.11.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] = "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-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.1.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.1.bb new file mode 100644 index 0000000000..2a5c0808ee --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.1.bb @@ -0,0 +1,14 @@ +SUMMARY = "Helpers for AV applications using UPnP" +DESCRIPTION = "GUPnP-AV is a collection of helpers for building AV (audio/video) applications using GUPnP." + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "gupnp" + +inherit meson pkgconfig gobject-introspection vala + +SRC_URI = "${GNOME_MIRROR}/${BPN}/0.14/${BPN}-${PV}.tar.xz \ + file://0001-all-Drop-xmlRecoverMemory.patch \ + " +SRC_URI[sha256sum] = "b79ce0cc4b0c66d9c54bc22183a10e5709a0011d2af272025948efcab33a3e4f" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/move_vapigen.patch deleted file mode 100644 index 9bfc31b8eb..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna/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 <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/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb deleted file mode 100644 index 3cafd69764..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.10.5.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Helpers for AV applications using DLNA" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ - file://libgupnp-dlna/gupnp-dlna-profile.h;beginline=1;endline=22;md5=1b85459f65cb1e73a885ca137aab6274" - -DEPENDS = "libxml2 glib-2.0" - -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 - -PACKAGECONFIG ?= "gstreamer" -PACKAGECONFIG[gstreamer] = "--enable-gstreamer-metadata-backend,--disable-gstreamer-metadata-backend,gstreamer1.0 gstreamer1.0-plugins-base" - -FILES_${PN} += "${datadir}/gupnp-dlna-2.0/dlna-profiles" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb new file mode 100644 index 0000000000..8dc5fce199 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Helpers for AV applications using DLNA" +LICENSE = "LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://libgupnp-dlna/gupnp-dlna-profile.h;beginline=1;endline=22;md5=1b85459f65cb1e73a885ca137aab6274" + +DEPENDS = "libxml2 glib-2.0" + +SRC_URI = "http://download.gnome.org/sources/${BPN}/0.12/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "3d53b96f85bc5628d33e367ec9bf2adb38ef2b34d7ad0434a6ba0cf4ad9048e6" + +inherit meson pkgconfig gobject-introspection vala + +PACKAGECONFIG ?= "gstreamer" +PACKAGECONFIG[gstreamer] = "-Dgstreamer_backend=enabled,-Dgstreamer_backend=disabled,gstreamer1.0 gstreamer1.0-plugins-base" + +FILES:${PN} += "${datadir}/gupnp-dlna-2.0/dlna-profiles" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch deleted file mode 100644 index ff5a6d9c6c..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd/0001-Swtich-to-new-GUPnP-API.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001 -From: Jens Georg <mail@jensge.org> -Date: Sat, 1 Dec 2018 21:33:21 +0100 -Subject: [PATCH] Swtich to new GUPnP API - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -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-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb deleted file mode 100644 index 1a98ace80c..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_0.2.5.bb +++ /dev/null @@ -1,16 +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 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-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.6.0.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.6.0.bb new file mode 100644 index 0000000000..d8dbc262cd --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.6.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "Helpers for interacting with Internet Gateway Devices over UPnP" +LICENSE = "LGPL-2.0-only" +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" + +inherit gnomebase pkgconfig gtk-doc gobject-introspection + +SRC_URI[archive.sha256sum] = "4099978339ab22126d4968f2a332b6d094fc44c78797860781f1fc2f11771b74" + +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.bb deleted file mode 100644 index bf84e7b73c..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.0.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 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-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.12.1.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.12.1.bb new file mode 100644 index 0000000000..4f6ff3fb97 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.12.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "Tools for GUPnP" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "gupnp gssdp gtk+3 libsoup-3.0 libxml2 glib-2.0 " + +inherit gnomebase features_check pkgconfig gettext gtk-icon-cache + +ANY_OF_DISTRO_FEATURES = "x11 wayland" + +SRC_URI[archive.sha256sum] = "53cf93123f397e8f8f0b8e9e4364c86a7502a5334f4c0be2e054a824478bd5ba" + +PACKAGECONFIG ??= "av-tools" +PACKAGECONFIG[av-tools] = "-Dav-tools=true,-Dav-tools=false,gupnp-av" +PACKAGECONFIG[gtksourceview] = ",,gtksourceview4" + +CFLAGS += "-Wno-deprecated-declarations" + +RRECOMMENDS:${PN} = "adwaita-icon-theme" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch new file mode 100644 index 0000000000..373eb4548e --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch @@ -0,0 +1,32 @@ +From f875a0afe24fdebdefc46d132f6722dfcb55115a Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Wed, 24 Apr 2024 18:52:45 +0200 +Subject: [PATCH] gupnp-enums.c.template: use @basename@ instead of @filename@ + +This would prevent the build path from leaking into the source code. + +Signed-off-by: Markus Volk <f_l_k@t-online.de> + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/36] +--- + libgupnp/gupnp-enums.c.template | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libgupnp/gupnp-enums.c.template b/libgupnp/gupnp-enums.c.template +index 3ce5fa4..a7ff89c 100644 +--- a/libgupnp/gupnp-enums.c.template ++++ b/libgupnp/gupnp-enums.c.template +@@ -3,8 +3,8 @@ + + /*** END file-header ***/ + /*** BEGIN file-production ***/ +-/* enumerations from "@filename@" */ +-#include "@filename@" ++/* enumerations from "@basename@" */ ++#include "@basename@" + /*** END file-production ***/ + /*** BEGIN value-header ***/ + GType +-- +2.44.0 + diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.4.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.4.bb deleted file mode 100644 index c7b330fa00..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.2.4.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gupnp.inc - -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.2/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "7c9c7cd80e36d9fb1e5b0267571fc17d" -SRC_URI[sha256sum] = "f7a0307ea51f5e44d1b832f493dd9045444a3a4e211ef85dfd9aa5dd6eaea7d1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://libgupnp/gupnp.h;beginline=1;endline=20;md5=d78a69d9b6e63ee2dc72e7b674d97520" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb index 2920581c51..7d9b8a477f 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp.inc +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb @@ -1,15 +1,15 @@ SUMMARY = "UPnP framework" DESCRIPTION = "GUPnP is an elegant, object-oriented open source framework for creating UPnP devices and control points, written in C using GObject and libsoup. The GUPnP API is intended to be easy to use, efficient and flexible. It provides the same set of features as libupnp, but shields the developer from most of UPnP's internals." -LICENSE = "LGPLv2+" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -DEPENDS = "e2fsprogs gssdp libsoup-2.4 libxml2" +DEPENDS = "e2fsprogs gssdp libsoup-3.0 libxml2" -inherit meson pkgconfig vala gobject-introspection +inherit gnomebase pkgconfig vala gobject-introspection -FILES_${PN} = "${libdir}/*.so.*" -FILES_${PN}-dev += "${bindir}/gupnp-binding-tool*" +SRC_URI[archive.sha256sum] = "c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f" +SRC_URI += "file://0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch" -RDEPENDS_${PN}-dev = "python3 python3-xml" SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" @@ -17,3 +17,7 @@ gupnp_sysroot_preprocess () { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ install -m 755 ${D}${bindir}/gupnp-binding-tool* ${SYSROOT_DESTDIR}${bindir_crossscripts}/ } + +FILES:${PN}-dev += "${bindir}/gupnp-binding-tool*" + +RDEPENDS:${PN}-dev += "python3-core python3-xml" |