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 18:08:32 +0100 |
| commit | fbf9e2fd49ac6c50a3b6c3c53fbf61cb0ca3b236 (patch) | |
| tree | 46a9d5b275a7045d89e37e4303398224bd22658d | |
| parent | 9e34241ec10025e87fdd656fd1a7d32caec80854 (diff) | |
| download | poky-fbf9e2fd49ac6c50a3b6c3c53fbf61cb0ca3b236.tar.gz | |
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)
(From OE-Core rev: f7fb209cd447418e72c421ab473c35430ee46893)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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}" | |||
| 20 | 20 | ||
| 21 | inherit autotools pkgconfig | 21 | inherit autotools pkgconfig |
| 22 | 22 | ||
| 23 | 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" | ||
| 24 | LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl" | ||
| 25 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" | ||
| 26 | |||
| 23 | # Split out some modules and extensions from the main package | 27 | # Split out some modules and extensions from the main package |
| 24 | # These aren't needed for basic operations and only take up space: | 28 | # These aren't needed for basic operations and only take up space: |
| 25 | # 32.0k libdri.so | 29 | # 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 @@ | |||
| 1 | require xserver-xorg-common.inc | 1 | require xserver-xorg-common.inc |
| 2 | 2 | ||
| 3 | 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" | ||
| 4 | |||
| 5 | LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl" | ||
| 6 | |||
| 7 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" | ||
| 8 | |||
| 9 | RDEPENDS_${PN} += "xorg-minimal-fonts" | 3 | RDEPENDS_${PN} += "xorg-minimal-fonts" |
| 10 | 4 | ||
| 11 | FILES_${PN} += "${bindir}/Xorg " | 5 | 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 @@ | |||
| 1 | require xserver-xorg-common.inc | 1 | require xserver-xorg-common.inc |
| 2 | 2 | ||
| 3 | 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" | 3 | PROTO_DEPS += "xf86driproto dri2proto" |
| 4 | 4 | LIB_DEPS += "virtual/libgl" | |
| 5 | LIB_DEPS = "pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl" | ||
| 6 | |||
| 7 | DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}" | ||
| 8 | 5 | ||
| 9 | RDEPENDS_${PN} += "xorg-minimal-fonts" | 6 | RDEPENDS_${PN} += "xorg-minimal-fonts" |
| 10 | 7 | ||