NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/x11r7/xlib_libxshmfence: needs sync_4

Browse Source 
Also propagate reverse dependency to mesa3d and xserver_xorg-server.

Fixes xserver_xorg-server build
http://autobuild.buildroot.net/results/7da/7da8b46cda8786422e8293f26b79582b35a433d6/

For patch discussion refer to http://patchwork.ozlabs.org/patch/674595/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[Thomas: only select BR2_PACKAGE_XPROTO_PRESENTPROTO if
BR2_TOOLCHAIN_HAS_SYNC_4 is available, add comment explaining why.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2017-05-21 13:30:56 +02:00 committed by Thomas Petazzoni
parent 2ad8f6643d
commit 3b7af7fca9
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/mesa3d/Config.in
View File

@ -31,8 +31,15 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
config BR2_PACKAGE_MESA3D_DRI_DRIVER config BR2_PACKAGE_MESA3D_DRI_DRIVER
bool bool
select BR2_PACKAGE_MESA3D_DRIVER select BR2_PACKAGE_MESA3D_DRIVER
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO # xlib-libxshmfence needs sync_4, so we cannot select it if
select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO # BR2_TOOLCHAIN_HAS_SYNC_4 is false. xproto-presentproto
# doesn't need sync_4, but it is only needed in conjunction
# with xlib-libxshmfence and dri3proto to provide dri3
# support, so we also only select it if sync_4 is available.
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \
(BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
select BR2_PACKAGE_XPROTO_PRESENTPROTO if \
(BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
config BR2_PACKAGE_MESA3D_VULKAN_DRIVER config BR2_PACKAGE_MESA3D_VULKAN_DRIVER
bool bool

2
package/mesa3d/mesa3d.mk
View File

@ -91,7 +91,7 @@ ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
MESA3D_CONF_OPTS += \ MESA3D_CONF_OPTS += \
--without-dri-drivers --disable-dri3 --without-dri-drivers --disable-dri3
else else
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_XPROTO_DRI3PROTO),yy)
MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto
MESA3D_CONF_OPTS += --enable-dri3 MESA3D_CONF_OPTS += --enable-dri3
else else

1
package/x11r7/xlib_libxshmfence/Config.in
View File

@ -1,5 +1,6 @@
config BR2_PACKAGE_XLIB_LIBXSHMFENCE config BR2_PACKAGE_XLIB_LIBXSHMFENCE
bool "libxshmfence" bool "libxshmfence"
depends on BR2_TOOLCHAIN_HAS_SYNC_4
select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XPROTO_XPROTO
help help
X.Org shmfence library X.Org shmfence library

3
package/x11r7/xserver_xorg-server/Config.in
View File

@ -114,7 +114,8 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \ select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \
BR2_PACKAGE_XPROTO_DRI2PROTO) BR2_PACKAGE_XPROTO_DRI2PROTO)
select BR2_PACKAGE_LIBPCIACCESS select BR2_PACKAGE_LIBPCIACCESS
select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \
(BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
help help
This variant of the X.org server is the full-blown variant, This variant of the X.org server is the full-blown variant,
as used by desktop GNU/Linux distributions. The drivers (for as used by desktop GNU/Linux distributions. The drivers (for

2
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
View File

@ -220,7 +220,7 @@ XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri2
else else
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2 XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2
endif endif
ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_XPROTO_DRI3PROTO),yy)
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3 XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yy) ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yy)