[Buildroot] [PATCH] package/x11r7/xserver_xorg-server: add --enable-libdrm for udev

[Buildroot] [PATCH] package/x11r7/xserver_xorg-server: add --enable-libdrm for udev

[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 <gustavo@zacarias.com.ar>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index bb5381c..30b7b38 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -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
-- 
2.0.5

[Buildroot] [PATCH] package/x11r7/xserver_xorg-server: add --enable-libdrm for udev

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Tue, 31 Mar 2015 12:24:53 -0300, Gustavo Zacarias wrote:
> 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 <gustavo@zacarias.com.ar>
> ---
>  package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> index bb5381c..30b7b38 100644
> --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> @@ -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...

>  # 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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH] package/x11r7/xserver_xorg-server: add --enable-libdrm for udev

[Gustavo Zacarias]

On 03/31/2015 12:47 PM, Thomas Petazzoni wrote:

> Shouldn't this...
> 
>>  # 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.

[Buildroot] [PATCH] package/x11r7/xserver_xorg-server: add --enable-libdrm for udev

[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 <gustavo@zacarias.com.ar>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index bb5381c..d9f36fc 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -130,7 +130,7 @@ XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev
 # udev kms support depends on libdrm
 ifeq ($(BR2_PACKAGE_LIBDRM),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += libdrm
-XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms --enable-libdrm
 else
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms
 endif
-- 
2.0.5

[Buildroot] [PATCH] package/x11r7/xserver_xorg-server: add --enable-libdrm for udev

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Tue, 31 Mar 2015 12:50:30 -0300, Gustavo Zacarias wrote:
> 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 <gustavo@zacarias.com.ar>
> ---
>  package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks. You forgot PATCH v2 and a changelog, though :)

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com