xorg-proto: Always depend on util-macros, update gettext dependencies to be inherits

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/xorg-proto/dri2proto_2.2.bb b/meta/packages/xorg-proto/dri2proto_2.2.bb
index 8decda682ff678e7ad9b103fb1732b0bb148fcdb..a0e1fd398948388acb7ac5a07809e4acea66104d 100644 (file)
--- a/meta/packages/xorg-proto/dri2proto_2.2.bb
+++ b/meta/packages/xorg-proto/dri2proto_2.2.bb
@@ -1,5 +1,3 @@
 DESCRIPTION = "DRI2 extension headers"
 
-DEPENDS += "util-macros"
-
 require xorg-proto-common.inc

diff --git a/meta/packages/xorg-proto/dri2proto_git.bb b/meta/packages/xorg-proto/dri2proto_git.bb
index a8a7350ff879136b18e5dd60800aa138765fb01d..a5ad7d091908ab99df90df9342227792f24cba64 100644 (file)
--- a/meta/packages/xorg-proto/dri2proto_git.bb
+++ b/meta/packages/xorg-proto/dri2proto_git.bb
@@ -5,9 +5,7 @@ require xorg-proto-common.inc
 PV = "1.99.3+git${SRCPV}"
 PR = "r2"
 
-DEPENDS += "util-macros"
-
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/dri2proto;protocol=git"
-#           file://dri2-proto-DRI2Swapbuffer.patch;patch=1"
+
 S = "${WORKDIR}/git"
 

diff --git a/meta/packages/xorg-proto/inputproto_2.0.bb b/meta/packages/xorg-proto/inputproto_2.0.bb
index 392aef20f6375f5c49831c831e21c3a34eaab47d..e605af3e96fc57117f4125862ac1ac4472c16e49 100644 (file)
--- a/meta/packages/xorg-proto/inputproto_2.0.bb
+++ b/meta/packages/xorg-proto/inputproto_2.0.bb
@@ -3,6 +3,6 @@ require xorg-proto-common.inc
 PR = "r2"
 PE = "1"
 
-DEPENDS += "util-macros gettext"
+inherit gettext
 
 BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-proto/inputproto_git.bb b/meta/packages/xorg-proto/inputproto_git.bb
index 317a4539b1aea2691fd2d10cfb3916a9afc7d12e..a97fb0bfab4f1571d213e92378390873b103ede5 100644 (file)
--- a/meta/packages/xorg-proto/inputproto_git.bb
+++ b/meta/packages/xorg-proto/inputproto_git.bb
@@ -7,6 +7,6 @@ PV = "1.9.99.12+git${SRCPV}"
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto;protocol=git"
 S = "${WORKDIR}/git"
 
-DEPENDS += "util-macros gettext"
+inherit gettext
 
 BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-proto/xextproto_7.1.0.bb b/meta/packages/xorg-proto/xextproto_7.1.0.bb
index e357188ec8f6dbd33262f93a5c2b4cd409390fe3..327dfd98fe0865ac17477ac871b8ae9213fed865 100644 (file)
--- a/meta/packages/xorg-proto/xextproto_7.1.0.bb
+++ b/meta/packages/xorg-proto/xextproto_7.1.0.bb
@@ -3,6 +3,6 @@ require xorg-proto-common.inc
 PR = "r4"
 PE = "1"
 
-DEPENDS += "util-macros gettext"
+inherit gettext
 
 BBCLASSEXTEND = "native nativesdk"

diff --git a/meta/packages/xorg-proto/xorg-proto-common.inc b/meta/packages/xorg-proto/xorg-proto-common.inc
index 9e3ef2fe5bf9dfd18131b5370545d1d339c74f1f..d3c2536831c38aa8b0782ccab974bdd1c6735912 100644 (file)
--- a/meta/packages/xorg-proto/xorg-proto-common.inc
+++ b/meta/packages/xorg-proto/xorg-proto-common.inc
@@ -9,6 +9,8 @@ SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-${PV}.tar.bz2"
 
 S = "${WORKDIR}/${XORG_PN}-${PV}"
 
+DEPENDS = "util-macros"
+
 inherit autotools_stage pkgconfig
 
 # ${PN} is empty so we need to tweak -dev and -dbg package dependencies