[PATCH 1/6] libx11: update patch status

[PATCH 1/6] libx11: update patch status

[Ross Burton]

This patch has now been merged upstream.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../libx11/Fix-hanging-issue-in-_XReply.patch       | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch b/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
index 2a723b7e43..660e6968bf 100644
--- a/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
+++ b/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch
@@ -9,17 +9,8 @@ If one thread was blocking waiting for an event and another thread sent a
 reply to the X server, both threads got blocked until an event was
 received.
 
-Upstream-Status: Submitted [https://patchwork.freedesktop.org/patch/171458/]
-
-This patch needs to be removed once the corresponding patch has been merged upstream.
-
-https://patchwork.freedesktop.org/patch/171458/
-
-Signed-off-by: Tatu Frisk <tatu.frisk@ge.com>
-Signed-off-by: Jose Alarcon <jose.alarcon@ge.com>
-
-[Refreshed for 1.6.7 update]
-Signed-off-by: Armin Kuster <akuster808@gmail.com>
+Upstream-Status: Backport [93a050c3ad2d2264d3880db3791387b1a9bf2e9e]
+Signed-off-by: Ross Burton <ross.burton@arm.com>
 
 ---
  src/xcb_io.c | 19 +++++++------------
-- 
2.25.1

[PATCH 2/6] libxkbcommon: remove obsolete util-macros dependency

[Ross Burton]

This is a hang-over from the autotools build system.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
index 0e75ed03dc..95accfc184 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.xkbcommon.org"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=e525ed9809e1f8a07cf4bce8b09e8b87"
 LICENSE = "MIT & MIT-style"
 
-DEPENDS = "util-macros flex-native bison-native"
+DEPENDS = "flex-native bison-native"
 
 SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz"
 
-- 
2.25.1

[PATCH 3/6] libxkbcommon: allow building of API documentation

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
index 95accfc184..725fcf009e 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
@@ -15,11 +15,14 @@ UPSTREAM_CHECK_URI = "http://xkbcommon.org/"
 
 inherit meson pkgconfig
 
-EXTRA_OEMESON = "-Denable-docs=false -Denable-xkbregistry=false"
+EXTRA_OEMESON = "-Denable-xkbregistry=false"
 
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}"
-PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
+PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'docs', '', d)}"
+
+PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native"
 PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols,"
+PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
 
 # Fix a following runtime error:
 # xkbcommon: ERROR: couldn't find a Compose file for locale "C"
-- 
2.25.1

[PATCH 4/6] xkbcommon: split xkbcli into a separate package

[Ross Burton]

Not everyone wants the CLI, so put it in a separate package to reduce
mandatory dependencies.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
index 725fcf009e..b4541cc698 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
@@ -24,6 +24,9 @@ PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native"
 PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols,"
 PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
 
+PACKAGE_BEFORE_PN += "xkbcli"
+FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*"
+
 # Fix a following runtime error:
 # xkbcommon: ERROR: couldn't find a Compose file for locale "C"
 RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}"
-- 
2.25.1

[PATCH 5/6] libxkbcommon: split libraries into separate packages

[Ross Burton]

The sublibraries, such as libxkbcommon-x11, have specific linkage, so to
avoid link creep they can be put into separate packages.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
index b4541cc698..425c1f386d 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
@@ -25,8 +25,14 @@ PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-n
 PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
 
 PACKAGE_BEFORE_PN += "xkbcli"
+FILES:${PN} = ""
 FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*"
 
+python populate_packages:prepend () {
+    # Put the libraries into separate packages to avoid dependency creep
+    do_split_packages(d, d.expand('${libdir}'), r'^(lib.*)\.so\.*', '%s', '%s library', extra_depends='', allow_links=True)
+}
+
 # Fix a following runtime error:
 # xkbcommon: ERROR: couldn't find a Compose file for locale "C"
 RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}"
-- 
2.25.1

[PATCH 6/6] xkbcommon: add option for xkbregistry

[Ross Burton]

