summaryrefslogtreecommitdiff
path: root/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
diff options
context:
space:
mode:
authorJohn Voltz <john.voltz@gmail.com>2008-03-06 18:36:12 +0000
committerJohn Voltz <john.voltz@gmail.com>2008-03-06 18:36:12 +0000
commit1a2b4af3fb5fcac12d6c9f56963d1fcc3db92b80 (patch)
tree4234e4b0b12da77755228e612841f3fb11f85a48 /package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
parenteda9b0fe87303011e8b54b01ae8ad0eca44ded0c (diff)
updated xorg to version 7.3 and added all of the fonts
Diffstat (limited to 'package/x11r7/xserver_xorg-server/xserver_xorg-server.mk')
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk24
1 files changed, 20 insertions, 4 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 2692a9bca..fbddfc568 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -4,12 +4,28 @@
#
################################################################################
-XSERVER_XORG_SERVER_VERSION = 1.2.0
+XSERVER_XORG_SERVER_VERSION = 1.4
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 = YES
+XSERVER_XORG_SERVER_AUTORECONF = NO
XSERVER_XORG_SERVER_INSTALL_STAGING = YES
-XSERVER_XORG_SERVER_DEPENDENCIES = xutil_util-macros xlib_libXfont libdrm xlib_libxkbui xproto_compositeproto xproto_damageproto xproto_fixesproto xproto_glproto xproto_kbproto xproto_randrproto freetype xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm xlib_libXrender xlib_libXres xlib_libXtst xlib_libXft xlib_libXcursor xlib_libXinerama xlib_libXrandr xlib_libXdamage xlib_libXxf86misc xlib_libXxf86vm xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto
-XSERVER_XORG_SERVER_CONF_OPT = --disable-xprint --disable-xinerama --disable-xnest --disable-xvfb --disable-dmx --disable-dri --disable-xdmcp --disable-screensaver
+XSERVER_XORG_SERVER_DEPENDENCIES = freetype xutil_util-macros xlib_libXfont libdrm xlib_libxkbui \
+ xproto_compositeproto xproto_damageproto xproto_fixesproto \
+ xproto_glproto xproto_kbproto xproto_randrproto freetype \
+ xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXScrnSaver \
+ xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm \
+ xlib_libXrender xlib_libXres xlib_libXtst xlib_libXft xlib_libXcursor \
+ xlib_libXinerama xlib_libXrandr xlib_libXdamage xlib_libXxf86misc xlib_libXxf86vm \
+ xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto \
+ xproto_evieext xproto_fontsproto xproto_inputproto xproto_recordproto xproto_renderproto \
+ xproto_resourceproto xproto_trapproto xproto_videoproto xproto_xcmiscproto \
+ xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \
+ xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \
+ pixman dbus mcookie
+
+XSERVER_XORG_SERVER_CONF_OPT = --enable-kdrive --enable-xfbdev --enable-freetype --disable-kbd_mode --disable-xorg \
+ --disable-config-hal CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1"
+
+XSERVER_XORG_SERVER_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))