Skip to contentSkip to conversation

package/x11r7/xwayland: add mesa3d ordering dependency

PATCH In review Adam Ford 2 participants 2 messages Jul 16

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 package/x11r7/xwayland: add mesa3d ordering dependency

Xwayland's glamor/DRI configure check 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

Add mesa3d to XWAYLAND_DEPENDENCIES when it is enabled.

package/x11r7/xwayland/xwayland.mk +8 -0
index 2b8513602c..bce9a572ab 100644
@@ -30,6 +30,14 @@ XWAYLAND_CONF_OPTS = \
 	-Ddtrace=false \
 	-Ddocs=false
 
+# Xwayland's glamor/DRI configure check needs 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
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+XWAYLAND_DEPENDENCIES += mesa3d
+endif
+
 ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_LIBEPOXY),yy)
 XWAYLAND_CONF_OPTS += -Dglamor=true
 XWAYLAND_DEPENDENCIES += libepoxy
Signature · 6 lines
2.53.0

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

Hi Adam,

Quoted 16 lines · Adam Ford

Xwayland's glamor/DRI configure check 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

Add mesa3d to XWAYLAND_DEPENDENCIES when it is enabled.

package/x11r7/xwayland/xwayland.mk +0 -0
index 2b8513602c..bce9a572ab 100644

package/x11r7/xwayland/xwayland.mk XWAYLAND_CONF_OPTS = \ · line 39

Quoted 10 lines
package/x11r7/xwayland/xwayland.mk +7 -0
@@ -30,6 +30,14 @@ XWAYLAND_CONF_OPTS = \
        -Ddtrace=false \
        -Ddocs=false
 
+# Xwayland's glamor/DRI configure check needs 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
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+XWAYLAND_DEPENDENCIES += mesa3d
+endif

I found this problem as well but haven't succeeded making a valid patch for it yet.
xwayland only needs dri when glx=true.
Should the check be closer to there to make it clearer that they are connected? Maybe even inside the HAS_GL check?

However, I can't seem to find any other of the HAS_LIBGL providers that produce a dri.pc, such as libglvnd, which conflicts with mesa3d libgl provisions. (I wasn't able to build nvidia-driver last I tried, so I don't know if they have a dri.pc)

Should mesa3d always be selected by xwayland?

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