Enable by default, now that libraries are split into separate packages
this won't cause a change to existing setups.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
index 425c1f386d..b2717f61bc 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
@@ -15,14 +15,13 @@ UPSTREAM_CHECK_URI = "http://xkbcommon.org/"
 
 inherit meson pkgconfig
 
-EXTRA_OEMESON = "-Denable-xkbregistry=false"
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}"
+PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} xkbregistry"
 PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'docs', '', d)}"
 
 PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native"
 PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols,"
 PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
+PACKAGECONFIG[xkbregistry] = "-Denable-xkbregistry=true,-Denable-xkbregistry=false,libxml2"
 
 PACKAGE_BEFORE_PN += "xkbcli"
 FILES:${PN} = ""
-- 
2.25.1

Re: [OE-core] [PATCH 5/6] libxkbcommon: split libraries into separate packages

[Richard Purdie]

On Fri, 2021-12-03 at 16:43 +0000, Ross Burton wrote:
> The sublibraries, such as libxkbcommon-x11, have specific linkage, so to
> avoid link creep they can be put into separate packages.
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> index b4541cc698..425c1f386d 100644
> --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> @@ -25,8 +25,14 @@ PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-n
>  PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
>  
>  PACKAGE_BEFORE_PN += "xkbcli"
> +FILES:${PN} = ""
>  FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*"
>  
> +python populate_packages:prepend () {
> +    # Put the libraries into separate packages to avoid dependency creep
> +    do_split_packages(d, d.expand('${libdir}'), r'^(lib.*)\.so\.*', '%s', '%s library', extra_depends='', allow_links=True)
> +}
> +
>  # Fix a following runtime error:
>  # xkbcommon: ERROR: couldn't find a Compose file for locale "C"
>  RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}"

Something isn't quite right in a weston build:

https://autobuilder.yoctoproject.org/typhoon/#/builders/119/builds/1044/steps/12/logs/stdio

Cheers,

Richard

Re: [OE-core] [PATCH 3/6] libxkbcommon: allow building of API documentation

[Richard Purdie]

On Fri, 2021-12-03 at 16:43 +0000, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> index 95accfc184..725fcf009e 100644
> --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> @@ -15,11 +15,14 @@ UPSTREAM_CHECK_URI = "http://xkbcommon.org/"
>  
>  inherit meson pkgconfig
>  
> -EXTRA_OEMESON = "-Denable-docs=false -Denable-xkbregistry=false"
> +EXTRA_OEMESON = "-Denable-xkbregistry=false"
>  
>  PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}"
> -PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
> +PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'docs', '', d)}"
> +
> +PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native"
>  PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols,"
> +PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
>  

https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/2396/steps/11/logs/errors

stdio: ERROR: Nothing PROVIDES 'doxygen-native' (but /home/pokybuild/yocto-worker/qemux86-world-alt/build/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb, virtual:multilib:lib32:/home/pokybuild/yocto-worker/qemux86-world-alt/build/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb DEPENDS on or otherwise requires it). Close matches:

Not quite sure what is going on there yet, seems a little strange.

Cheers,

Richard

RE: [OE-core] [PATCH 3/6] libxkbcommon: allow building of API documentation

[Peter Kjellerstedt]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Richard Purdie
> Sent: den 5 december 2021 00:20
> To: Ross Burton <ross@burtonini.com>; openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [PATCH 3/6] libxkbcommon: allow building of API documentation
> 
> On Fri, 2021-12-03 at 16:43 +0000, Ross Burton wrote:
> > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > ---
> >  meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> > index 95accfc184..725fcf009e 100644
> > --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> > +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> > @@ -15,11 +15,14 @@ UPSTREAM_CHECK_URI = "http://xkbcommon.org/"
> >
> >  inherit meson pkgconfig
> >
> > -EXTRA_OEMESON = "-Denable-docs=false -Denable-xkbregistry=false"
> > +EXTRA_OEMESON = "-Denable-xkbregistry=false"
> >
> >  PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}"
> > -PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
> > +PACKAGECONFIG:append:class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'docs', '', d)}"
> > +
> > +PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native"
> >  PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols,"
> > +PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config,"
> >
> 
> https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/2396/steps/11/logs/errors
> 
> stdio: ERROR: Nothing PROVIDES 'doxygen-native' (but /home/pokybuild/yocto-worker/qemux86-world-alt/build/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb,
> virtual:multilib:lib32:/home/pokybuild/yocto-worker/qemux86-world-alt/build/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb DEPENDS on
> or otherwise requires it). Close matches:
> 
> Not quite sure what is going on there yet, seems a little strange.

