summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2015-04-21 19:04:38 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-04-26 22:24:10 +0200
commit2ac79a9fb50fba532b8c82bb1a78632f6f181ed8 (patch)
treee89f314d4b7520b87b9f4a8aca63747f73902ba7
parentaa83978b1fdc20ba06e7cb8249227bb3e6c76f0f (diff)
downloadbuildroot-2ac79a9fb50fba532b8c82bb1a78632f6f181ed8.tar.gz
buildroot-2ac79a9fb50fba532b8c82bb1a78632f6f181ed8.zip
package/xserver_xorg-server: make the version a choice
Only a single entry for now, but we'll add one more in an upcoming patch, to support old binary-only drivers, like the NVidia Tegra2/3 drivers. [Thomas: - rename option from BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17_1 to BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17, since we don't want to rename the option at each minor release of the X.org server, and X.org servers with the same major version will not have a different ABI.] 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>
-rw-r--r--package/x11r7/xserver_xorg-server/Config.in12
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk2
2 files changed, 13 insertions, 1 deletions
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 1123f3b740..48ccf514da 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -57,6 +57,18 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
if BR2_PACKAGE_XSERVER_XORG_SERVER
choice
+ bool "X Window System server version"
+
+config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
+ bool "1.17.1"
+
+endchoice
+
+config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
+ string
+ default "1.17.1" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
+
+choice
prompt "X Window System server type"
default BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
help
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index f120becce2..d08197de13 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XSERVER_XORG_SERVER_VERSION = 1.17.1
+XSERVER_XORG_SERVER_VERSION = $(call qstrip,$(BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION))
XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.bz2
XSERVER_XORG_SERVER_SITE = http://xorg.freedesktop.org/releases/individual/xserver
XSERVER_XORG_SERVER_LICENSE = MIT
OpenPOWER on IntegriCloud