Patchwork [05/11] xorg: fix several build depends (DEPENDS_)

login
register
mail settings
Submitter Morten Svendsen
Date Dec. 19, 2012, 10:05 a.m.
Message ID <e280c6a6c1aa670c15cf39294d2a7607ce54dd53.1355911420.git.morten.thunbergsvendsen@prevas.dk>
Download mbox | patch
Permalink /patch/207290/
State Accepted
Delegated to: Jacob Kjaergaard
Headers show

Comments

Morten Svendsen - Dec. 19, 2012, 10:05 a.m.
---
 recipes/mesa/mesa-dri.inc             | 1 +
 recipes/xcb/libxcb_1.8.1.oe           | 1 +
 recipes/xorg-lib/libx11.inc           | 1 +
 recipes/xorg-lib/libxdamage_1.1.3.oe  | 2 +-
 recipes/xorg-xserver/xserver-xorg.inc | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/recipes/mesa/mesa-dri.inc b/recipes/mesa/mesa-dri.inc
index e5f41af..4480234 100644
--- a/recipes/mesa/mesa-dri.inc
+++ b/recipes/mesa/mesa-dri.inc
@@ -10,6 +10,7 @@  PACKAGES =+ "${PN}-swrast ${PN}-swrast-dbg"
 FILES_${PN}-swrast = "${libdir}/dri/swrast*"
 FILES_${PN}-swrast-dbg = "${libdir}/dri/.debug/swrast*"
 RDEPENDS_${PN}-swrast += "libexpat ${COMMON_RDEPENDS}"
+DEPENDS_${PN} += "libxdamage libxxf86vm"
 
 EXTRA_OECONF += "--with-driver=dri --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS} --with-egl-platforms=x11"
 
diff --git a/recipes/xcb/libxcb_1.8.1.oe b/recipes/xcb/libxcb_1.8.1.oe
index 2a249c2..fd9422a 100644
--- a/recipes/xcb/libxcb_1.8.1.oe
+++ b/recipes/xcb/libxcb_1.8.1.oe
@@ -5,6 +5,7 @@  LICENSE = "MIT"
 RECIPE_TYPES = "machine native"
 
 DEPENDS += "libpthread-stubs native:xcb-proto libxdmcp"
+DEPENDS_${PN} += "libpthread-stubs libxau libxdmcp"
 
 PARALLEL_MAKE = ""
 
diff --git a/recipes/xorg-lib/libx11.inc b/recipes/xorg-lib/libx11.inc
index ef5b4e5..59667b0 100644
--- a/recipes/xorg-lib/libx11.inc
+++ b/recipes/xorg-lib/libx11.inc
@@ -19,6 +19,7 @@  EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
 
 PACKAGES =+ "${PN}-xcb"
 
+DEPENDS_${PN} += "kbproto"
 FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
 FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
 FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
diff --git a/recipes/xorg-lib/libxdamage_1.1.3.oe b/recipes/xorg-lib/libxdamage_1.1.3.oe
index b14a39c..6bc695b 100644
--- a/recipes/xorg-lib/libxdamage_1.1.3.oe
+++ b/recipes/xorg-lib/libxdamage_1.1.3.oe
@@ -15,6 +15,6 @@  require xorg-lib-common.inc
 inherit library
 
 DEPENDS += "libx11 damageproto libxfixes libxext xproto"
-DEPENDS_${PN} += "damageproto"
+DEPENDS_${PN} += "damageproto libxfixes"
 
 XORG_PN = "libXdamage"
diff --git a/recipes/xorg-xserver/xserver-xorg.inc b/recipes/xorg-xserver/xserver-xorg.inc
index 15ddbf5..94502ba 100644
--- a/recipes/xorg-xserver/xserver-xorg.inc
+++ b/recipes/xorg-xserver/xserver-xorg.inc
@@ -2,6 +2,7 @@  require xserver-xorg-common.inc
 
 PROTO_DEPS += "xf86driproto dri2proto glproto"
 LIB_DEPS += "mesa-dri-dev mesa-dri-libegl-dev mesa-dri-libgl-dev mesa-dri-libegl mesa-dri-libgl mesa-dri tslib"
+DEPENDS_${PN} += "dri2proto"
 
 EXTRA_OECONF += "\
                  --enable-dri \