diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-22 13:46:25 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-06-22 13:46:25 +0200 |
| commit | 47e110abbf0d3142d737e753833d0d6239965b2a (patch) | |
| tree | 84308904e286e4ad1136dd447175eaa7ec19ae09 /package/xorg-server | |
| parent | 7695ce447acb41050295fd205e14ba55c378cdd2 (diff) | |
fix package names and package flavour dependencies
ipkg does not allow package names with uppercase, so revert
some of phil changes.
dependency handling of package flavours were broken, because
of a chicken and egg problem. implement a new variable (PKGFS_XXX)
containing flavour dependent package dependencies.
Diffstat (limited to 'package/xorg-server')
| -rw-r--r-- | package/xorg-server/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 554f84ba3..12ee831e1 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,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+= 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 |