Not very strange when you consider that the doxygen recipe is in meta-oe....

> 
> Cheers,
> 
> Richard
> 

//Peter

Re: [OE-core] [PATCH 3/6] libxkbcommon: allow building of API documentation

[Richard Purdie]

On Sun, 2021-12-05 at 01:24 +0000, Peter Kjellerstedt wrote:
> > -----Original Message-----
> > From: openembedded-core@lists.openembedded.org
> > <openembedded-core@lists.openembedded.org> On Behalf Of Richard Purdie
> > Sent: den 5 december 2021 00:20
> > To: Ross Burton <ross@burtonini.com>; openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [PATCH 3/6] libxkbcommon: allow building of API
> > documentation
> > 
> > On Fri, 2021-12-03 at 16:43 +0000, Ross Burton wrote:
> > > Signed-off-by: Ross Burton <ross.burton@arm.com>
> > > ---
> > >  meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb | 7 +++++--
> > >  1 file changed, 5 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> > > b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> > > index 95accfc184..725fcf009e 100644
> > > --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> > > +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb
> > > @@ -15,11 +15,14 @@ UPSTREAM_CHECK_URI = "http://xkbcommon.org/"
> > > 
> > >  inherit meson pkgconfig
> > > 
> > > -EXTRA_OEMESON = "-Denable-docs=false -Denable-xkbregistry=false"
> > > +EXTRA_OEMESON = "-Denable-xkbregistry=false"
> > > 
> > >  PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}"
> > > -PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb
> > > xkeyboard-config,"
> > > +PACKAGECONFIG:append:class-target = "
> > > ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'docs', '',
> > > d)}"
> > > +
> > > +PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-
> > > native"
> > >  PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-
> > > wayland=false,wayland-native wayland wayland-protocols,"
> > > +PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb
> > > xkeyboard-config,"
> > > 
> > 
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/108/builds/2396/steps/11/logs/errors
> > 
> > stdio: ERROR: Nothing PROVIDES 'doxygen-native' (but /home/pokybuild/yocto-
> > worker/qemux86-world-alt/build/meta/recipes-graphics/xorg-
> > lib/libxkbcommon_1.3.1.bb,
> > virtual:multilib:lib32:/home/pokybuild/yocto-worker/qemux86-world-
> > alt/build/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb DEPENDS on
> > or otherwise requires it). Close matches:
> > 
> > Not quite sure what is going on there yet, seems a little strange.
> 
> Not very strange when you consider that the doxygen recipe is in meta-oe....

Yes, but I was wondering why the other world builds succeed when the lib32
multilib did not?

The answer is that the above world build is the only one with docs enabled so
that is why we're only seeing this there and not in other places.

I did drop most of the xkbcommon changes from master-next however the build
still saw:

https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/563/steps/13/logs/stdio

which is also puzzling/worrying me a bit. Weston does depend on libxkbcommon and
it is as if some of the previous artefacts have been retained from sstate and
not invalidated correctly by the rebuild.

Cheers,

Richard

Re: [OE-core] [PATCH 3/6] libxkbcommon: allow building of API documentation

[Ross Burton]

On Sun, 5 Dec 2021 at 01:24, Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
> > stdio: ERROR: Nothing PROVIDES 'doxygen-native' (but /home/pokybuild/yocto-worker/qemux86-world-alt/build/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb,
> > virtual:multilib:lib32:/home/pokybuild/yocto-worker/qemux86-world-alt/build/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.1.bb DEPENDS on
> > or otherwise requires it). Close matches:
> >
> > Not quite sure what is going on there yet, seems a little strange.
>
> Not very strange when you consider that the doxygen recipe is in meta-oe....

Whoops.  I honestly thought it was in core!

Ross