diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:49:34 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-06-04 19:49:34 +0200 |
commit | 8a2754e0fbdea7497281327f2896be2a1253a107 (patch) | |
tree | bc7c400745fde54e6fb7a010fcb026258564d3bc /package/xorg-server | |
parent | 9bd4456c5a83c3474fdf9fe5cf14004a0874e2c8 (diff) | |
parent | 2d3aaf1664850031f5497e121dc82ab65f63641a (diff) |
Merge branch 'master' of ssh://openadk.org/git/openadk
Diffstat (limited to 'package/xorg-server')
-rw-r--r-- | package/xorg-server/Config.in | 5 | ||||
-rw-r--r-- | package/xorg-server/Makefile | 44 |
2 files changed, 38 insertions, 11 deletions
diff --git a/package/xorg-server/Config.in b/package/xorg-server/Config.in index b3dc66880..23dfc56a8 100644 --- a/package/xorg-server/Config.in +++ b/package/xorg-server/Config.in @@ -2,6 +2,10 @@ config ADK_PACKAGE_XORG_SERVER prompt "xorg-server............................... X server" tristate default n + select ADK_PACKAGE_XKBCOMP + select ADK_PACKAGE_LIBXV + select ADK_PACKAGE_XKEYBOARD_CONFIG + select ADK_PACKAGE_LIBOPENSSL select ADK_PACKAGE_LIBXKBFILE select ADK_PACKAGE_LIBX11 select ADK_PACKAGE_LIBICE @@ -17,5 +21,6 @@ config ADK_PACKAGE_XORG_SERVER select ADK_PACKAGE_LIBXT select ADK_PACKAGE_PIXMAN select ADK_PACKAGE_XF86DGA + select ADK_PACKAGE_LIBXXF86DGA help http://www.x.org diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 9dd2ed8ec..935195bdb 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -1,5 +1,3 @@ -# $Id$ -#- # This file is part of the OpenADK project. OpenADK is copyrighted # material, please see the LICENCE file in the top-level directory. @@ -11,28 +9,52 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 7aca5d0dc8b824d3dff6140e381e03df PKG_DESCR:= Xorg server PKG_SECTION:= x11 +PKG_DEPENDS:= libopenssl PKG_URL:= http://www.x.org PKG_SITES:= ${MASTER_SITE_XORG} include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,XORG_SERVER,xorg-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --disable-xinerama \ +CONFIGURE_ARGS+= \ + --enable-builtin-fonts \ + --enable-dga \ + --enable-xorg \ + --enable-xv \ + --disable-afb \ --disable-aiglx \ - --disable-dga \ + --disable-cfb \ + --disable-config-hal \ + --disable-cup \ + --disable-evi \ + --disable-dpms \ --disable-dri \ + --disable-dri2 \ + --disable-freetype \ --disable-glx \ - --disable-xnest \ - --disable-config-hal \ - --disable-xvfb \ + --disable-kdrive-vesa \ --disable-mfb \ - --disable-cfb \ - --disable-afb \ + --disable-xace \ --disable-xephyr \ + --disable-xevie \ + --disable-xf86bigfont \ + --disable-xf86misc \ + --disable-xf86vidmode \ + --disable-xfake \ + --disable-xfbdev \ + --disable-xinerama \ + --disable-xnest \ + --disable-xprint \ --disable-xsdl \ - --enable-builtin-fonts + --disable-xselinux \ + --disable-xcsecurity \ + --disable-xvfb \ + --disable-xvmc \ + --with-xkb-output=/tmp \ + --with-os-vendor=OpenADK \ + --with-vendor-web="http://www.openadk.org" BUILD_STYLE= auto INSTALL_STYLE= auto |