[Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-fbturbo: needs dri2 for libump

[Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-fbturbo: needs dri2 for libump

[Bernd Kuhls]

xdriver_xf86-video-fbturbo has an optional dependency to libump
currently not handled by buildroot:
https://github.com/ssvb/xf86-video-fbturbo/blob/master/configure.ac#L91

If libump was compiled incidentally before xdriver_xf86-video-fbturbo
sunxi_mali_ump_dri2.c is compiled which depends on dri2:
https://github.com/ssvb/xf86-video-fbturbo/blob/master/src/Makefile.am#L59

This patch adds a dependency for dri2proto to enable dri2 support in
X.org and adds libump as dependency for a reproducable build to fix
http://autobuild.buildroot.net/results/656/656520682a5ac6fe5e1e741e1a92b1eab4245f2d/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/x11r7/xdriver_xf86-video-fbturbo/Config.in                    | 1 +
 .../x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk    | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/package/x11r7/xdriver_xf86-video-fbturbo/Config.in b/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
index 8fec5c2..7825901 100644
--- a/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
+++ b/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBTURBO
 	bool "xf86-video-fbturbo"
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_PIXMAN
+	select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_LIBUMP
 	select BR2_PACKAGE_XPROTO_FONTSPROTO
 	select BR2_PACKAGE_XPROTO_RANDRPROTO
 	select BR2_PACKAGE_XPROTO_RENDERPROTO
diff --git a/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk b/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
index b2053d3..b67630d 100644
--- a/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
+++ b/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
@@ -26,6 +26,10 @@ else
 XDRIVER_XF86_VIDEO_FBTURBO_CONF_OPTS += --disable-pciaccess
 endif
 
+ifeq ($(BR2_PACKAGE_LIBUMP),y)
+XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += libump
+endif
+
 define XDRIVER_XF86_VIDEO_FBTURBO_INSTALL_CONF_FILE
 	$(INSTALL) -m 0644 -D $(@D)/xorg.conf $(TARGET_DIR)/etc/X11/xorg.conf
 endef
-- 
2.8.1

[Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-fbturbo: needs dri2 for libump

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > xdriver_xf86-video-fbturbo has an optional dependency to libump
 > currently not handled by buildroot:
 > https://github.com/ssvb/xf86-video-fbturbo/blob/master/configure.ac#L91

 > If libump was compiled incidentally before xdriver_xf86-video-fbturbo
 > sunxi_mali_ump_dri2.c is compiled which depends on dri2:
 > https://github.com/ssvb/xf86-video-fbturbo/blob/master/src/Makefile.am#L59

 > This patch adds a dependency for dri2proto to enable dri2 support in
 > X.org and adds libump as dependency for a reproducable build to fix
 > http://autobuild.buildroot.net/results/656/656520682a5ac6fe5e1e741e1a92b1eab4245f2d/

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
 > ---
 >  package/x11r7/xdriver_xf86-video-fbturbo/Config.in                    | 1 +
 >  .../x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk    | 4 ++++
 >  2 files changed, 5 insertions(+)

 > diff --git a/package/x11r7/xdriver_xf86-video-fbturbo/Config.in b/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
 > index 8fec5c2..7825901 100644
 > --- a/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
 > +++ b/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
 > @@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBTURBO
 >  	bool "xf86-video-fbturbo"
 >  	select BR2_PACKAGE_LIBDRM
 >  	select BR2_PACKAGE_PIXMAN
 > +	select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_LIBUMP
 >  	select BR2_PACKAGE_XPROTO_FONTSPROTO
 >  	select BR2_PACKAGE_XPROTO_RANDRPROTO
 >  	select BR2_PACKAGE_XPROTO_RENDERPROTO
 > diff --git a/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk b/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
 > index b2053d3..b67630d 100644
 > --- a/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
 > +++ b/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
 > @@ -26,6 +26,10 @@ else
 >  XDRIVER_XF86_VIDEO_FBTURBO_CONF_OPTS += --disable-pciaccess
 >  endif
 
 > +ifeq ($(BR2_PACKAGE_LIBUMP),y)
 > +XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += libump
 > +endif

We should also ensure dri2proto gets built before fbturbo, so I've added
it to _DEPENDENCIES as well and committed, thanks.

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/1] package/x11r7/xdriver_xf86-video-fbturbo: needs dri2 for libump

[Bernd Kuhls]

[posted and mailed]

Hi Peter,

Peter Korsgaard <peter@korsgaard.com> wrote in
news:87y46quffx.fsf at dell.be.48ers.dk: 

> > +ifeq ($(BR2_PACKAGE_LIBUMP),y)
> > +XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += libump
> > +endif
> 
> We should also ensure dri2proto gets built before fbturbo, so I've added
> it to _DEPENDENCIES as well and committed, thanks.

imho this was not necessary, xdriver_xf86-video-fbturbo depends on the
modular xserver_xorg-server 

https://git.busybox.net/buildroot/tree/package/x11r7/Config.in#n147
https://git.busybox.net/buildroot/tree/package/x11r7/Config.in#n164

which already takes care of dri2proto:

https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xs
erver_xorg-server.mk#n207 

ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri2

Regards, Bernd