diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-20 21:14:22 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-20 21:14:22 +0200 |
| commit | 7695ce447acb41050295fd205e14ba55c378cdd2 (patch) | |
| tree | 08ae0b84457071688c45f72a49150c4807006c33 /package/xorg-server | |
| parent | 9cef6f4deb8f736d63bb41dc7e34793ad60db482 (diff) | |
| parent | 19d35b947f30b2b3ac98ff039832ae46df7fee8c (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 5ec3e3aff..554f84ba3 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2 PKG_DESCR:= Xorg server PKG_SECTION:= x11 PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \ - libfontenc xkeyboard-config xkbcomp libxau libxaw \ + libfontenc xkeyboard-config xkbcomp libxau libXaw \ libxmu libxpm libxrender libxt libxxf86dga libxext \ libxdmcp libxv libsm libice libx11 PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \ @@ -19,7 +19,7 @@ PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \ libpciaccess openssl xf86dgaproto ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) PKG_BUILDDEP+= xf86driproto glproto dri2proto MesaLib -PKG_DEPENDS+= xf86driproto glproto dri2proto mesalib +PKG_DEPENDS+= mesalib endif PKG_URL:= http://www.x.org PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/ @@ -46,7 +46,6 @@ CONFIGURE_ARGS+= \ --enable-dpms \ --disable-aiglx \ --disable-config-hal \ - --disable-glx \ --disable-xace \ --disable-xephyr \ --disable-xf86bigfont \ @@ -65,9 +64,9 @@ CONFIGURE_ARGS+= \ --with-vendor-web="http://openadk.org" ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) -CONFIGURE_ARGS+= --enable-dri --enable-dri2 +CONFIGURE_ARGS+= --enable-dri --enable-dri2 --enable-glx else -CONFIGURE_ARGS+= --disable-dri --disable-dri2 +CONFIGURE_ARGS+= --disable-dri --disable-dri2 --disable-glx endif ifeq (${ADK_LINUX_MIPS64_LEMOTE},y) |