8 files changed, 11 insertions, 94 deletions
diff --git a/recipes/xcb/libxcb.inc b/recipes/xcb/libxcb.inc
index 3676b3c00d..4cbc11be0c 100644
--- a/recipes/xcb/libxcb.inc
+++ b/recipes/xcb/libxcb.inc
@@ -6,6 +6,7 @@ HOMEPAGE = "http://xcb.freedesktop.org"
 PARALLEL_MAKE = ""
 DEPENDS = "xcb-proto xproto libxau libxslt-native"
 # DEPENDS += "xsltproc-native gperf-native"
+INC_PR = "r3"
 
 SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
         file://configure.patch;striplevel=0"
@@ -13,8 +14,9 @@ SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
 PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \
              libxcb-randr libxcb-record libxcb-render libxcb-res \
              libxcb-screensaver libxcb-shape libxcb-shm libxcb-sync \
-             libxcb-xevie libxcb-xf86dri libxcb-xfixes libxcb-xlib \
-             libxcb-xprint libxcb-xtest libxcb-xv libxcb-xvmc"
+             libxcb-xevie libxcb-dri2 libxcb-xf86dri libxcb-xfixes \
+             libxcb-xinerama libxcb-xlib libxcb-xprint libxcb-xtest \
+             libxcb-xv libxcb-xvmc"
 
 FILES_${PN} = "${libdir}/libxcb.so.*"
 #FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h"
@@ -32,6 +34,7 @@ FILES_libxcb-shm = "${libdir}/libxcb-shm.so.*"
 FILES_libxcb-sync = "${libdir}/libxcb-sync.so.*"
 FILES_libxcb-xevie = "${libdir}/libxcb-xevie.so.*"
 FILES_libxcb-xf86dri = "${libdir}/libxcb-xf86dri.so.*"
+FILES_libxcb-dri2 = "${libdir}/libxcb-dri2.so.*"
 FILES_libxcb-xfixes = "${libdir}/libxcb-xfixes.so.*"
 FILES_libxcb-xinerama = "${libdir}/libxcb-xinerama.so.*"
 FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*"
@@ -43,7 +46,3 @@ FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*"
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "STAGING_DIR=${STAGING_DIR_HOST}"
-
-do_stage() {
-	autotools_stage_all
-}
diff --git a/recipes/xcb/libxcb_0.9.91.bb b/recipes/xcb/libxcb_0.9.91.bb
index 5b8fb84559..25b2c677b2 100644
--- a/recipes/xcb/libxcb_0.9.91.bb
+++ b/recipes/xcb/libxcb_0.9.91.bb
@@ -1,5 +1,5 @@
 include libxcb.inc
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "8bb01876468dd08d8e921e32ec9ff116"
 SRC_URI[sha256sum] = "a54ecc4ff5240876d49ec534a21e6ff682f3602da89b1540f5cd0b6f8e9089b7"
diff --git a/recipes/xcb/libxcb_0.9.92.bb b/recipes/xcb/libxcb_0.9.92.bb
index 418df2542b..2abf456537 100644
--- a/recipes/xcb/libxcb_0.9.92.bb
+++ b/recipes/xcb/libxcb_0.9.92.bb
@@ -1,5 +1,5 @@
 include libxcb.inc
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "6f01c8fa200deebb20b019f7401a2606"
 SRC_URI[sha256sum] = "64337d31564f3239ccb8f0d7f8e1c4987f570985af3ab83a38cf9af5736ef9b1"
diff --git a/recipes/xcb/libxcb_0.9.93.bb b/recipes/xcb/libxcb_0.9.93.bb
index 795eae81a1..59a5f9d297 100644
--- a/recipes/xcb/libxcb_0.9.93.bb
+++ b/recipes/xcb/libxcb_0.9.93.bb
@@ -1,7 +1,5 @@
 include libxcb.inc
-PR = "r2"
-
-PACKAGES =+ "libxcb-xinerama"
+PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "7967d0d4347502bc9af5373767afc748"
 SRC_URI[sha256sum] = "106b3747c3c49c2940973b18b487c604a5dffc8995fb02a4c46136d6ff267122"
diff --git a/recipes/xcb/libxcb_0.9.bb b/recipes/xcb/libxcb_0.9.bb
deleted file mode 100644
index 8027133a4f..0000000000
--- a/recipes/xcb/libxcb_0.9.bb
+++ /dev/null
@@ -1,74 +0,0 @@
-DESCRIPTION = "XCB: an X protocol C binding"
-SECTION = "x11/libs"
-LICENSE = "MIT-X"
-HOMEPAGE = "http://xcb.freedesktop.org"
-PR = "r0"
-
-PARALLEL_MAKE = ""
-DEPENDS = "xcb-proto xproto libxau"
-# DEPENDS += "xsltproc-native gperf-native"
-
-SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-0.9.tar.bz2"
-
-PACKAGES = "${PN}-dbg libxcb libxcb-dev libxcbcomposite libxcbcomposite-dev \
-            libxcbdamage libxcbdamage-dev libxcbdpms libxcbdpms-dev \
-            libxcbglx libxcbglx-dev libxcbrandr libxcbrandr-dev \
-            libxcbrecord libxcbrecord-dev libxcbrender libxcbrender-dev \
-            libxcbres libxcbres-dev libxcbscreensaver libxcbscreensaver-dev \
-            libxcbshape libxcbshape-dev libxcbshm libxcbshm-dev \
-            libxcbsync libxcbsync-dev libxcbxevie libxcbxevie-dev \
-            libxcbxf86dri libxcbxf86dri-dev libxcbxfixes libxcbxfixes-dev \
-            libxcbxprint libxcbxprint-dev libxcbxtest libxcbxtest-dev \
-            libxcbxv libxcbxv-dev libxcbxvmc libxcbxvmc-dev"
-
-FILES_${PN} = "${libdir}/libXCB.so.*"
-FILES_${PN}-dev = "${libdir}/libXCB.* ${libdir}/pkgconfig/xcb.pc ${includedir}/X11/XCB/xcb.h ${includedir}/X11/XCB/xcb_types.h \
-                   ${includedir}/X11/XCB/xc_misc.h ${includedir}/X11/XCB/bigreq.h ${includedir}/X11/XCB/xproto.h \
-                   ${includedir}/X11/XCB/xcbxlib.h ${includedir}/X11/XCB/xcbext.h"
-FILES_libxcbcomposite = "${libdir}/libXCBcomposite.so*"
-FILES_libxcbcomposite-dev = "${libdir}/libXCBcomposite.* ${libdir}/pkgconfig/xcb-composite.pc ${includedir}/X11/XCB/composite.h"
-FILES_libxcbdamage = "${libdir}/libXCBdamage.so.*"
-FILES_libxcbdamage-dev = "${libdir}/libXCBdamage.* ${libdir}/pkgconfig/xcb-damage.pc ${includedir}/X11/XCB/damage.h"
-FILES_libxcbdpms = "${libdir}/libXCBdpms.so.*"
-FILES_libxcbdpms-dev = "${libdir}/libXCBdpms.* ${libdir}/pkgconfig/xcb-dpms.pc ${includedir}/X11/XCB/dpms.h"
-FILES_libxcbglx = "${libdir}/libXCBglx.so.*"
-FILES_libxcbglx-dev = "${libdir}/libXCBglx.* ${libdir}/pkgconfig/xcb-glx.pc ${includedir}/X11/XCB/glx.h"
-FILES_libxcbrandr = "${libdir}/libXCBrandr.so.*"
-FILES_libxcbrandr-dev = "${libdir}/libXCBrandr.* ${libdir}/pkgconfig/xcb-randr.pc ${includedir}/X11/XCB/randr.h"
-FILES_libxcbrecord = "${libdir}/libXCBrecord.so.*"
-FILES_libxcbrecord-dev = "${libdir}/libXCBrecord.* ${libdir}/pkgconfig/xcb-record.pc ${includedir}/X11/XCB/record.h"
-FILES_libxcbrender = "${libdir}/libXCBrender.so.*"
-FILES_libxcbrender-dev = "${libdir}/libXCBrender.* ${libdir}/pkgconfig/xcb-render.pc ${includedir}/X11/XCB/render.h"
-FILES_libxcbres = "${libdir}/libXCBres.so.*"
-FILES_libxcbres-dev = "${libdir}/libXCBres.* ${libdir}/pkgconfig/xcb-res.pc ${includedir}/X11/XCB/res.h"
-FILES_libxcbscreensaver = "${libdir}/libXCBscreensaver.so.*"
-FILES_libxcbscreensaver-dev = "${libdir}/libXCBscreensaver.* ${libdir}/pkgconfig/xcb-screensaver.pc ${includedir}/X11/XCB/screensaver.h"
-FILES_libxcbshape = "${libdir}/libXCBshape.so.*"
-FILES_libxcbshape-dev = "${libdir}/libXCBshape.* ${libdir}/pkgconfig/xcb-shape.pc ${includedir}/X11/XCB/shape.h"
-FILES_libxcbshm = "${libdir}/libXCBshm.so.*"
-FILES_libxcbshm-dev = "${libdir}/libXCBshm.* ${libdir}/pkgconfig/xcb-shm.pc ${includedir}/X11/XCB/shm.h"
-FILES_libxcbsync = "${libdir}/libXCBsync.so.*"
-FILES_libxcbsync-dev = "${libdir}/libXCBsync.* ${libdir}/pkgconfig/xcb-sync.pc ${includedir}/X11/XCB/sync.h"
-FILES_libxcbxevie = "${libdir}/libXCBxevie.so.*"
-FILES_libxcbxevie-dev = "${libdir}/libXCBxevie.* ${libdir}/pkgconfig/xcb-xevie.pc ${includedir}/X11/XCB/xevie.h"
-FILES_libxcbxf86dri = "${libdir}/libXCBxf86dri.so.*"
-FILES_libxcbxf86dri-dev = "${libdir}/libXCBxf86dri.* ${libdir}/pkgconfig/xcb-xf86dri.pc ${includedir}/X11/XCB/xf86dri.h"
-FILES_libxcbxfixes = "${libdir}/libXCBxfixes.so.*"
-FILES_libxcbxfixes-dev = "${libdir}/libXCBxfixes.* ${libdir}/pkgconfig/xcb-xfixes.pc ${includedir}/X11/XCB/xfixes.h"
-FILES_libxcbxprint = "${libdir}/libXCBxprint.so.*"
-FILES_libxcbxprint-dev = "${libdir}/libXCBxprint.* ${libdir}/pkgconfig/xcb-xprint.pc ${includedir}/X11/XCB/xprint.h"
-FILES_libxcbxtest = "${libdir}/libXCBxtest.so.*"
-FILES_libxcbxtest-dev = "${libdir}/libXCBxtest.* ${libdir}/pkgconfig/xcb-xtest.pc ${includedir}/X11/XCB/xtest.h"
-FILES_libxcbxv = "${libdir}/libXCBxv.so.*"
-FILES_libxcbxv-dev = "${libdir}/libXCBxv.* ${libdir}/pkgconfig/xcb-xv.pc ${includedir}/X11/XCB/xv.h"
-FILES_libxcbxvmc = "${libdir}/libXCBxvmc.so.*"
-FILES_libxcbxvmc-dev = "${libdir}/libXCBxvmc.* ${libdir}/pkgconfig/xcb-xvmc.pc ${includedir}/X11/XCB/xvmc.h"
-
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
-
-SRC_URI[md5sum] = "578037c76d791d4623f0f8b3e14fbabc"
-SRC_URI[sha256sum] = "824fed10aea3bfb3504b0c5f4e3a5208ae795e88f64730a5b07d5f5de3e771a8"
diff --git a/recipes/xcb/libxcb_1.0.bb b/recipes/xcb/libxcb_1.0.bb
index dc61dd4d59..48b2b82bd6 100644
--- a/recipes/xcb/libxcb_1.0.bb
+++ b/recipes/xcb/libxcb_1.0.bb
@@ -1,9 +1,7 @@
 include libxcb.inc
-PR = "r0"
+PR = "${INC_PR}.0"
 
 DEPENDS += "libpthread-stubs"
 
-PACKAGES =+ "libxcb-xinerama"
-
 SRC_URI[md5sum] = "0eb951fd0fa9542dbe4fc3530b81a3b6"
 SRC_URI[sha256sum] = "19d6b2ac380fd3e613a3730e791f197f186f940bffec97f8a4f9443bb727d11d"
diff --git a/recipes/xcb/libxcb_1.6.bb b/recipes/xcb/libxcb_1.6.bb
index 27274b9a5b..f24f40a08f 100644
--- a/recipes/xcb/libxcb_1.6.bb
+++ b/recipes/xcb/libxcb_1.6.bb
@@ -1,12 +1,10 @@
 include libxcb.inc
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
         file://configure_git.patch"
 
 DEPENDS += "libpthread-stubs"
 
-PACKAGES =+ "libxcb-xinerama"
-
 SRC_URI[md5sum] = "cba9f6d1137ef00d9b326726d0bab6fd"
 SRC_URI[sha256sum] = "1ae6c81774a4637e90879d50db9017a2cc6c3f524e1baedc63ba72d44cad2936"
diff --git a/recipes/xcb/libxcb_git.bb b/recipes/xcb/libxcb_git.bb
index cf728e7817..d54a981e8e 100644
--- a/recipes/xcb/libxcb_git.bb
+++ b/recipes/xcb/libxcb_git.bb
@@ -3,12 +3,10 @@ DEFAULT_PREFERENCE = "-1"
 include libxcb.inc
 SRCREV = "a63fbc9d6c484e5ad7a5e9d56f81b8e1a2f38a82"
 PV = "1.6+git"
-PR = "r0"
+PR = "${INC_PR}.0"
 
 DEPENDS += "libpthread-stubs"
 
 SRC_URI = "git://anongit.freedesktop.org/xcb/libxcb;protocol=git \
 	   file://configure_git.patch "
 S = "${WORKDIR}/git"
-
-PACKAGES =+ "libxcb-xinerama"