summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-05-26 17:05:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-30 15:58:14 +0100
commit6b38e77493b36fbbd8be835ba9dd7bb38b91c2f6 (patch)
treef0cb39725c35e7bb7494b70a0220c66145383356
parentea9d27ad4a51d3e394c0ef0a2ca731d910b356cc (diff)
downloadpoky-6b38e77493b36fbbd8be835ba9dd7bb38b91c2f6.tar.gz
xcb-proto: remove stale git recipe and now redundant .inc
(From OE-Core rev: a7e70970f3a5509e1f1ec1ed3aedb0bd10d404fc) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-proto/xcb-proto.inc26
-rw-r--r--meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb25
-rw-r--r--meta/recipes-graphics/xorg-proto/xcb-proto_git.bb9
3 files changed, 23 insertions, 37 deletions
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto.inc b/meta/recipes-graphics/xorg-proto/xcb-proto.inc
deleted file mode 100644
index 8703d6391c..0000000000
--- a/meta/recipes-graphics/xorg-proto/xcb-proto.inc
+++ /dev/null
@@ -1,26 +0,0 @@
1SUMMARY = "XCB: The X protocol C binding headers"
2DESCRIPTION = "Function prototypes for the X protocol C-language Binding \
3(XCB). XCB is a replacement for Xlib featuring a small footprint, \
4latency hiding, direct access to the protocol, improved threading \
5support, and extensibility."
6HOMEPAGE = "http://xcb.freedesktop.org"
7BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB"
8
9SECTION = "x11/libs"
10LICENSE = "MIT-X"
11
12SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \
13 file://no-python-native.patch"
14
15inherit autotools pkgconfig
16
17PACKAGES += "python-xcbgen"
18
19FILES_${PN} = ""
20FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd"
21FILES_python-xcbgen = "${libdir}/xcb-proto"
22
23RDEPENDS_${PN}-dev = ""
24RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
25
26BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb
index 23166a93bb..8bdca32b71 100644
--- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb
+++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb
@@ -1,9 +1,30 @@
1include xcb-proto.inc 1SUMMARY = "XCB: The X protocol C binding headers"
2DESCRIPTION = "Function prototypes for the X protocol C-language Binding \
3(XCB). XCB is a replacement for Xlib featuring a small footprint, \
4latency hiding, direct access to the protocol, improved threading \
5support, and extensibility."
6HOMEPAGE = "http://xcb.freedesktop.org"
7BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB"
2 8
9SECTION = "x11/libs"
3LICENSE = "MIT" 10LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \
5 file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" 12 file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65"
6 13
7 14SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \
15 file://no-python-native.patch"
8SRC_URI[md5sum] = "14e60919f859560f28426a685a555962" 16SRC_URI[md5sum] = "14e60919f859560f28426a685a555962"
9SRC_URI[sha256sum] = "5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906" 17SRC_URI[sha256sum] = "5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906"
18
19inherit autotools pkgconfig
20
21PACKAGES += "python-xcbgen"
22
23FILES_${PN} = ""
24FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd"
25FILES_python-xcbgen = "${libdir}/xcb-proto"
26
27RDEPENDS_${PN}-dev = ""
28RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
29
30BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb
deleted file mode 100644
index 2ea4d04217..0000000000
--- a/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb
+++ /dev/null
@@ -1,9 +0,0 @@
1DEFAULT_PREFERENCE = "-1"
2
3include xcb-proto.inc
4SRCREV = "d81ca233e98be8fa59e8c90d262c0516944c5a66"
5PV = "1.2+gitr${SRCPV}"
6PR = "r4"
7
8SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto"
9S = "${WORKDIR}/git"