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

package/xserver_xorg-server: not all versions need all dependencies

Browse Source 
Support for the Present protocol has been added to, and is mandatory
since version 1.15.

As we're on the verge of adding 1.14.7, we need to make Present a
version-specific dependency.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2015-04-21 19:04:40 +02:00 committed by Thomas Petazzoni
parent f353fbd2bf
commit 5696eb080b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_GLPROTO
select BR2_PACKAGE_XPROTO_INPUTPROTO
select BR2_PACKAGE_XPROTO_KBPROTO
select BR2_PACKAGE_XPROTO_PRESENTPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
select BR2_PACKAGE_XPROTO_RESOURCEPROTO
@ -69,6 +68,7 @@ choice
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
bool "1.17.1"
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
select BR2_PACKAGE_XPROTO_PRESENTPROTO
endchoice

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

@ -38,7 +38,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xproto_glproto \
xproto_inputproto \
xproto_kbproto \
xproto_presentproto \
xproto_randrproto \
xproto_renderproto \
xproto_resourceproto \
@ -75,6 +74,12 @@ XSERVER_XORG_SERVER_CONF_OPTS += \
--disable-systemd-logind
endif
# Present protocol only required for xserver 1.15+, but does not matter if
# enabled for older versions as they don't use it (not even optionally).
ifeq ($(BR2_PACKAGE_XPROTO_PRESENTPROTO),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xproto_presentproto
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess