diff mbox series

[v6,23/28] package/qt5webengine: add libXdamage as XCB dependency

Message ID 20200217212350.29750-24-anaumann@ultratronik.de
State New
Headers show
Series Qt5 qmake infra and per-package compatibility | expand

Commit Message

Andreas Naumann Feb. 17, 2020, 9:23 p.m. UTC
Fixes a build failure.

Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
---
 package/qt5/qt5webengine/Config.in       | 1 +
 package/qt5/qt5webengine/qt5webengine.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni March 12, 2020, 8:15 a.m. UTC | #1
On Mon, 17 Feb 2020 22:23:45 +0100
Andreas Naumann <anaumann@ultratronik.de> wrote:

> Fixes a build failure.
> 
> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>

Could you provide the Buildroot configuration that exhibits the issue?
I've been trying to create a configuration that builds qt5webengine
with X.org enabled, and no matter what I do, the OpenGL provider I use
selects libxdamage, so I don't have a configuration that combines
qt5webengine and X.org, but without having libxdamage.

Also, what was the build failure ?

Thanks!

Thomas
Andreas Naumann March 16, 2020, 10:40 p.m. UTC | #2
Hi,

On 12.03.20 09:15, Thomas Petazzoni wrote:
> On Mon, 17 Feb 2020 22:23:45 +0100
> Andreas Naumann <anaumann@ultratronik.de> wrote:
> 
>> Fixes a build failure.
>>
>> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
> 
> Could you provide the Buildroot configuration that exhibits the issue?

it was imx6-sabresd_qt5_defconfig plus everything Qt I could find. See 
cover letter near the end.

> I've been trying to create a configuration that builds qt5webengine
> with X.org enabled, and no matter what I do, the OpenGL provider I use
> selects libxdamage, so I don't have a configuration that combines
> qt5webengine and X.org, but without having libxdamage.

Maybe this was fixed with e79ee3b, I will try again.


regards,
Andreas

> 
> Also, what was the build failure ?
> 
> Thanks!
> 
> Thomas
>
Andreas Naumann March 22, 2020, 9:58 p.m. UTC | #3
Hi Thomas,

On 16.03.20 23:40, Andreas Naumann wrote:
> Hi,
> 
> On 12.03.20 09:15, Thomas Petazzoni wrote:
>> On Mon, 17 Feb 2020 22:23:45 +0100
>> Andreas Naumann <anaumann@ultratronik.de> wrote:
>>
>>> Fixes a build failure.
>>>
>>> Signed-off-by: Andreas Naumann <anaumann@ultratronik.de>
>>
>> Could you provide the Buildroot configuration that exhibits the issue?
> 
> it was imx6-sabresd_qt5_defconfig plus everything Qt I could find. See 
> cover letter near the end.
> 
>> I've been trying to create a configuration that builds qt5webengine
>> with X.org enabled, and no matter what I do, the OpenGL provider I use
>> selects libxdamage, so I don't have a configuration that combines
>> qt5webengine and X.org, but without having libxdamage.

I now realize my configuration had mesa3d without 
BR2_PACKAGE_MESA3D_OPENGL_GLX. Once selected, it pulls in libxdamage and 
it gets build before mesa. So the first part of my patch might really 
not be needed.

The second part (the dependency) however is needed because otherwise it 
wont be available in the per-package sysroot of qt5webengine. I guess I 
should have pointed that out in the commit message. Do you want me to 
resend?

> 
> Maybe this was fixed with e79ee3b, I will try again.

So no, this was another issue.


regards,
Andreas




> 
> 
> regards,
> Andreas
> 
>>
>> Also, what was the build failure ?
>>
>> Thanks!
>>
>> Thomas
>>
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni March 22, 2020, 10:03 p.m. UTC | #4
On Sun, 22 Mar 2020 22:58:19 +0100
Andreas Naumann <dev@andin.de> wrote:

> I now realize my configuration had mesa3d without 
> BR2_PACKAGE_MESA3D_OPENGL_GLX. Once selected, it pulls in libxdamage and 
> it gets build before mesa. So the first part of my patch might really 
> not be needed.
> 
> The second part (the dependency) however is needed because otherwise it 
> wont be available in the per-package sysroot of qt5webengine. I guess I 
> should have pointed that out in the commit message. Do you want me to 
> resend?

Yes, please. Could you also include in the commit log the defconfig
that allows to reproduce the issue ?

Thanks a lot!

Thomas
diff mbox series

Patch

diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in
index 0e776ecb61..f98530fa4d 100644
--- a/package/qt5/qt5webengine/Config.in
+++ b/package/qt5/qt5webengine/Config.in
@@ -59,6 +59,7 @@  config BR2_PACKAGE_QT5WEBENGINE
 	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_QT5BASE_XCB
 	select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_QT5BASE_XCB
 	select BR2_PACKAGE_XLIB_LIBXTST if BR2_PACKAGE_QT5BASE_XCB
+	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_QT5BASE_XCB
 	help
 	  The Qt WebEngine module provides a web browser engine that
 	  makes it easy to embed content from the World Wide Web into
diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
index 798b777df0..cd7a0ba81c 100644
--- a/package/qt5/qt5webengine/qt5webengine.mk
+++ b/package/qt5/qt5webengine/qt5webengine.mk
@@ -23,7 +23,7 @@  QT5WEBENGINE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 LICENSE.GPL3-EXCEPT \
 
 ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y)
 QT5WEBENGINE_DEPENDENCIES += xlib_libXScrnSaver xlib_libXcomposite \
-	xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst
+	xlib_libXcursor xlib_libXi xlib_libXrandr xlib_libXtst xlib_libXdamage
 endif
 
 ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)