summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Wagner <will_wagner@carallon.com>2012-06-14 20:26:52 (GMT)
committer Jesper Baekdahl <jbb@gamblify.com>2013-03-20 14:11:02 (GMT)
commit5a5bc044d1bf8d7a1d287a3b3b88800cc5f7d813 (patch)
treea364af848754ab3ebbb7dce0e093dc514d543b3e
parenta793ff0aa467daa3f057a091e80513f6f956dc1b (diff)
downloadbuildroot-5a5bc044d1bf8d7a1d287a3b3b88800cc5f7d813.tar.gz
buildroot-5a5bc044d1bf8d7a1d287a3b3b88800cc5f7d813.tar.bz2
xserver_xorg-server: bump revision to X11R7.7
Signed-off-by: Will Wagner <will_wagner@carallon.com>
-rw-r--r--package/x11r7/xserver_xorg-server/Config.in1
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk3
2 files changed, 1 insertions, 3 deletions
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 21b0700..c860a1d 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -45,7 +45,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
select BR2_PACKAGE_XPROTO_XF86DGAPROTO
select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_MESA3D
- select BR2_PACKAGE_XPROTO_XF86RUSHPROTO
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XUTIL_UTIL_MACROS
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 140cb8b..f0b19aa 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.9.4
+XSERVER_XORG_SERVER_VERSION = 1.12.2
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_MAKE = $(MAKE1) # make install fails with parallel make
@@ -46,7 +46,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xproto_xextproto \
xproto_xf86bigfontproto \
xproto_xf86dgaproto \
- xproto_xf86rushproto \
xproto_xf86vidmodeproto \
xproto_xproto \
xkeyboard-config \