* [Buildroot] [PATCH 1/1] freerdp: fix wayland client dependency chain failure @ 2017-11-19 21:48 Adam Duskett 2017-11-20 7:47 ` Thomas Petazzoni 0 siblings, 1 reply; 4+ messages in thread From: Adam Duskett @ 2017-11-19 21:48 UTC (permalink / raw) To: buildroot If the wayland client is selected, freerdp depends on libxkbcommon without depending on it in the mk file. Fixes: http://autobuild.buildroot.net/results/dc3/dc3e11f7076a8355f3d2f9cb49c6325dcf7084bd Signed-off-by: Adam Duskett <Adamduskett@outlook.com> --- package/freerdp/freerdp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 69a89a190c..29c35164c3 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -207,6 +207,10 @@ else FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF endif +ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_WL),y) +FREERDP_DEPENDENCIES += libxkbcommon +endif + #--------------------------------------- # Post-install hooks to cleanup and install missing stuff -- 2.14.3 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] freerdp: fix wayland client dependency chain failure 2017-11-19 21:48 [Buildroot] [PATCH 1/1] freerdp: fix wayland client dependency chain failure Adam Duskett @ 2017-11-20 7:47 ` Thomas Petazzoni 2017-11-20 21:14 ` Yann E. MORIN 0 siblings, 1 reply; 4+ messages in thread From: Thomas Petazzoni @ 2017-11-20 7:47 UTC (permalink / raw) To: buildroot Hello, +Yann in Cc. On Sun, 19 Nov 2017 16:48:52 -0500, Adam Duskett wrote: > If the wayland client is selected, freerdp depends on libxkbcommon without > depending on it in the mk file. > > Fixes: > http://autobuild.buildroot.net/results/dc3/dc3e11f7076a8355f3d2f9cb49c6325dcf7084bd > Signed-off-by: Adam Duskett <Adamduskett@outlook.com> > --- > package/freerdp/freerdp.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk > index 69a89a190c..29c35164c3 100644 > --- a/package/freerdp/freerdp.mk > +++ b/package/freerdp/freerdp.mk > @@ -207,6 +207,10 @@ else > FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF > endif > > +ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_WL),y) > +FREERDP_DEPENDENCIES += libxkbcommon > +endif https://git.buildroot.org/buildroot/commit/?id=c2824fba2f2f4df6c1e0273fa546a203d1e6d5ac already makes libxkbcommon a dependency of freerdp when wayland is enabled. Isn't this sufficient ? Thomas -- Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] freerdp: fix wayland client dependency chain failure 2017-11-20 7:47 ` Thomas Petazzoni @ 2017-11-20 21:14 ` Yann E. MORIN 2017-11-25 17:16 ` Adam Duskett 0 siblings, 1 reply; 4+ messages in thread From: Yann E. MORIN @ 2017-11-20 21:14 UTC (permalink / raw) To: buildroot Thomas, Adam, All, On 2017-11-20 08:47 +0100, Thomas Petazzoni spake thusly: > On Sun, 19 Nov 2017 16:48:52 -0500, Adam Duskett wrote: > > If the wayland client is selected, freerdp depends on libxkbcommon without > > depending on it in the mk file. > > > > Fixes: > > http://autobuild.buildroot.net/results/dc3/dc3e11f7076a8355f3d2f9cb49c6325dcf7084bd > > Signed-off-by: Adam Duskett <Adamduskett@outlook.com> > > --- > > package/freerdp/freerdp.mk | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk > > index 69a89a190c..29c35164c3 100644 > > --- a/package/freerdp/freerdp.mk > > +++ b/package/freerdp/freerdp.mk > > @@ -207,6 +207,10 @@ else > > FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF > > endif > > > > +ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_WL),y) > > +FREERDP_DEPENDENCIES += libxkbcommon > > +endif > > https://git.buildroot.org/buildroot/commit/?id=c2824fba2f2f4df6c1e0273fa546a203d1e6d5ac > already makes libxkbcommon a dependency of freerdp when wayland is > enabled. Isn't this sufficient ? I think the current code might indeed not be correct, but that the patch is not correct either... The issue with FreeRDP, as much as I can remember, is the way it builds the clients: either clients are enabled ot they are not. But once you enable clients, it will look for dependencies of each client, and build those whose dependencies are met. So, if you have X11 and wayland libs around, then FreeRDP will biuld both clients, even if you are only interested in one and not both. The situation where you want only (say) the wayland client and not the X11 one is if you are running a wayland system, with XWayland to run legacy X11 apps ontop of this, and only want to use FreeRDP as a wayland client. So we have code in freerdp.mk to get rid of the unneeded client(s). But now, the select and dependency on libxbcommon are under two slightly different conditions: - the select is only when the wayland client is enabled, - the dependency is when the wayland package is enabled. Now, if the wayland client is disabled, but the walyand package is enabled, then nothing from FreeRDP selects libxbkcommon, but it ends up in the dependency chain of FreeRDP nonetheless. I think a better patch would be something like: diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk index 69a89a190c..0ceef576a8 100644 --- a/package/freerdp/freerdp.mk +++ b/package/freerdp/freerdp.mk @@ -198,7 +198,7 @@ else FREERDP_CONF_OPTS += -DWITH_XV=OFF endif -ifeq ($(BR2_PACKAGE_WAYLAND),y) +ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_WL),y) FREERDP_DEPENDENCIES += wayland libxkbcommon FREERDP_CONF_OPTS += \ -DWITH_WAYLAND=ON \ TBH, I'm a bit under the weather those days, so Adam, I'd be gratefull if you were to check the above, please. Regards, Yann E. MORIN. -- .-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------' ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] freerdp: fix wayland client dependency chain failure 2017-11-20 21:14 ` Yann E. MORIN @ 2017-11-25 17:16 ` Adam Duskett 0 siblings, 0 replies; 4+ messages in thread From: Adam Duskett @ 2017-11-25 17:16 UTC (permalink / raw) To: buildroot Yann; On Mon, Nov 20, 2017 at 4:14 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote: > Thomas, Adam, All, > > On 2017-11-20 08:47 +0100, Thomas Petazzoni spake thusly: >> On Sun, 19 Nov 2017 16:48:52 -0500, Adam Duskett wrote: >> > If the wayland client is selected, freerdp depends on libxkbcommon without >> > depending on it in the mk file. >> > >> > Fixes: >> > http://autobuild.buildroot.net/results/dc3/dc3e11f7076a8355f3d2f9cb49c6325dcf7084bd >> > Signed-off-by: Adam Duskett <Adamduskett@outlook.com> >> > --- >> > package/freerdp/freerdp.mk | 4 ++++ >> > 1 file changed, 4 insertions(+) >> > >> > diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk >> > index 69a89a190c..29c35164c3 100644 >> > --- a/package/freerdp/freerdp.mk >> > +++ b/package/freerdp/freerdp.mk >> > @@ -207,6 +207,10 @@ else >> > FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF >> > endif >> > >> > +ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_WL),y) >> > +FREERDP_DEPENDENCIES += libxkbcommon >> > +endif >> >> https://git.buildroot.org/buildroot/commit/?id=c2824fba2f2f4df6c1e0273fa546a203d1e6d5ac >> already makes libxkbcommon a dependency of freerdp when wayland is >> enabled. Isn't this sufficient ? > > I think the current code might indeed not be correct, but that the patch > is not correct either... > > The issue with FreeRDP, as much as I can remember, is the way it builds > the clients: either clients are enabled ot they are not. But once you > enable clients, it will look for dependencies of each client, and build > those whose dependencies are met. > > So, if you have X11 and wayland libs around, then FreeRDP will biuld > both clients, even if you are only interested in one and not both. > > The situation where you want only (say) the wayland client and not the > X11 one is if you are running a wayland system, with XWayland to run > legacy X11 apps ontop of this, and only want to use FreeRDP as a wayland > client. > > So we have code in freerdp.mk to get rid of the unneeded client(s). > > But now, the select and dependency on libxbcommon are under two slightly > different conditions: > > - the select is only when the wayland client is enabled, > - the dependency is when the wayland package is enabled. > > Now, if the wayland client is disabled, but the walyand package is > enabled, then nothing from FreeRDP selects libxbkcommon, but it ends up > in the dependency chain of FreeRDP nonetheless. > > I think a better patch would be something like: > > diff --git a/package/freerdp/freerdp.mk b/package/freerdp/freerdp.mk > index 69a89a190c..0ceef576a8 100644 > --- a/package/freerdp/freerdp.mk > +++ b/package/freerdp/freerdp.mk > @@ -198,7 +198,7 @@ else > FREERDP_CONF_OPTS += -DWITH_XV=OFF > endif > > -ifeq ($(BR2_PACKAGE_WAYLAND),y) > +ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_WL),y) > FREERDP_DEPENDENCIES += wayland libxkbcommon > FREERDP_CONF_OPTS += \ > -DWITH_WAYLAND=ON \ > > TBH, I'm a bit under the weather those days, so Adam, I'd be gratefull > if you were to check the above, please. > Can do! Sorry I didn't see the message earlier, I will resubmit. Hope you feel better! > Regards, > Yann E. MORIN. > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' Adam ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-25 17:16 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-11-19 21:48 [Buildroot] [PATCH 1/1] freerdp: fix wayland client dependency chain failure Adam Duskett 2017-11-20 7:47 ` Thomas Petazzoni 2017-11-20 21:14 ` Yann E. MORIN 2017-11-25 17:16 ` Adam Duskett
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox