From patchwork Wed Dec 19 10:05:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morten Svendsen X-Patchwork-Id: 207290 X-Patchwork-Delegate: jacob.kjaergaard@prevas.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 714682C009B for ; Wed, 19 Dec 2012 21:05:37 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 327113FDCA for ; Wed, 19 Dec 2012 11:05:36 +0100 (CET) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 5A3343FADB for ; Wed, 19 Dec 2012 11:05:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2743; q=dns/txt; s=ironport1; t=1355911532; x=1387447532; h=from:to:subject:date:message-id:in-reply-to:references: mime-version; bh=8/ZhdeHGLpXphFLnJKg0EdEnWTZg3fs3vLezEZaJcQc=; b=dJOGIPK+/vL7imvI3R5EpVsOTCfaWk3h8gtl2OZTxvL5SPNourvKwegE dFS3j9Ga6VRrzIV+pYUkpYIZgqiLo+trxcreM7HlSMlSBxzdb4DR4Y8qY aT8Dp0ckl/671U6FXK/rHh+LNMQtOzra8Pvoq9BsELk0FF+vl52cPM3la c=; X-IronPort-AV: E=Sophos;i="4.84,313,1355094000"; d="scan'208";a="2629559" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 19 Dec 2012 11:05:32 +0100 Received: from fire.prevas.dk (172.16.10.61) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.318.4; Wed, 19 Dec 2012 11:05:31 +0100 From: Morten Thunberg Svendsen To: Subject: [PATCH 05/11] xorg: fix several build depends (DEPENDS_) Date: Wed, 19 Dec 2012 11:05:18 +0100 Message-ID: X-Mailer: git-send-email 1.8.0 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [172.16.10.61] X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org --- 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(-) 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 \