package/x11r7/xserver_xorg-server: bump version to 1.18.0

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 84f029828dd67119956569334fb6037b63f8f59d..e2eec5557e27b9a509e28c7c323e88264c46b487 100644 (file)
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -58,20 +58,20 @@ if BR2_PACKAGE_XSERVER_XORG_SERVER
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
        bool
 
-config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
+config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
        bool
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI
        int
        default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
-       default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
+       default 20 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
 
 choice
        bool "X Window System server version"
 
-config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
-       bool "1.17.4"
-       select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
+config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
+       bool "1.18.0"
+       select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_20
        select BR2_PACKAGE_XPROTO_PRESENTPROTO
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
@@ -82,7 +82,7 @@ endchoice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
        string
-       default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
+       default "1.18.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_18
        default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
 
 choice

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
index 0119e37a7a81c8fccf69a32cb69a1b63403b3405..72c00c402f30316e025f9bd793fe8af6d9b09309 100644 (file)
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
@@ -1,6 +1,6 @@
 # From http://lists.x.org/archives/xorg-announce/2014-June/002440.html
 sha1   7a95765e56b124758fcd7b609589e65b8870880b                                xorg-server-1.14.7.tar.bz2
 sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f        xorg-server-1.14.7.tar.bz2
-# From http://lists.x.org/archives/xorg-announce/2015-October/002650.html
-sha1   139c4d6795eb4c3848616cc514d134532975e49e                                xorg-server-1.17.4.tar.bz2
-sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457        xorg-server-1.17.4.tar.bz2
+# From http://lists.x.org/archives/xorg-announce/2015-November/002655.html
+sha1   f37f9ca17d211552c775c3ce78ff03385026bf3a                                xorg-server-1.18.0.tar.bz2
+sha256 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e        xorg-server-1.18.0.tar.bz2