From nobody Mon Dec 25 09:11:43 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzBww3J2Gz54MP8; Mon, 25 Dec 2023 09:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzBww1FMLz3dyr; Mon, 25 Dec 2023 09:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703495504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rnhlk4UFyRBMQYmxMYz/OSktawh5ueUsQtkUCNsXjs=; b=vtc6+nJpNLKqalUeswFt9ahwDQFbC1OGMSUkHFiVE0oXABcEkK+KPrJb2Dp+tyv1V9KArj PMjaemB4JtiAPMLDi5G3zLHhN386WX6aZvL/NVs3q0t9Uun1IPdKt5FSs0/1L7aS+m8594 fHyp0wVC5koM2V44gIQqjy5jBF0ZFtnzjp+ENCfjTTXMS+osGy+NJxHPII50oobhuQVIQX LOUL22Yo/5BBq9jeeoSfZA09Ayi33JFPhd0FF1WB3JZIWB0yVVtJ5bz3o3FUFZoIgP2ROV vhZLgrYU/3Sz2J9MTuxGEG+QFn/oWODoQoMCO+bxCML1ByvMvftvERac9Ocwcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703495504; a=rsa-sha256; cv=none; b=P3ES8OeiZM+GANF8AAMEpZlHOaCo8yHRErm8NunRQrIqDuN3Tic7hUepMB+Dl6m7tmFQel Ksq5rEpPl5rwKnDNsHNkFz00aUKzbgryk9GE37zLANcgNoJyYzt3T4lMxGy4y2w9Jk6jCp 4yGuX3fbMv5pG6Q9aigGWmwVnQWHQYap0Bl/kpeT9sq6q01GvtFiVRb+OSPeuQCgYm/1q4 iwcY00KiOzFZW7RrcRD+aZ59FwzP0LD/G1C2YTHNS7PaPRlR0Ceiydz0yedVXxz+gAFkOk d83aTDKqcmXLuGfd4A47SiqSK1KtTVtNUiaibSc1OdYVyDkFKoZ+CgK3r3C6sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703495504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rnhlk4UFyRBMQYmxMYz/OSktawh5ueUsQtkUCNsXjs=; b=fBhQ3UbIV2HbwH194VW2z8YxAuYJ64/A0Y90u3oEoGGeguT9YCTtmZ3EP53G3ftFhPiS/J H0vMCeygPSTW1o9906/frg1pRbBk4OKSQyYhCsaM5+e95kAZjnyiRwxSlwhFL8p9U2A+CK lz1Y8/rYGIepA2Hf7UrShl1mDNduApaD69cCM0BxgEOKfSbpVnYGyMc/UtQ5SXWh20dwk1 4JXxpo27GB+8wPNpX3ovqhXz6zzWD3NGWalKdfLtB2QOMj8/FrtqNtzPssBINuSSukibVl ydCKnOLvN2OF80RRfcWQsdtOWt0FN4SQ3W8ABjrkw+6xt6K1ij5WC5PrmLiD6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzBww0KN5z14xN; Mon, 25 Dec 2023 09:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BP9BhEA087052; Mon, 25 Dec 2023 09:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BP9BhBC087049; Mon, 25 Dec 2023 09:11:43 GMT (envelope-from git) Date: Mon, 25 Dec 2023 09:11:43 GMT Message-Id: <202312250911.3BP9BhBC087049@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 4d96af767a50 - main - net/gupnp-av: Backport upstream fixes List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d96af767a5090ac0f40aa90aa17abfa7bb914ef Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d96af767a5090ac0f40aa90aa17abfa7bb914ef commit 4d96af767a5090ac0f40aa90aa17abfa7bb914ef Author: Po-Chuan Hsieh AuthorDate: 2023-12-25 09:03:21 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-12-25 09:03:21 +0000 net/gupnp-av: Backport upstream fixes - Fix Requires: line of pkg-config file [1] - Fix build with libxml2 2.11+ [2][3][4] - Bump PORTREVISION for package change PR: 275865 Submitted by: diizzy Obtained from: https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/767388bc16e08d4e1e1f419555165cc1816be931 [1] https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/bff65db081ee1ee5df0a42231ebf8e8fbb27cccf [2] https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/9557768121d54fdcedabe7544863515d6a813354 [3] https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/1e10a41fcef6ae0d3e89958db89bc22398f3b4f1 [4] --- net/gupnp-av/Makefile | 2 +- net/gupnp-av/files/patch-libxml2 | 69 +++++++++++++++++++++++++++++++++++++ net/gupnp-av/files/patch-pkg-config | 17 +++++++++ 3 files changed, 87 insertions(+), 1 deletion(-) diff --git a/net/gupnp-av/Makefile b/net/gupnp-av/Makefile index a0626f2ce821..b4c9fc8db6b9 100644 --- a/net/gupnp-av/Makefile +++ b/net/gupnp-av/Makefile @@ -1,6 +1,6 @@ PORTNAME= gupnp-av PORTVERSION= 0.14.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= GNOME diff --git a/net/gupnp-av/files/patch-libxml2 b/net/gupnp-av/files/patch-libxml2 new file mode 100644 index 000000000000..9b1f3d3baf66 --- /dev/null +++ b/net/gupnp-av/files/patch-libxml2 @@ -0,0 +1,69 @@ +Obtained from: https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/bff65db081ee1ee5df0a42231ebf8e8fbb27cccf + https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/9557768121d54fdcedabe7544863515d6a813354 + https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/1e10a41fcef6ae0d3e89958db89bc22398f3b4f1 + +--- libgupnp-av/gupnp-didl-lite-parser.c.orig 2022-06-03 18:15:12 UTC ++++ libgupnp-av/gupnp-didl-lite-parser.c +@@ -230,12 +230,17 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDL + 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, + G_MARKUP_ERROR_PARSE, +- "Could not parse DIDL-Lite XML:\n%s", didl); ++ "Could not parse DIDL-Lite XML:\n%s", ++ didl); + + return FALSE; + } +--- libgupnp-av/gupnp-feature-list-parser.c.orig 2022-06-03 18:15:12 UTC ++++ libgupnp-av/gupnp-feature-list-parser.c +@@ -114,12 +114,17 @@ 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, + G_MARKUP_ERROR_PARSE, +- "Could not parse FeatureList XML:\n%s", text); ++ "Could not parse FeatureList XML:\n%s", ++ text); + + return NULL; + } +--- libgupnp-av/xml-util.h.orig 2022-06-03 18:15:12 UTC ++++ libgupnp-av/xml-util.h +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include + #include + +--- meson.build.orig 2022-06-03 18:15:12 UTC ++++ meson.build +@@ -71,7 +71,7 @@ endif + + common_cflags = cc.get_supported_arguments(test_cflags) + +-add_project_arguments(cc.get_supported_arguments('-Werror=deprecated-declarations'), language: 'c') ++#add_project_arguments(cc.get_supported_arguments('-Werror=deprecated-declarations'), language: 'c') + conf = configuration_data() + conf.set_quoted('DATADIR', join_paths(get_option('prefix'), get_option('datadir'), 'gupnp-av')) + conf.set_quoted('VERSION', meson.project_version()) diff --git a/net/gupnp-av/files/patch-pkg-config b/net/gupnp-av/files/patch-pkg-config new file mode 100644 index 000000000000..8d0dbec08711 --- /dev/null +++ b/net/gupnp-av/files/patch-pkg-config @@ -0,0 +1,17 @@ +Obtained from: https://gitlab.gnome.org/GNOME/gupnp-av/-/commit/767388bc16e08d4e1e1f419555165cc1816be931 + +--- meson.build.orig 2022-06-03 18:15:12 UTC ++++ meson.build +@@ -87,6 +87,12 @@ subdir('data') + pkg = import('pkgconfig') + pkg.generate( + gupnp_av_lib, ++ requires : [ ++ 'glib-2.0', ++ 'gobject-2.0', ++ 'gio-2.0', ++ 'libxml-2.0' ++ ], + subdirs : 'gupnp-av-1.0', + description : 'GObject-based AV specific UPnP library' + )