| Message ID | 20200410123207.3145145-2-bernd.kuhls@t-online.de |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [1/2] package/x11r7/xdriver_xf86-video-amdgpu: needs opengl | expand |
Am Fri, 10 Apr 2020 14:32:07 +0200 schrieb Bernd Kuhls: > Copy glamor dependencies from xserver_xorg-server omitting libgl/libegl > because this package already depends on both options: > https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg- server/xserver_xorg-server.mk#n192 > > Fixes: > http://autobuild.buildroot.net/results/4da/ 4da87d30e6f5a10aafae60abce1b89ed92204a4e/ > http://autobuild.buildroot.net/results/74c/ 74ceb71bd48ea3a2bf6ff68aec0af76a11662f1f/ Hi, this patch series[1] is still needed: http://autobuild.buildroot.net/results/ 541/54193d198efe371bdb19ac4981d631ff1e279717// Regards, Bernd [1] http://patchwork.ozlabs.org/project/buildroot/list/?series=169608
On 10/04/2020 14:32, Bernd Kuhls wrote: > Copy glamor dependencies from xserver_xorg-server omitting libgl/libegl > because this package already depends on both options: > https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n192 > > Fixes: > http://autobuild.buildroot.net/results/4da/4da87d30e6f5a10aafae60abce1b89ed92204a4e/ > http://autobuild.buildroot.net/results/74c/74ceb71bd48ea3a2bf6ff68aec0af76a11662f1f/ > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > .../xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk > index e7196956a3..ccb5b30d90 100644 > --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk > +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk > @@ -15,6 +15,12 @@ XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \ > xorgproto \ > xserver_xorg-server > > +ifeq ($(BR2_PACKAGE_LIBEPOXY),y) libepoxy is already select'ed in Config.in, so this condition is useless. Thus, this patch does exactly nothing since glamor is always enabled. But I guess the select could be removed from Config.in? I thought that maybe the issue was that libepoxy has to be added to _DEPENDS, but in fact, in the autobuild failures libepoxy is already built before this package (indirect dependency through xorg-server). So I'm not sure how this really should be fixed... BTW, the issue is still happening in autobuilders [1], just very very rarely (once every 4 months or so). Regards, Arnout [1] http://autobuild.buildroot.net/?reason=xdriver_xf86-video-amdgpu%25 > +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --enable-glamor > +else > +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --disable-glamor > +endif > + > # xdriver_xf86-video-amdgpu requires O_CLOEXEC > XDRIVER_XF86_VIDEO_AMDGPU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" > >
diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index e7196956a3..ccb5b30d90 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -15,6 +15,12 @@ XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \ xorgproto \ xserver_xorg-server +ifeq ($(BR2_PACKAGE_LIBEPOXY),y) +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --enable-glamor +else +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS = --disable-glamor +endif + # xdriver_xf86-video-amdgpu requires O_CLOEXEC XDRIVER_XF86_VIDEO_AMDGPU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
Copy glamor dependencies from xserver_xorg-server omitting libgl/libegl because this package already depends on both options: https://git.buildroot.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n192 Fixes: http://autobuild.buildroot.net/results/4da/4da87d30e6f5a10aafae60abce1b89ed92204a4e/ http://autobuild.buildroot.net/results/74c/74ceb71bd48ea3a2bf6ff68aec0af76a11662f1f/ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- .../xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk | 6 ++++++ 1 file changed, 6 insertions(+)