[Buildroot] [git commit] package/xserver_xorg-server: not all versions need all dependencies
Thomas Petazzoni
thomas.petazzoni at free-electrons.com
Sun Apr 26 20:24:10 UTC 2015
commit: http://git.buildroot.net/buildroot/commit/?id=5696eb080b7519f40b654c13747262453d6c4857
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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 at free.fr>
Cc: Gustavo Zacarias <gustavo at zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
package/x11r7/xserver_xorg-server/Config.in | 2 +-
.../xserver_xorg-server/xserver_xorg-server.mk | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index c578528..2fccef6 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -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
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index d08197d..79d663c 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -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
More information about the buildroot
mailing list