From a68cf15726e62b354584be3c1d4bfa6d245e597f Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 2 Aug 2007 18:49:00 +0000 Subject: xcb: cleanup and update - move common lines of libxcb, xcb-proto and xcb-util into .inc files - add libpthread-stubs-0.1 - add xcb-proto-1.0 - add libxcb-1.0 --- packages/xcb/libpthread-stubs_0.1.bb | 17 +++++++++ packages/xcb/libxcb.inc | 46 +++++++++++++++++++++++ packages/xcb/libxcb_0.9.91.bb | 45 +--------------------- packages/xcb/libxcb_0.9.92.bb | 46 +---------------------- packages/xcb/libxcb_0.9.93.bb | 47 +---------------------- packages/xcb/libxcb_1.0.bb | 6 +++ packages/xcb/libxcb_git.bb | 73 ++---------------------------------- packages/xcb/xcb-proto.inc | 18 +++++++++ packages/xcb/xcb-proto_0.9.91.bb | 19 +--------- packages/xcb/xcb-proto_0.9.92.bb | 19 +--------- packages/xcb/xcb-proto_0.9.93.bb | 19 +--------- packages/xcb/xcb-proto_0.9.bb | 13 +------ packages/xcb/xcb-proto_1.0.bb | 2 + packages/xcb/xcb-proto_git.bb | 10 ++--- packages/xcb/xcb-util.inc | 31 +++++++++++++++ packages/xcb/xcb-util_0.1.bb | 41 +------------------- packages/xcb/xcb-util_0.2.bb | 41 +------------------- packages/xcb/xcb-util_git.bb | 41 +------------------- 18 files changed, 139 insertions(+), 395 deletions(-) create mode 100644 packages/xcb/libpthread-stubs_0.1.bb create mode 100644 packages/xcb/libxcb.inc create mode 100644 packages/xcb/libxcb_1.0.bb create mode 100644 packages/xcb/xcb-proto.inc create mode 100644 packages/xcb/xcb-proto_1.0.bb create mode 100644 packages/xcb/xcb-util.inc (limited to 'packages/xcb') diff --git a/packages/xcb/libpthread-stubs_0.1.bb b/packages/xcb/libpthread-stubs_0.1.bb new file mode 100644 index 0000000000..9614a74a68 --- /dev/null +++ b/packages/xcb/libpthread-stubs_0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "This library provides weak aliases for pthread functions \ +not provided in libc or otherwise available by default." +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" + +PARALLEL_MAKE = "" +#DEPENDS = "xcb-proto xproto libxau libxslt-native" +# DEPENDS += "xsltproc-native gperf-native" + +SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/libxcb.inc b/packages/xcb/libxcb.inc new file mode 100644 index 0000000000..6e7bd5edec --- /dev/null +++ b/packages/xcb/libxcb.inc @@ -0,0 +1,46 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" + +PARALLEL_MAKE = "" +DEPENDS = "xcb-proto xproto libxau libxslt-native" +# DEPENDS += "xsltproc-native gperf-native" + +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" + +FILES_${PN} = "${libdir}/libxcb.so.*" +#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" +FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*" +FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" +FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" +FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*" +FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*" +FILES_libxcb-record = "${libdir}/libxcb-record.so.*" +FILES_libxcb-render = "${libdir}/libxcb-render.so.*" +FILES_libxcb-res = "${libdir}/libxcb-res.so.*" +FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*" +FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*" +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-xfixes = "${libdir}/libxcb-xfixes.so.*" +FILES_libxcb-xinerama = "${libdir}/libxcb-xinerama.so.*" +FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*" +FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" +FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" +FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" +FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/xcb/libxcb_0.9.91.bb b/packages/xcb/libxcb_0.9.91.bb index 67b3d10496..a1ab9fe143 100644 --- a/packages/xcb/libxcb_0.9.91.bb +++ b/packages/xcb/libxcb_0.9.91.bb @@ -1,45 +1,2 @@ -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" +include libxcb.inc PR = "r0" - -PARALLEL_MAKE = "" -DEPENDS = "xcb-proto libxau" -# DEPENDS += "xsltproc-native gperf-native" - -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-xprint \ - libxcb-xtest libxcb-xv libxcb-xvmc libxcb" - -FILES_${PN} = "${libdir}/libxcb.so.*" -#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" -FILES_libxcb-composite = "${libdir}/libxcb-composite.so*" -FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" -FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" -FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*" -FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*" -FILES_libxcb-record = "${libdir}/libxcb-record.so.*" -FILES_libxcb-render = "${libdir}/libxcb-render.so.*" -FILES_libxcb-res = "${libdir}/libxcb-res.so.*" -FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*" -FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*" -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-xfixes = "${libdir}/libxcb-xfixes.so.*" -FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" -FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" -FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" -FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xcb/libxcb_0.9.92.bb b/packages/xcb/libxcb_0.9.92.bb index 26eea1d576..a1ab9fe143 100644 --- a/packages/xcb/libxcb_0.9.92.bb +++ b/packages/xcb/libxcb_0.9.92.bb @@ -1,46 +1,2 @@ -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" +include libxcb.inc PR = "r0" - -PARALLEL_MAKE = "" -DEPENDS = "xcb-proto libxau" -# DEPENDS += "xsltproc-native gperf-native" - -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" - -FILES_${PN} = "${libdir}/libxcb.so.*" -#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" -FILES_libxcb-composite = "${libdir}/libxcb-composite.so*" -FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" -FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" -FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*" -FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*" -FILES_libxcb-record = "${libdir}/libxcb-record.so.*" -FILES_libxcb-render = "${libdir}/libxcb-render.so.*" -FILES_libxcb-res = "${libdir}/libxcb-res.so.*" -FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*" -FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*" -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-xfixes = "${libdir}/libxcb-xfixes.so.*" -FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*" -FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" -FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" -FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" -FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xcb/libxcb_0.9.93.bb b/packages/xcb/libxcb_0.9.93.bb index 2046e53721..b74243e898 100644 --- a/packages/xcb/libxcb_0.9.93.bb +++ b/packages/xcb/libxcb_0.9.93.bb @@ -1,47 +1,4 @@ -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" +include libxcb.inc PR = "r2" -PARALLEL_MAKE = "" -DEPENDS = "xcb-proto libxau libxslt-native" -# DEPENDS += "xsltproc-native gperf-native" - -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-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" -FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*" -FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" -FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" -FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*" -FILES_libxcb-randr = "${libdir}/libxcb-randr.so.*" -FILES_libxcb-record = "${libdir}/libxcb-record.so.*" -FILES_libxcb-render = "${libdir}/libxcb-render.so.*" -FILES_libxcb-res = "${libdir}/libxcb-res.so.*" -FILES_libxcb-screensaver = "${libdir}/libxcb-screensaver.so.*" -FILES_libxcb-shape = "${libdir}/libxcb-shape.so.*" -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-xfixes = "${libdir}/libxcb-xfixes.so.*" -FILES_libxcb-xinerama = "${libdir}/libxcb-xinerama.so.*" -FILES_libxcb-xlib = "${libdir}/libxcb-xlib.so.*" -FILES_libxcb-xprint = "${libdir}/libxcb-xprint.so.*" -FILES_libxcb-xtest = "${libdir}/libxcb-xtest.so.*" -FILES_libxcb-xv = "${libdir}/libxcb-xv.so.*" -FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} +PACKAGES =+ "libxcb-xinerama" diff --git a/packages/xcb/libxcb_1.0.bb b/packages/xcb/libxcb_1.0.bb new file mode 100644 index 0000000000..dd88a5390f --- /dev/null +++ b/packages/xcb/libxcb_1.0.bb @@ -0,0 +1,6 @@ +include libxcb.inc +PR = "r0" + +DEPENDS += "libpthread-stubs" + +PACKAGES =+ "libxcb-xinerama" diff --git a/packages/xcb/libxcb_git.bb b/packages/xcb/libxcb_git.bb index e6b42c1a31..cb7326efa0 100644 --- a/packages/xcb/libxcb_git.bb +++ b/packages/xcb/libxcb_git.bb @@ -1,77 +1,12 @@ DEFAULT_PREFERENCE = "-1" -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" -PV = "0.9+git" +include libxcb.inc +PV = "1.0+git" PR = "r0" -PARALLEL_MAKE = "" - - -DEPENDS = "xcb-proto xproto libxau" -# DEPENDS += "xsltproc-native gperf-native" +DEPENDS += "libpthread-stubs" SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" S = "${WORKDIR}/git/xcb" -PACKAGES = "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 -} +PACKAGES =+ "libxcb-xinerama" diff --git a/packages/xcb/xcb-proto.inc b/packages/xcb/xcb-proto.inc new file mode 100644 index 0000000000..ca477f36d3 --- /dev/null +++ b/packages/xcb/xcb-proto.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" + +inherit autotools pkgconfig + +FILES_${PN}-dev += "${datadir}/xcb/*.xml" + +do_stage() { + oe_runmake DESTDIR="${D}" install + mkdir -p ${STAGING_LIBDIR}/pkgconfig + install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig + mkdir -p ${STAGING_DATADIR}/xcb + install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb +} diff --git a/packages/xcb/xcb-proto_0.9.91.bb b/packages/xcb/xcb-proto_0.9.91.bb index 2c3c885627..7ca4463402 100644 --- a/packages/xcb/xcb-proto_0.9.91.bb +++ b/packages/xcb/xcb-proto_0.9.91.bb @@ -1,19 +1,2 @@ -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" +include xcb-proto.inc PR = "r0" - -SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" - -inherit autotools pkgconfig - -FILES_${PN}-dev += "${datadir}/xcb/*.xml" - -do_stage() { - oe_runmake DESTDIR="${D}" install - mkdir -p ${STAGING_LIBDIR}/pkgconfig - install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig - mkdir -p ${STAGING_DATADIR}/xcb - install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb -} diff --git a/packages/xcb/xcb-proto_0.9.92.bb b/packages/xcb/xcb-proto_0.9.92.bb index f7f4160d5b..7ca4463402 100644 --- a/packages/xcb/xcb-proto_0.9.92.bb +++ b/packages/xcb/xcb-proto_0.9.92.bb @@ -1,19 +1,2 @@ -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" +include xcb-proto.inc PR = "r0" - -SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" - -inherit autotools pkgconfig - -FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/xcb.xsd" - -do_stage() { - oe_runmake DESTDIR="${D}" install - mkdir -p ${STAGING_LIBDIR}/pkgconfig - install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig - mkdir -p ${STAGING_DATADIR}/xcb - install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb -} diff --git a/packages/xcb/xcb-proto_0.9.93.bb b/packages/xcb/xcb-proto_0.9.93.bb index f7f4160d5b..7ca4463402 100644 --- a/packages/xcb/xcb-proto_0.9.93.bb +++ b/packages/xcb/xcb-proto_0.9.93.bb @@ -1,19 +1,2 @@ -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" +include xcb-proto.inc PR = "r0" - -SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" - -inherit autotools pkgconfig - -FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/xcb.xsd" - -do_stage() { - oe_runmake DESTDIR="${D}" install - mkdir -p ${STAGING_LIBDIR}/pkgconfig - install ${D}${libdir}/pkgconfig/xcb-proto.pc ${STAGING_LIBDIR}/pkgconfig - mkdir -p ${STAGING_DATADIR}/xcb - install ${D}${datadir}/xcb/*.xml ${STAGING_DATADIR}/xcb -} diff --git a/packages/xcb/xcb-proto_0.9.bb b/packages/xcb/xcb-proto_0.9.bb index 853da9cc5a..b483c426d3 100644 --- a/packages/xcb/xcb-proto_0.9.bb +++ b/packages/xcb/xcb-proto_0.9.bb @@ -1,13 +1,2 @@ -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" +include xcb-proto.bb PR = "r0" - -SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-0.9.tar.bz2" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -} diff --git a/packages/xcb/xcb-proto_1.0.bb b/packages/xcb/xcb-proto_1.0.bb new file mode 100644 index 0000000000..7ca4463402 --- /dev/null +++ b/packages/xcb/xcb-proto_1.0.bb @@ -0,0 +1,2 @@ +include xcb-proto.inc +PR = "r0" diff --git a/packages/xcb/xcb-proto_git.bb b/packages/xcb/xcb-proto_git.bb index e7dcf61de1..26b6ce7d01 100644 --- a/packages/xcb/xcb-proto_git.bb +++ b/packages/xcb/xcb-proto_git.bb @@ -1,17 +1,13 @@ DEFAULT_PREFERENCE = "-1" -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" -PV = "0.9+git" +include xcb-proto.inc +PV = "1.0+git" PR = "r0" SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" S = "${WORKDIR}/git/xcb-proto" -inherit autotools pkgconfig - do_stage() { autotools_stage_all } + diff --git a/packages/xcb/xcb-util.inc b/packages/xcb/xcb-util.inc new file mode 100644 index 0000000000..4509a2b52b --- /dev/null +++ b/packages/xcb/xcb-util.inc @@ -0,0 +1,31 @@ +DESCRIPTION = "XCB: an X protocol C binding" +SECTION = "x11/libs" +LICENSE = "MIT-X" +HOMEPAGE = "http://xcb.freedesktop.org" + +DEPENDS = "libxcb" +# DEPENDS += "gperf-native" + +PARALLEL_MAKE = "" + +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-util-${PV}.tar.bz2" + +PACKAGES =+ "libxcbatom libxcbaux libxcbevent libxcbicccm \ + libxcbimage libxcbkeysyms libxcbproperty \ + libxcbreply libxcbwm" + +FILES_libxcbatom = "${libdir}/libXCBAtom.so.*" +FILES_libxcbaux = "${libdir}/libXCBAux.so.*" +FILES_libxcbevent = "${libdir}/libXCBEvent.so.*" +FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*" +FILES_libxcbimage = "${libdir}/libXCBImage.so.*" +FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*" +FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*" +FILES_libxcbreply = "${libdir}/libXCBReply.so.*" +FILES_libxcbwm = "${libdir}/libXCBWM.so.*" + +inherit autotools pkgconfig + +do_stage () { + autotools_stage_all +} diff --git a/packages/xcb/xcb-util_0.1.bb b/packages/xcb/xcb-util_0.1.bb index e7db2271ea..5f3057f489 100644 --- a/packages/xcb/xcb-util_0.1.bb +++ b/packages/xcb/xcb-util_0.1.bb @@ -1,41 +1,2 @@ -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" +include xcb-util.inc PR = "r0" - -DEPENDS = "libxcb" -# DEPENDS += "gperf-native" - -PARALLEL_MAKE = "" - -SRC_URI = "http://xcb.freedesktop.org/dist/xcb-util-0.1.tar.bz2" - -PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \ - libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \ - libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev" - -FILES_libxcbatom = "${libdir}/libXCBAtom.so.*" -FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h" -FILES_libxcbaux = "${libdir}/libXCBAux.so.*" -FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h" -FILES_libxcbevent = "${libdir}/libXCBEvent.so.*" -FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h" -FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*" -FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h" -FILES_libxcbimage = "${libdir}/libXCBImage.so.*" -FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h" -FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*" -FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h" -FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*" -FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h" -FILES_libxcbreply = "${libdir}/libXCBReply.so.*" -FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h" -FILES_libxcbwm = "${libdir}/libXCBWM.so.*" -FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/xcb/xcb-util_0.2.bb b/packages/xcb/xcb-util_0.2.bb index b0efa9f669..5f3057f489 100644 --- a/packages/xcb/xcb-util_0.2.bb +++ b/packages/xcb/xcb-util_0.2.bb @@ -1,41 +1,2 @@ -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" +include xcb-util.inc PR = "r0" - -DEPENDS = "libxcb" -# DEPENDS += "gperf-native" - -PARALLEL_MAKE = "" - -SRC_URI = "http://xcb.freedesktop.org/dist/xcb-util-${PV}.tar.bz2" - -PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \ - libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \ - libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev" - -FILES_libxcbatom = "${libdir}/libXCBAtom.so.*" -FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h" -FILES_libxcbaux = "${libdir}/libXCBAux.so.*" -FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h" -FILES_libxcbevent = "${libdir}/libXCBEvent.so.*" -FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h" -FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*" -FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h" -FILES_libxcbimage = "${libdir}/libXCBImage.so.*" -FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h" -FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*" -FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h" -FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*" -FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h" -FILES_libxcbreply = "${libdir}/libXCBReply.so.*" -FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h" -FILES_libxcbwm = "${libdir}/libXCBWM.so.*" -FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} diff --git a/packages/xcb/xcb-util_git.bb b/packages/xcb/xcb-util_git.bb index 9065c62d15..9ffae6d5cb 100644 --- a/packages/xcb/xcb-util_git.bb +++ b/packages/xcb/xcb-util_git.bb @@ -1,45 +1,8 @@ DEFAULT_PREFERENCE = "-1" -DESCRIPTION = "XCB: an X protocol C binding" -SECTION = "x11/libs" -LICENSE = "MIT-X" -HOMEPAGE = "http://xcb.freedesktop.org" -PV = "0.1+git" +include xcb-util.git +PV = "0.2+git" PR = "r0" -DEPENDS = "libxcb" -# DEPENDS += "gperf-native" - -PARALLEL_MAKE = "" - SRC_URI = "git://anongit.freedesktop.org/git/xcb;protocol=git" S = "${WORKDIR}/git/xcb-util" - -PACKAGES = "libxcbatom libxcbatom-dev libxcbaux libxcbaux-dev libxcbevent libxcbevent-dev libxcbicccm libxcbicccm-dev \ - libxcbimage libxcbimage-dev libxcbkeysyms libxcbkeysyms-dev libxcbproperty libxcbproperty-dev \ - libxcbreply libxcbreply-dev libxcbwm libxcbwm-dev" - -FILES_libxcbatom = "${libdir}/libXCBAtom.so.*" -FILES_libxcbatom-dev = "${libdir}/libXCBAtom.* ${libdir}/pkgconfig/xcb-atom.pc ${includedir}/X11/XCB/xcb_atom.h" -FILES_libxcbaux = "${libdir}/libXCBAux.so.*" -FILES_libxcbaux-dev = "${libdir}/libXCBAux.* ${libdir}/pkgconfig/xcb-aux.pc ${includedir}/X11/XCB/xcb_aux.h" -FILES_libxcbevent = "${libdir}/libXCBEvent.so.*" -FILES_libxcbevent-dev = "${libdir}/libXCBEvent.* ${libdir}/pkgconfig/xcb-event.pc ${includedir}/X11/XCB/xcb_event.h" -FILES_libxcbicccm = "${libdir}/libXCBICCCM.so.*" -FILES_libxcbicccm-dev = "${libdir}/libICCCM.* ${libdir}/pkgconfig/xcb-icccm.pc ${includedir}/X11/XCB/xcb_icccm.h" -FILES_libxcbimage = "${libdir}/libXCBImage.so.*" -FILES_libxcbimage-dev = "${libdir}/libXCBImage.* ${libdir}/pkgconfig/xcb-image.pc ${includedir}/X11/XCB/xcb_image.h" -FILES_libxcbkeysyms = "${libdir}/libXCBKeysyms.so.*" -FILES_libxcbkeysyms-dev = "${libdir}/libXCBKeysyms.* ${libdir}/pkgconfig/xcb-keysyms.pc ${includedir}/X11/XCB/xcb_keysyms.h" -FILES_libxcbproperty = "${libdir}/libXCBProperty.so.*" -FILES_libxcbproperty-dev = "${libdir}/libXCBProperty.* ${libdir}/pkgconfig/xcb-property.pc ${includedir}/X11/XCB/xcb_property.h" -FILES_libxcbreply = "${libdir}/libXCBReply.so.*" -FILES_libxcbreply-dev = "${libdir}/libXCBReply.* ${libdir}/pkgconfig/xcb-reply.pc ${includedir}/X11/XCB/xcb_reply.h" -FILES_libxcbwm = "${libdir}/libXCBWM.so.*" -FILES_libxcbwm-dev = "${libdir}/libXCBWM.* ${libdir}/pkgconfig/xcb-wm.pc ${includedir}/X11/XCB/xcb_wm.h" - -inherit autotools pkgconfig - -do_stage () { - autotools_stage_all -} -- cgit 1.2.3-korg