diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-16 13:10:39 +0200 |
| commit | 9a625cd021c2d087a988699dcfc3e512fa163235 (patch) | |
| tree | 2fbdefdee370f2cd2c5ee76ec62b9dd9b65cbd9c /package/xorg-server/Makefile | |
| parent | afab289b265ff987c3f62393b3ef707c2650704f (diff) | |
| parent | 4422cda575db22275b067e07ad4b585572d91756 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
mk/kernel-build.mk
package/expat/Makefile
package/gettext/Makefile
package/perl/Makefile
package/zlib/Makefile
Diffstat (limited to 'package/xorg-server/Makefile')
| -rw-r--r-- | package/xorg-server/Makefile | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index cf009036e..351d96371 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -9,27 +9,24 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2 PKG_DESCR:= Xorg server PKG_SECTION:= x11/server -PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile \ - libfontenc xkeyboard-config xkbcomp libxau libxaw \ - libxmu libxpm libxrender libxt libxxf86dga libxext \ - libxdmcp libxv libsm libice libx11 -PKG_BUILDDEP+= libX11 randrproto renderproto fixesproto damageproto \ - scrnsaverproto resourceproto fontsproto videoproto \ - compositeproto evieext libxkbfile libXfont pixman \ - libpciaccess openssl xf86dgaproto -ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y) -PKG_BUILDDEP+= xf86driproto glproto dri2proto MesaLib -endif -PKG_URL:= http://www.x.org +PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile +PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw +PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext +PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 +PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto +PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto +PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman +PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto +PKG_URL:= http://www.x.org/ PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/ PKG_TARGET_DEPENDS:= !foxboard - -CFLINE_XORG_SERVER:= depends on ADK_TARGET_WITH_VGA +PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA PKG_FLAVOURS:= WITH_DRI PKGFS_WITH_DRI:= mesalib PKGFD_WITH_DRI:= enable DRI/DRI2 support +PKGFB_WITH_DRI:= xf86driproto glproto dri2proto MesaLib include $(TOPDIR)/mk/package.mk |