Skip to contentSkip to conversation

package/x11r7/xwayland: fix glamor DRI ordering dependency on mesa3d

PATCH In review Adam Ford 2 participants 4 messages Aug 3 – Sep 14

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH v2 1/1 package/x11r7/xwayland: fix glamor DRI ordering dependency on mesa3d

Xwayland's glamor support enables a DRI configure check that looks for Mesa's dri.pc in staging. Without an explicit ordering dependency, a highly parallel build can run Xwayland's configure before mesa3d is installed, failing with:

ERROR: Dependency "dri" not found

Since mesa3d is what provides the DRI/EGL/GBM bits glamor relies on, fold it into the glamor condition: only enable -Dglamor=true and add it to the dependencies alongside libepoxy.

package/x11r7/xwayland/xwayland.mk +1 -1
index 02a21b96c1..3bd87a4552 100644
@@ -32,7 +32,7 @@ XWAYLAND_CONF_OPTS = \
 
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_LIBEPOXY),yy)
 XWAYLAND_CONF_OPTS += -Dglamor=true
-XWAYLAND_DEPENDENCIES += libepoxy
+XWAYLAND_DEPENDENCIES += libepoxy mesa3d
 else
 XWAYLAND_CONF_OPTS += -Dglamor=false
 endif
Signature · 6 lines
2.53.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hi Adam,

Apologies for the delay.

Quoted 28 lines · Adam Ford

Xwayland's glamor support enables a DRI configure check that looks for Mesa's dri.pc in staging. Without an explicit ordering dependency, a highly parallel build can run Xwayland's configure before mesa3d is installed, failing with:

ERROR: Dependency "dri" not found

Since mesa3d is what provides the DRI/EGL/GBM bits glamor relies on, fold it into the glamor condition: only enable -Dglamor=true and add it to the dependencies alongside libepoxy.

package/x11r7/xwayland/xwayland.mk +1 -2
index 02a21b96c1..3bd87a4552 100644
@@ -32,7 +32,7 @@ XWAYLAND_CONF_OPTS = \
 
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_LIBEPOXY),yy)
 XWAYLAND_CONF_OPTS += -Dglamor=true
-XWAYLAND_DEPENDENCIES += libepoxy
+XWAYLAND_DEPENDENCIES += libepoxy mesa3d
 else
 XWAYLAND_CONF_OPTS += -Dglamor=false
 endif
--
Quoted 2 lines

2.53.0

dri is needed by glx, not glamor, when checking the code. Did you test build this?

(it's easier to reproduce with a per-package build where this becomes a persistent failure rather than random)

It should go to the LIBGL check rather than the LIB*E*GL check. But as I mentioned on v1, you probably need to check how this works when nvidia-driver is the LIBGL provider.

Best regards // John Ernberg
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

author
#2 lore raw
Quoted 40 lines · John Ernberg

Hi Adam,

Apologies for the delay.

Quoted 8 lines · Adam Ford

Xwayland's glamor support enables a DRI configure check that looks for Mesa's dri.pc in staging. Without an explicit ordering dependency, a highly parallel build can run Xwayland's configure before mesa3d is installed, failing with:

ERROR: Dependency "dri" not found

Review

Quoted 7 lines

Since mesa3d is what provides the DRI/EGL/GBM bits glamor relies on, fold it into the glamor condition: only enable -Dglamor=true and add it to the dependencies alongside libepoxy.

(quoted diff) +0 -0

b/package/x11r7/xwayland/xwayland.mk

Quoted 13 lines

index 02a21b96c1..3bd87a4552 100644

package/x11r7/xwayland/xwayland.mk +1 -2
@@ -32,7 +32,7 @@ XWAYLAND_CONF_OPTS = \
 
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_LIBEPOXY),yy)
 XWAYLAND_CONF_OPTS += -Dglamor=true
-XWAYLAND_DEPENDENCIES += libepoxy
+XWAYLAND_DEPENDENCIES += libepoxy mesa3d
 else
 XWAYLAND_CONF_OPTS += -Dglamor=false
 endif
--
Quoted 2 lines

2.53.0

dri is needed by glx, not glamor, when checking the code. Did you test build this?

Quoted 3 lines

(it's easier to reproduce with a per-package build where this becomes a persistent failure rather than random)

I test-built this with per-package enabled, and it worked, but I only have Mesa providing libgl as in my build scenario, I am using either Intel or AMDGPU.

Quoted 4 lines

It should go to the LIBGL check rather than the LIB*E*GL check. But as I mentioned on v1, you probably need to check how this works when nvidia-driver is the LIBGL provider.

I'll dig a bit further into this.

adam

Quoted 3 lines

Best regards // John Ernberg

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#3 lore raw

Hi Adam,

Quoted 52 lines · Adam Ford
Quoted 40 lines · John Ernberg

Hi Adam,

Apologies for the delay.

Quoted 28 lines · Adam Ford

Xwayland's glamor support enables a DRI configure check that looks for Mesa's dri.pc in staging. Without an explicit ordering dependency, a highly parallel build can run Xwayland's configure before mesa3d is installed, failing with:

ERROR: Dependency "dri" not found

Since mesa3d is what provides the DRI/EGL/GBM bits glamor relies on, fold it into the glamor condition: only enable -Dglamor=true and add it to the dependencies alongside libepoxy.

package/x11r7/xwayland/xwayland.mk +1 -2
index 02a21b96c1..3bd87a4552 100644
@@ -32,7 +32,7 @@ XWAYLAND_CONF_OPTS = \
 
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_LIBEPOXY),yy)
 XWAYLAND_CONF_OPTS += -Dglamor=true
-XWAYLAND_DEPENDENCIES += libepoxy
+XWAYLAND_DEPENDENCIES += libepoxy mesa3d
 else
 XWAYLAND_CONF_OPTS += -Dglamor=false
 endif
--
Quoted 2 lines

2.53.0

dri is needed by glx, not glamor, when checking the code. Did you test build this?

Quoted 2 lines

(it's easier to reproduce with a per-package build where this becomes a persistent failure rather than random)

I test-built this with per-package enabled, and it worked, but I only have Mesa providing libgl as in my build scenario, I am using either Intel or AMDGPU.

Quoted 2 lines
Quoted 8 lines
Quoted 3 lines

It should go to the LIBGL check rather than the LIB*E*GL check. But as I mentioned on v1, you probably need to check how this works when nvidia-driver is the LIBGL provider.

I'll dig a bit further into this.

adam

I managed to dig a bit myself (took much longer than anticipated), after I managed to build the nvidia driver from 2025.02.x branch I can conclude that it depends on mesa3d-headers, which also provide a dri.pc file (manually).

I haven't dug into the dependency tree, but xserver / xwayland builds fine because the dri.pc from mesa3d-headers propagates correctly. I did notice that mesa3d-headers and mesa3d conflict, so adding a depending on mesa3d if the nvidia-driver is used is broken.

The easiest way to deal with it is probably to add the mesa3d dependency if mesa3d is being built, otherwise the mesa3d-headers dependency if mesa3d-headers are being built.

Best regards // John Ernberg
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot