From patchwork Fri Nov 10 11:45:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 34251 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE9D0C4167B for ; Fri, 10 Nov 2023 11:46:24 +0000 (UTC) Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by mx.groups.io with SMTP id smtpd.web10.25363.1699616780680322521 for ; Fri, 10 Nov 2023 03:46:21 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.84, mailfrom: f_l_k@t-online.de) Received: from fwd89.aul.t-online.de (fwd89.aul.t-online.de [10.223.144.115]) by mailout09.t-online.de (Postfix) with SMTP id 30223617AC for ; Fri, 10 Nov 2023 12:45:32 +0100 (CET) Received: from intel-corei7-64.fritz.box ([84.163.32.113]) by fwd89.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1r1Px1-21NTYv0; Fri, 10 Nov 2023 12:45:27 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-multimedia][PATCH 1/4] gupnp: Upgrade 0.10.2 -> 0.12.1 Date: Fri, 10 Nov 2023 12:45:43 +0100 Message-ID: <20231110114546.306710-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1699616727-317F9820-B921A49B/0/0 CLEAN NORMAL X-TOI-MSGID: f65fcf23-fde5-409c-b2d7-95fb88f477b7 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 10 Nov 2023 11:46:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/106541 Signed-off-by: Markus Volk --- .../0001-all-Drop-xmlRecoverMemory.patch | 107 ------------------ ...roperly-spell-provide-in-.wrap-files.patch | 25 ---- .../gupnp/{gupnp_1.4.1.bb => gupnp_1.6.6.bb} | 10 +- 3 files changed, 3 insertions(+), 139 deletions(-) delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch delete mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch rename meta-multimedia/recipes-connectivity/gupnp/{gupnp_1.4.1.bb => gupnp_1.6.6.bb} (68%) diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch deleted file mode 100644 index a3941f345..000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-all-Drop-xmlRecoverMemory.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 46f13d9929c81ec2340a1a5d48f596b1892c5a81 Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Thu, 4 May 2023 19:14:29 +0200 -Subject: [PATCH] all: Drop xmlRecoverMemory - -use xmlReadMemory, also use NONET flat - -Signed-off-by: Martin Jansa -Upstream-Status: Backport [https://github.com/GNOME/gupnp/commit/80e68995b745a5900eaaa1d0c424d3a9d354e42d] ---- - libgupnp/gupnp-control-point.c | 7 +++++-- - libgupnp/gupnp-service-info.c | 7 +++++-- - libgupnp/gupnp-service-proxy-action.c | 7 +++++-- - libgupnp/gupnp-service-proxy.c | 7 +++++-- - libgupnp/gupnp-service.c | 7 +++++-- - 5 files changed, 25 insertions(+), 10 deletions(-) - -diff --git a/libgupnp/gupnp-control-point.c b/libgupnp/gupnp-control-point.c -index dc04732..99ebda5 100644 ---- a/libgupnp/gupnp-control-point.c -+++ b/libgupnp/gupnp-control-point.c -@@ -608,8 +608,11 @@ got_description_url (SoupSession *session, - xmlDoc *xml_doc; - - /* Parse response */ -- xml_doc = xmlRecoverMemory (msg->response_body->data, -- msg->response_body->length); -+ xml_doc = xmlReadMemory (msg->response_body->data, -+ msg->response_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - if (xml_doc) { - doc = gupnp_xml_doc_new (xml_doc); - -diff --git a/libgupnp/gupnp-service-info.c b/libgupnp/gupnp-service-info.c -index 9a9f4de..d468801 100644 ---- a/libgupnp/gupnp-service-info.c -+++ b/libgupnp/gupnp-service-info.c -@@ -592,8 +592,11 @@ got_scpd_url (G_GNUC_UNUSED SoupSession *session, - if (SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { - xmlDoc *scpd; - -- scpd = xmlRecoverMemory (msg->response_body->data, -- msg->response_body->length); -+ scpd = xmlReadMemory (msg->response_body->data, -+ msg->response_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - if (scpd) { - introspection = gupnp_service_introspection_new (scpd); - -diff --git a/libgupnp/gupnp-service-proxy-action.c b/libgupnp/gupnp-service-proxy-action.c -index 4d9336c..ef8a808 100644 ---- a/libgupnp/gupnp-service-proxy-action.c -+++ b/libgupnp/gupnp-service-proxy-action.c -@@ -86,8 +86,11 @@ check_action_response (G_GNUC_UNUSED GUPnPServiceProxy *proxy, - } - - /* Parse response */ -- response = xmlRecoverMemory (action->msg->response_body->data, -- action->msg->response_body->length); -+ response = xmlReadMemory (action->msg->response_body->data, -+ action->msg->response_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - - if (!response) { - if (action->msg->status_code == SOUP_STATUS_OK) { -diff --git a/libgupnp/gupnp-service-proxy.c b/libgupnp/gupnp-service-proxy.c -index 25d5ef6..af2fd46 100644 ---- a/libgupnp/gupnp-service-proxy.c -+++ b/libgupnp/gupnp-service-proxy.c -@@ -1560,8 +1560,11 @@ server_handler (G_GNUC_UNUSED SoupServer *soup_server, - } - - /* Parse the actual XML message content */ -- doc = xmlRecoverMemory (msg->request_body->data, -- msg->request_body->length); -+ doc = xmlReadMemory (msg->request_body->data, -+ msg->request_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - if (doc == NULL) { - /* Failed */ - g_warning ("Failed to parse NOTIFY message body"); -diff --git a/libgupnp/gupnp-service.c b/libgupnp/gupnp-service.c -index 67b3d43..0ebfb26 100644 ---- a/libgupnp/gupnp-service.c -+++ b/libgupnp/gupnp-service.c -@@ -985,8 +985,11 @@ control_server_handler (SoupServer *server, - *end = '\0'; - - /* Parse action_node */ -- doc = xmlRecoverMemory (msg->request_body->data, -- msg->request_body->length); -+ doc = xmlReadMemory (msg->request_body->data, -+ msg->request_body->length, -+ NULL, -+ NULL, -+ XML_PARSE_NONET | XML_PARSE_RECOVER); - if (doc == NULL) { - soup_message_set_status (msg, SOUP_STATUS_BAD_REQUEST); - diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch deleted file mode 100644 index 66f07094c..000000000 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7a4515a356a3d5eb2af1f602c77a42a544e71efa Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Sun, 9 Jul 2023 03:30:47 +0000 -Subject: [PATCH] build: properly spell [provide] in *.wrap files - -meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"? - -Signed-off-by: Martin Jansa -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gupnp/-/commit/884639bd29323cbb8fbd36bc69d08097a2ae2cd1] ---- - subprojects/gssdp-1.2.wrap | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/subprojects/gssdp-1.2.wrap b/subprojects/gssdp-1.2.wrap -index 469c75d..466b83b 100644 ---- a/subprojects/gssdp-1.2.wrap -+++ b/subprojects/gssdp-1.2.wrap -@@ -3,6 +3,6 @@ url = https://gitlab.gnome.org/GNOME/gssdp.git - revision = gssdp-1.4 - depth = 1 - --[provides] -+[provide] - dependency_name = gssdp-1.2 - diff --git a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb similarity index 68% rename from meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb rename to meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb index efeb66f28..c6738923a 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.6.6.bb @@ -3,15 +3,11 @@ 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 = "${GNOME_MIRROR}/${BPN}/1.4/${BPN}-${PV}.tar.xz \ - file://0001-all-Drop-xmlRecoverMemory.patch \ - file://0001-build-properly-spell-provide-in-.wrap-files.patch \ -" -SRC_URI[sha256sum] = "899196b5e66f03b8e25f046a7a658cd2a6851becb83f2d55345ab3281655dc0c" +SRC_URI[archive.sha256sum] = "c9dc50e8c78b3792d1b0e6c5c5f52c93e9345d3dae2891e311a993a574f5a04f" SYSROOT_PREPROCESS_FUNCS += "gupnp_sysroot_preprocess"