diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-07 17:42:13 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 17:04:31 +0100 |
| commit | f7fb209cd447418e72c421ab473c35430ee46893 (patch) | |
| tree | fa51105829750e3094b278b8cd81c3c91e6e4c2a /meta/recipes-graphics | |
| parent | 4499728e5ec94783ab44d302a871d44ae0a2e2d3 (diff) | |
| download | openembedded-core-f7fb209cd447418e72c421ab473c35430ee46893.tar.gz openembedded-core-f7fb209cd447418e72c421ab473c35430ee46893.tar.bz2 openembedded-core-f7fb209cd447418e72c421ab473c35430ee46893.zip | |
xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from xserver-xorg.inc and xserver-xorg-lite.inc to xserver-xorg-common.inc
* xserver-xorg.inc is appending extra xf86driproto dri2proto to PROTO_DEPS and virtual/libgl to LIB_DEPS
* both lite and dri variants now depend on font-util (from DEPENDS in xserver-xorg-common.inc)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-graphics')
3 files changed, 6 insertions, 11 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc index 0a5d8b6b0c..d901e2ccf9 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc @@ -20,6 +20,10 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig +PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto" +LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl" +DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" + # Split out some modules and extensions from the main package # These aren't needed for basic operations and only take up space: # 32.0k libdri.so diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc index f1cef1bb5d..a942a115f2 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc @@ -1,11 +1,5 @@ require xserver-xorg-common.inc -PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto" - -LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl" - -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" - RDEPENDS_${PN} += "xorg-minimal-fonts" FILES_${PN} += "${bindir}/Xorg " diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 9bc0ee48cf..71754f742b 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -1,10 +1,7 @@ require xserver-xorg-common.inc -PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto" - -LIB_DEPS = "pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl" - -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" +PROTO_DEPS += "xf86driproto dri2proto" +LIB_DEPS += "virtual/libgl" RDEPENDS_${PN} += "xorg-minimal-fonts" |