From 2ac79a9fb50fba532b8c82bb1a78632f6f181ed8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 21 Apr 2015 19:04:38 +0200 Subject: [PATCH] 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" Cc: Gustavo Zacarias Signed-off-by: Thomas Petazzoni --- package/x11r7/xserver_xorg-server/Config.in | 12 ++++++++++++ .../x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) 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 @@ -56,6 +56,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 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 -- 2.30.2