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

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

6 files changed, 6 insertions, 8 deletions

diff --git a/meta/packages/xorg-proto/dri2proto_2.2.bb b/meta/packages/xorg-proto/dri2proto_2.2.bb
index 8decda682f..a0e1fd3989 100644
--- 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 a8a7350ff8..a5ad7d0919 100644
--- 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 392aef20f6..e605af3e96 100644
--- 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 317a4539b1..a97fb0bfab 100644
--- 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 e357188ec8..327dfd98fe 100644
--- 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 9e3ef2fe5b..d3c2536831 100644
--- 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