Skip to contentSkip to conversation

package/x11r7/xserver_xorg-server: add --enable-libdrm for udev

PATCH New Gustavo Zacarias 2 participants 3 messages Mar 31, 2015

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: add --enable-libdrm for udev

If the libdrm package is enabled, the system is built with an udev provider and MESA3D_DRI_DRIVER is disabled this adds a --disable-libdrm to configure options, but udev still requires libdrm and results in a build failure since libdrm include paths aren't filled in (missing drm.h include error).
So add --enable-libdrm for the udev scenario to counteract the previous --disable-libdrm.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1 -1
index bb5381c..30b7b38 100644
@@ -126,7 +126,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += udev
-XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev --enable-libdrm
 # udev kms support depends on libdrm
 ifeq ($(BR2_PACKAGE_LIBDRM),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += libdrm
Signature · 1 line
2.0.5
#1 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: add --enable-libdrm for udev

Dear Gustavo Zacarias,

Quoted 18 lines · Gustavo Zacarias

If the libdrm package is enabled, the system is built with an udev provider and MESA3D_DRI_DRIVER is disabled this adds a --disable-libdrm to configure options, but udev still requires libdrm and results in a build failure since libdrm include paths aren't filled in (missing drm.h include error).
So add --enable-libdrm for the udev scenario to counteract the previous --disable-libdrm.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +0 -0
index bb5381c..30b7b38 100644

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk endif · line 129

Quoted 5 lines
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +1 -1
@@ -126,7 +126,7 @@ endif
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += udev
-XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev --enable-libdrm

Shouldn't this...

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk endif · line 132

Quoted 3 lines
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +0 -0
 # udev kms support depends on libdrm
 ifeq ($(BR2_PACKAGE_LIBDRM),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += libdrm

be in this if condition, to make sure libdrm is indeed available?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: add --enable-libdrm for udev

Quoted 7 lines · Thomas Petazzoni

Shouldn't this...

Quoted 3 lines
 # udev kms support depends on libdrm
 ifeq ($(BR2_PACKAGE_LIBDRM),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += libdrm

be in this if condition, to make sure libdrm is indeed available?

Oh yes, fixing too many things at once ;)
I'll send v2.
Regards.