Message ID | 20230926175354.2297242-1-martin.jansa@gmail.com |
---|---|
State | Under Review |
Headers | show |
Series | [meta-oe] gupnp: fix build with meson-1.2.0 | expand |
I think we need same/simiilar fix for gupnp-tools as well. See https://errors.yoctoproject.org/Errors/Details/738235/ On Tue, Sep 26, 2023 at 10:54 AM Martin Jansa <martin.jansa@gmail.com> wrote: > > Signed-off-by: Martin Jansa <martin.jansa@gmail.com> > --- > ...roperly-spell-provide-in-.wrap-files.patch | 25 +++++++++++++++++++ > .../recipes-connectivity/gupnp/gupnp_1.4.1.bb | 1 + > 2 files changed, 26 insertions(+) > create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch > > 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 > new file mode 100644 > index 0000000000..66f07094c5 > --- /dev/null > +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch > @@ -0,0 +1,25 @@ > +From 7a4515a356a3d5eb2af1f602c77a42a544e71efa Mon Sep 17 00:00:00 2001 > +From: Jan Beich <jbeich@FreeBSD.org> > +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 <martin.jansa@gmail.com> > +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.4.1.bb > index c21e7a05bf..efeb66f28f 100644 > --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb > +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb > @@ -9,6 +9,7 @@ inherit meson 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" > > -- > 2.42.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#105145): https://lists.openembedded.org/g/openembedded-devel/message/105145 > Mute This Topic: https://lists.openembedded.org/mt/101601703/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Agreed, there is https://gitlab.gnome.org/GNOME/gupnp-tools/-/commit/1372f9ebe45180d58cefb6c0475fafe77de37ef2 I haven't seen it in my world builds because it was "hidden" by gupnp failure. Will send patch later. On Wed, Sep 27, 2023 at 5:50 PM Khem Raj <raj.khem@gmail.com> wrote: > I think we need same/simiilar fix for gupnp-tools as well. See > https://errors.yoctoproject.org/Errors/Details/738235/ > > On Tue, Sep 26, 2023 at 10:54 AM Martin Jansa <martin.jansa@gmail.com> > wrote: > > > > Signed-off-by: Martin Jansa <martin.jansa@gmail.com> > > --- > > ...roperly-spell-provide-in-.wrap-files.patch | 25 +++++++++++++++++++ > > .../recipes-connectivity/gupnp/gupnp_1.4.1.bb | 1 + > > 2 files changed, 26 insertions(+) > > create mode 100644 > meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch > > > > 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 > > new file mode 100644 > > index 0000000000..66f07094c5 > > --- /dev/null > > +++ > b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch > > @@ -0,0 +1,25 @@ > > +From 7a4515a356a3d5eb2af1f602c77a42a544e71efa Mon Sep 17 00:00:00 2001 > > +From: Jan Beich <jbeich@FreeBSD.org> > > +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 <martin.jansa@gmail.com> > > +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.4.1.bb > > index c21e7a05bf..efeb66f28f 100644 > > --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb > > +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb > > @@ -9,6 +9,7 @@ inherit meson 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" > > > > -- > > 2.42.0 > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#105145): > https://lists.openembedded.org/g/openembedded-devel/message/105145 > > Mute This Topic: https://lists.openembedded.org/mt/101601703/1997914 > > Group Owner: openembedded-devel+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [ > raj.khem@gmail.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > >
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 new file mode 100644 index 0000000000..66f07094c5 --- /dev/null +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch @@ -0,0 +1,25 @@ +From 7a4515a356a3d5eb2af1f602c77a42a544e71efa Mon Sep 17 00:00:00 2001 +From: Jan Beich <jbeich@FreeBSD.org> +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 <martin.jansa@gmail.com> +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.4.1.bb index c21e7a05bf..efeb66f28f 100644 --- a/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb +++ b/meta-multimedia/recipes-connectivity/gupnp/gupnp_1.4.1.bb @@ -9,6 +9,7 @@ inherit meson 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"
Signed-off-by: Martin Jansa <martin.jansa@gmail.com> --- ...roperly-spell-provide-in-.wrap-files.patch | 25 +++++++++++++++++++ .../recipes-connectivity/gupnp/gupnp_1.4.1.bb | 1 + 2 files changed, 26 insertions(+) create mode 100644 meta-multimedia/recipes-connectivity/gupnp/gupnp/0001-build-properly-spell-provide-in-.wrap-files.patch