* 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.ja...@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 4 ++++
.../xorg-xserver/xserver-xorg-lite.inc | 6 ------
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 7 ++-----
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 0a5d8b6..d901e2c 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 f1cef1b..a942a11 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 9bc0ee4..71754f7 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"
--
1.7.7
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
