| Message ID | 20220620210856.771825-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] package/x11r7/xserver_xorg-server: fix xephyr build with kdrive | expand |
Bernd already sent the same patch:
https://patchwork.ozlabs.org/project/buildroot/patch/20220620184925.538342-1-bernd.kuhls@t-online.de/
I can set this one as superseded however I would advise to only add
those dependencies if BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR and
BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE are set.
Here is an extract of configure.ac:
if test "$KDRIVE" = yes; then
XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render
xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3
xcb-keysyms xcb-randr xcb-xkb"
Le lun. 20 juin 2022 à 23:12, Fabrice Fontaine
<fontaine.fabrice@gmail.com> a écrit :
>
> Fix the following xephyr build failure with kdrive raised since commit
> eedbd6f97d51a0049ec512de26541465403ab06f:
>
> checking for XEPHYR... no
> configure: error: Package requirements (xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb xcb-xv) were not met:
>
> Package 'xcb-renderutil', required by 'virtual:world', not found
> Package 'xcb-aux', required by 'virtual:world', not found
> Package 'xcb-image', required by 'virtual:world', not found
> Package 'xcb-icccm', required by 'virtual:world', not found
> Package 'xcb-keysyms', required by 'virtual:world', not found
>
> Fixes:
> - http://autobuild.buildroot.org/results/baba218c879b67bfbadc9c25d34313abc76397bc
> - http://autobuild.buildroot.org/results/9471b77db9aefa2fd0e5be61ea84709183511623
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/x11r7/xserver_xorg-server/Config.in | 4 ++++
> package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 7 +++++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
> index 4fb03051dd..daf4d81702 100644
> --- a/package/x11r7/xserver_xorg-server/Config.in
> +++ b/package/x11r7/xserver_xorg-server/Config.in
> @@ -85,6 +85,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB
>
> config BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR
> bool "Xephyr server"
> + select BR2_PACKAGE_XCB_UTIL_IMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
> + select BR2_PACKAGE_XCB_UTIL_KEYSYMS if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
> + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
> + select BR2_PACKAGE_XCB_UTIL_WM if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
> help
> Xephyr nested X server; successor to Xnest.
>
> diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> index 0f1779dcab..fa5d2a802d 100644
> --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> @@ -84,6 +84,13 @@ XSERVER_XORG_SERVER_CONF_OPTS += \
> --disable-glx \
> --disable-dri
>
> +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR),y)
> +XSERVER_XORG_SERVER_DEPENDENCIES += \
> + xcb-util-image \
> + xcb-util-keysyms \
> + xcb-util-renderutil \
> + xcb-util-wm
> +endif
> else # modular
> XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive
> endif
> --
> 2.35.1
>
Am Mon, 20 Jun 2022 23:22:26 +0200 schrieb Fabrice Fontaine: > Bernd already sent the same patch: > https://patchwork.ozlabs.org/project/buildroot/patch/ 20220620184925.538342-1-bernd.kuhls@t-online.de/ > > I can set this one as superseded however I would advise to only add > those dependencies if BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR and > BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE are set. Hi Fabrice, you are right, the new dependencies should depend on BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR. I missed this additional dependency, therefore I marked my patch as superseded. Regards, Bernd
On 20/06/2022 23:08, Fabrice Fontaine wrote: > Fix the following xephyr build failure with kdrive raised since commit > eedbd6f97d51a0049ec512de26541465403ab06f: > > checking for XEPHYR... no > configure: error: Package requirements (xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb xcb-xv) were not met: > > Package 'xcb-renderutil', required by 'virtual:world', not found > Package 'xcb-aux', required by 'virtual:world', not found > Package 'xcb-image', required by 'virtual:world', not found > Package 'xcb-icccm', required by 'virtual:world', not found > Package 'xcb-keysyms', required by 'virtual:world', not found > > Fixes: > - http://autobuild.buildroot.org/results/baba218c879b67bfbadc9c25d34313abc76397bc > - http://autobuild.buildroot.org/results/9471b77db9aefa2fd0e5be61ea84709183511623 > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks. Regards, Arnout > --- > package/x11r7/xserver_xorg-server/Config.in | 4 ++++ > package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 7 +++++++ > 2 files changed, 11 insertions(+) > > diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in > index 4fb03051dd..daf4d81702 100644 > --- a/package/x11r7/xserver_xorg-server/Config.in > +++ b/package/x11r7/xserver_xorg-server/Config.in > @@ -85,6 +85,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB > > config BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR > bool "Xephyr server" > + select BR2_PACKAGE_XCB_UTIL_IMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE > + select BR2_PACKAGE_XCB_UTIL_KEYSYMS if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE > + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE > + select BR2_PACKAGE_XCB_UTIL_WM if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE > help > Xephyr nested X server; successor to Xnest. > > diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > index 0f1779dcab..fa5d2a802d 100644 > --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > @@ -84,6 +84,13 @@ XSERVER_XORG_SERVER_CONF_OPTS += \ > --disable-glx \ > --disable-dri > > +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR),y) > +XSERVER_XORG_SERVER_DEPENDENCIES += \ > + xcb-util-image \ > + xcb-util-keysyms \ > + xcb-util-renderutil \ > + xcb-util-wm > +endif > else # modular > XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive > endif
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes: > Fix the following xephyr build failure with kdrive raised since commit > eedbd6f97d51a0049ec512de26541465403ab06f: > checking for XEPHYR... no > configure: error: Package requirements (xau xdmcp xcb xcb-shape > xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 > xcb-keysyms xcb-randr xcb-xkb xcb-xv) were not met: > Package 'xcb-renderutil', required by 'virtual:world', not found > Package 'xcb-aux', required by 'virtual:world', not found > Package 'xcb-image', required by 'virtual:world', not found > Package 'xcb-icccm', required by 'virtual:world', not found > Package 'xcb-keysyms', required by 'virtual:world', not found > Fixes: > - http://autobuild.buildroot.org/results/baba218c879b67bfbadc9c25d34313abc76397bc > - http://autobuild.buildroot.org/results/9471b77db9aefa2fd0e5be61ea84709183511623 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Committed to 2022.05.x and 2022.02.x, thanks.
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 4fb03051dd..daf4d81702 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -85,6 +85,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB config BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR bool "Xephyr server" + select BR2_PACKAGE_XCB_UTIL_IMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE + select BR2_PACKAGE_XCB_UTIL_WM if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE help Xephyr nested X server; successor to Xnest. diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 0f1779dcab..fa5d2a802d 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -84,6 +84,13 @@ XSERVER_XORG_SERVER_CONF_OPTS += \ --disable-glx \ --disable-dri +ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR),y) +XSERVER_XORG_SERVER_DEPENDENCIES += \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xcb-util-wm +endif else # modular XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive endif
Fix the following xephyr build failure with kdrive raised since commit eedbd6f97d51a0049ec512de26541465403ab06f: checking for XEPHYR... no configure: error: Package requirements (xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm >= 1.9.3 xcb-keysyms xcb-randr xcb-xkb xcb-xv) were not met: Package 'xcb-renderutil', required by 'virtual:world', not found Package 'xcb-aux', required by 'virtual:world', not found Package 'xcb-image', required by 'virtual:world', not found Package 'xcb-icccm', required by 'virtual:world', not found Package 'xcb-keysyms', required by 'virtual:world', not found Fixes: - http://autobuild.buildroot.org/results/baba218c879b67bfbadc9c25d34313abc76397bc - http://autobuild.buildroot.org/results/9471b77db9aefa2fd0e5be61ea84709183511623 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/x11r7/xserver_xorg-server/Config.in | 4 ++++ package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 7 +++++++ 2 files changed, 11 insertions(+)