diff options
Diffstat (limited to 'package/xorg-server/Makefile')
| -rw-r--r-- | package/xorg-server/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 02aa8f520..cf009036e 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -19,7 +19,6 @@ 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 endif PKG_URL:= http://www.x.org PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/ @@ -29,6 +28,7 @@ PKG_TARGET_DEPENDS:= !foxboard CFLINE_XORG_SERVER:= depends on ADK_TARGET_WITH_VGA PKG_FLAVOURS:= WITH_DRI +PKGFS_WITH_DRI:= mesalib PKGFD_WITH_DRI:= enable DRI/DRI2 support include $(TOPDIR)/mk/package.mk @@ -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) @@ -79,11 +78,12 @@ post-install: $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions - $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts + $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia ${CP} ${WRKINST}/usr/lib/xorg/protocol.txt \ $(IDIR_XORG_SERVER)/usr/lib/xorg/ ${CP} ${WRKINST}/usr/bin/* $(IDIR_XORG_SERVER)/usr/bin + chmod u+s $(IDIR_XORG_SERVER)/usr/bin/Xorg ${CP} ${WRKINST}/usr/lib/xorg/modules/*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \ |