diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-24 23:46:38 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-03-24 23:46:38 +0100 |
| commit | 035b405414af3c920e6b0f874fa17fdbd2fdb5a2 (patch) | |
| tree | 39f10ebe3b35f92724613bf22953726e721ea1fb /package/x11r7/xserver_xorg-server | |
| parent | be8e32d585f38cb5527fa65c53bf23fba025c62c (diff) | |
| parent | 96182fac06916e642184da40a1b3589d6aa293dd (diff) | |
| download | buildroot-novena-035b405414af3c920e6b0f874fa17fdbd2fdb5a2.tar.gz buildroot-novena-035b405414af3c920e6b0f874fa17fdbd2fdb5a2.zip | |
Merge branch 'x11r77_v2' of https://bitbucket.org/baekdahl/buildroot
Diffstat (limited to 'package/x11r7/xserver_xorg-server')
| -rw-r--r-- | package/x11r7/xserver_xorg-server/Config.in | 1 | ||||
| -rw-r--r-- | package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 3 |
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 21b07009a..c860a1d9a 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 140cb8b7f..f0b19aad3 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 \ |