[PATCH 1/2] inputproto: explicitly disable asciidoc to avoid floating dependency

[PATCH 1/2] inputproto: explicitly disable asciidoc to avoid floating dependency

[Ross Burton]

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb b/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb
index ae50b87..eb5e66b 100644
--- a/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb
+++ b/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb
@@ -18,3 +18,5 @@ BBCLASSEXTEND = "native nativesdk"
 
 SRC_URI[md5sum] = "b290a463af7def483e6e190de460f31a"
 SRC_URI[sha256sum] = "893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d"
+
+EXTRA_OECONF += "--without-asciidoc"
-- 
2.8.1

[PATCH 2/2] xorg-proto: remove stale git recipes

[Ross Burton]

These two recipes are old and unmaintained, so remove them to avoid confusion
with the tarball recipes.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-proto/dri2proto_git.bb  | 18 ------------------
 meta/recipes-graphics/xorg-proto/inputproto_git.bb | 19 -------------------
 2 files changed, 37 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-proto/dri2proto_git.bb
 delete mode 100644 meta/recipes-graphics/xorg-proto/inputproto_git.bb

diff --git a/meta/recipes-graphics/xorg-proto/dri2proto_git.bb b/meta/recipes-graphics/xorg-proto/dri2proto_git.bb
deleted file mode 100644
index 9074f48..0000000
--- a/meta/recipes-graphics/xorg-proto/dri2proto_git.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers"
-
-DESCRIPTION = "This package provides the wire protocol for the Direct \
-Rendering Ifnrastructure 2.  DIR is required for may hardware \
-accelerated OpenGL drivers."
-
-SRCREV = "66c56ab10d917e3f47f93178d7eac6430970d3c4"
-PV = "1.99.3+git${SRCPV}"
-PR = "r2"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/dri2proto"
-
-LIC_FILES_CHKSUM="file://COPYING;md5=2e396fa91834f8786032cad2da5638f3"
-
-S = "${WORKDIR}/git"
-
diff --git a/meta/recipes-graphics/xorg-proto/inputproto_git.bb b/meta/recipes-graphics/xorg-proto/inputproto_git.bb
deleted file mode 100644
index 6520f3b..0000000
--- a/meta/recipes-graphics/xorg-proto/inputproto_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-require xorg-proto-common.inc
-
-SUMMARY = "XI: X Input extension headers"
-
-DESCRIPTION = "This package provides the wire protocol for the X Input \
-extension.  The extension supports input devices other then the core X \
-keyboard and pointer."
-
-PR = "r1"
-PE = "1"
-SRCREV = "7203036522ba9d4b224d282d6afc2d0b947711ee"
-PV = "1.9.99.12+git${SRCPV}"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto"
-S = "${WORKDIR}/git"
-
-inherit gettext
-
-BBCLASSEXTEND = "native nativesdk"
-- 
2.8.1