diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:05:10 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-12 21:05:10 +0200 |
| commit | 6c2bc15eb5c40548f6a98c37ab0b825b9c163343 (patch) | |
| tree | f002fe1b2c355f06627c9757dc9fc30c71435f43 /package/xorg-server/Makefile | |
| parent | decf972fcbb3b42947f8778222877ab1663ef04b (diff) | |
| parent | e095941418bffcb4f2afc03072eb1f045e39ed9d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/xorg-server/Makefile')
| -rw-r--r-- | package/xorg-server/Makefile | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index f953d434f..063fa92e7 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -22,14 +22,17 @@ PKG_SITES:= ${MASTER_SITE_XORG} PKG_NEED_CXX:= 1 PKG_SUBPKGS:= XORG_SERVER XORG_SERVER_DEV +PKGSD_XORG_SERVER_DEV:= Xorg server development files +PKGSC_XORG_SERVER_DEV:= x11/devel PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA PKG_ARCH_DEPENDS:= !cris -PKG_FLAVOURS_XORG_SERVER:= WITH_DRI +PKG_FLAVOURS_XORG_SERVER:= WITH_DRI WITH_KDRIVE PKGFS_WITH_DRI:= mesalib PKGFD_WITH_DRI:= enable DRI/DRI2 support PKGFB_WITH_DRI:= xf86driproto glproto dri2proto MesaLib +PKGFD_WITH_KDRIVE:= Build Kdrive Xfbdev server PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_CRYPTO PKGCD_WITH_GCRYPT:= use libgcrypt for SHA1 @@ -42,7 +45,7 @@ PKGCB_WITH_CRYPTO:= openssl include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,XORG_SERVER_DEV,${PKG_NAME}-dev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_XORG_SERVER_DEV},${PKGSC_XORG_SERVER_DEV})) ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_GCRYPT},y) CONFIGURE_ARGS+= --with-sha1=libgcrypt @@ -67,7 +70,6 @@ CONFIGURE_ARGS+= --enable-dga \ --disable-xf86bigfont \ --disable-xf86vidmode \ --disable-xfake \ - --disable-xfbdev \ --disable-xinerama \ --disable-xnest \ --disable-xselinux \ @@ -78,6 +80,12 @@ CONFIGURE_ARGS+= --enable-dga \ --with-os-vendor=OpenADK \ --with-vendor-web="http://openadk.org" +ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_KDRIVE},y) +CONFIGURE_ARGS+= --enable-kdrive --enable-xfbdev --enable-kdrive-kbd --enable-kdrive-mouse --enable-kdrive-evdev +else +CONFIGURE_ARGS+= --disable-kdrive --disable-xfbdev +endif + ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) CONFIGURE_ARGS+= --enable-dri --enable-dri2 --enable-glx else @@ -107,6 +115,10 @@ ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y) ${CP} ./files/xorg.conf.lemote-yeelong \ $(IDIR_XORG_SERVER)/etc/X11/xorg.conf endif +ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y) + ${CP} ./files/xorg.conf.sharp-zaurus \ + $(IDIR_XORG_SERVER)/etc/X11/xorg.conf +endif ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \ $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions |