diff options
Diffstat (limited to 'meta-multimedia/recipes-connectivity/gupnp')
10 files changed, 154 insertions, 36 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.4.0.1.bb b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb index 97b0bbd287..e6ea472709 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.4.0.1.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gssdp_1.6.3.bb @@ -3,27 +3,31 @@ 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 = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "8676849d57fb822b8728856dbadebf3867f89ee47a0ec47a20045d011f431582" +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-2.4 \ + libsoup-3.0 \ " -inherit meson pkgconfig gobject-introspection vala gtk-doc +inherit gnomebase pkgconfig gobject-introspection vala gi-docgen features_check -SNIFFER = "${@bb.utils.contains("BBFILE_COLLECTIONS", "gnome-layer", "sniffer", "", d)}" +# manpages require pandoc-native +EXTRA_OEMESON += "-Dmanpages=false" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', "${SNIFFER}", "", d)}" +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/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.14.0.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.1.bb index b253c54d92..2a5c0808ee 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.0.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-av_0.14.1.bb @@ -8,5 +8,7 @@ DEPENDS = "gupnp" inherit meson pkgconfig gobject-introspection vala -SRC_URI = "${GNOME_MIRROR}/${BPN}/0.14/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "20aed546fc882e78a3f186a0c8bce5c841cc3a44b7ea528298fbdc82596fb156" +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_0.12.0.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb index e1758c19b2..8dc5fce199 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-dlna_0.12.0.bb @@ -1,5 +1,5 @@ SUMMARY = "Helpers for AV applications using DLNA" -LICENSE = "LGPLv2" +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" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.6.0.bb index 4bbfb6e705..d8dbc262cd 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.2.0.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp-igd_1.6.0.bb @@ -1,13 +1,12 @@ SUMMARY = "Helpers for interacting with Internet Gateway Devices over UPnP" -LICENSE = "LGPLv2" +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 sqlite3" +DEPENDS = "glib-2.0 gssdp gupnp" -SRC_URI = "http://download.gnome.org/sources/${BPN}/1.2/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "4b5120098aa13edd27818ba9ee4d7fe961bf540bf50d056ff703c61545e02be1" +inherit gnomebase pkgconfig gtk-doc gobject-introspection -GTKDOC_MESON_OPTION = "gtk_doc" +SRC_URI[archive.sha256sum] = "4099978339ab22126d4968f2a332b6d094fc44c78797860781f1fc2f11771b74" -inherit meson pkgconfig gtk-doc gobject-introspection +GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb deleted file mode 100644 index 49f7d91b74..0000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp-tools_0.10.2.bb +++ /dev/null @@ -1,15 +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" - -inherit features_check meson pkgconfig gettext gtk-icon-cache - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://download.gnome.org/sources/${BPN}/0.10/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "6de49ef4b375b8a164f74b766168b1184e0d28196b6b07a4f5341f08dfd85d6c" - -RRECOMMENDS:${PN} = "adwaita-icon-theme" 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.4.1.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb index 708e3844ff..7d9b8a477f 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb @@ -3,12 +3,13 @@ DESCRIPTION = "GUPnP is an elegant, object-oriented open source framework for cr 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 + +SRC_URI[archive.sha256sum] = "c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f" +SRC_URI += "file://0001-gupnp-enums.c.template-use-basename-instead-of-filen.patch" -SRC_URI = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c" SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess" @@ -19,4 +20,4 @@ gupnp_sysroot_preprocess () { FILES:${PN}-dev += "${bindir}/gupnp-binding-tool*" -RDEPENDS:${PN}-dev = "python3 python3-xml" +RDEPENDS:${PN}-dev += "python3-core python3-xml" |