diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-23 14:42:56 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-09-23 14:46:14 +0200 |
| commit | ce8315ee97f10b7e1a677c7862a7aae5da294b32 (patch) | |
| tree | 5de6de7823989f82136fbcf8b270f1ae88d706ea | |
| parent | 5805f406dc42f86ecf1c3970176f58b05d1cc332 (diff) | |
xorg-server: disable dri choice, not compilable without dri
| -rw-r--r-- | package/xorg-server/Makefile | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 8968c4524..41c1e7746 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -18,7 +18,7 @@ PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman PKG_BUILDDEP+= libpciaccess xf86dgaproto recordproto -PKG_BUILDDEP+= xineramaproto presentproto +PKG_BUILDDEP+= xineramaproto presentproto xf86driproto glproto mesa PKG_NEEDS:= threads rt c++ PKG_URL:= http://www.x.org/ PKG_SITES:= http://www.x.org/releases/individual/xserver/ @@ -28,10 +28,7 @@ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC -PKG_FLAVOURS_XORG_SERVER:= WITH_DRI WITH_KDRIVE -PKGFS_WITH_DRI:= mesa -PKGFD_WITH_DRI:= enable dri support -PKGFB_WITH_DRI:= xf86driproto glproto mesa +PKG_FLAVOURS_XORG_SERVER:= WITH_KDRIVE PKGFD_WITH_KDRIVE:= build kdrive xfbdev server PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_LIBRESSL WITH_OPENSSL @@ -82,6 +79,10 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-xvmc \ --disable-selective-werror \ --disable-strict-compilation \ + --enable-dri \ + --enable-dri2 \ + --enable-dri3 \ + --enable-glx \ --with-xkb-output=/tmp \ --with-os-vendor=OpenADK \ --with-vendor-web="http://openadk.org" @@ -92,12 +93,6 @@ else CONFIGURE_ARGS+= --disable-kdrive --disable-xfbdev endif -ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) -CONFIGURE_ARGS+= --enable-dri --enable-dri2 --enable-dri3 --enable-glx -else -CONFIGURE_ARGS+= --disable-dri --disable-dri2 --disable-dri3 --disable-glx -endif - ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) CONFIGURE_ARGS+= --with-int10=stub endif |