diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-03-08 14:12:33 +0100 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-03-08 14:12:33 +0100 |
| commit | 3244ba1bcf5c196c922463b5020050092facecba (patch) | |
| tree | 6cea1647fb75c45d0222f61c2772e57a41465d14 /package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | |
| parent | 73f244d59483dd9dcddf29cb6c92d9bcdc6f7898 (diff) | |
| parent | 3437f2bee3e2adf58eb690e9ff7c493e683d43fa (diff) | |
| download | buildroot-novena-3244ba1bcf5c196c922463b5020050092facecba.tar.gz buildroot-novena-3244ba1bcf5c196c922463b5020050092facecba.zip | |
Merge branch 'x11r75' of git://gitorious.org/takeme-buildroot/takeme-buildroot
Diffstat (limited to 'package/x11r7/xserver_xorg-server/xserver_xorg-server.mk')
| -rw-r--r-- | package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index e9d5f36b2..950c2ca23 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,10 +4,11 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 1.5.3 +XSERVER_XORG_SERVER_VERSION = 1.7.1 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_AUTORECONF = NO +XSERVER_XORG_SERVER_LIBTOOL_PATCH = NO XSERVER_XORG_SERVER_INSTALL_STAGING = YES XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO # overrides CFLAGS XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data @@ -31,7 +32,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ xlib_libXdamage \ xlib_libXxf86misc \ xlib_libXxf86vm \ - xlib_liblbxutil \ xlib_libxkbfile \ xlib_xtrans \ xdata_xbitmaps \ @@ -124,5 +124,9 @@ XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto XSERVER_XORG_SERVER_CONF_OPT += --enable-record endif +ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y) +XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto +XSERVER_XORG_SERVER_CONF_OPT += --enable-dri2 +endif $(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server)) |