diff options
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb.inc | 30 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb | 31 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb_git.bb | 10 |
3 files changed, 27 insertions, 44 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxcb.inc b/meta/recipes-graphics/xorg-lib/libxcb.inc deleted file mode 100644 index fe31f20df0..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb.inc +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "XCB: The X protocol C binding library" -DESCRIPTION = "The X protocol C-language Binding (XCB) is a replacement \ -for Xlib featuring a small footprint, latency hiding, direct access to \ -the protocol, improved threading support, and extensibility." -HOMEPAGE = "http://xcb.freedesktop.org" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" - -BBCLASSEXTEND = "native nativesdk" - -SECTION = "x11/libs" -LICENSE = "MIT-X" - -DEPENDS = "xcb-proto xproto libxau xcb-proto-native libpthread-stubs" - -SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ - file://xcbincludedir.patch \ - file://disable-check.patch" - -PACKAGES_DYNAMIC = "^libxcb-.*" - -FILES_${PN} = "${libdir}/libxcb.so.*" - -inherit autotools pkgconfig pythonnative distro_features_check - -# The libxau and others requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -python populate_packages_prepend () { - do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) -} diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb index 23a83ef101..1f4852dd8c 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb @@ -1,10 +1,33 @@ -include libxcb.inc +SUMMARY = "XCB: The X protocol C binding library" +DESCRIPTION = "The X protocol C-language Binding (XCB) is a replacement \ +for Xlib featuring a small footprint, latency hiding, direct access to \ +the protocol, improved threading support, and extensibility." +HOMEPAGE = "http://xcb.freedesktop.org" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" +SECTION = "x11/libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" - -DEPENDS += "libxdmcp" - +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ + file://xcbincludedir.patch \ + file://disable-check.patch" SRC_URI[md5sum] = "f97a65e6158775de518ac391935634c2" SRC_URI[sha256sum] = "b720fd6c7d200e5371affdb3f049cc8f88cff9aed942ff1b824d95eedbf69d30" + +BBCLASSEXTEND = "native nativesdk" + +DEPENDS = "xcb-proto xproto libxau xcb-proto-native libpthread-stubs libxdmcp" + +PACKAGES_DYNAMIC = "^libxcb-.*" + +FILES_${PN} = "${libdir}/libxcb.so.*" + +inherit autotools pkgconfig pythonnative distro_features_check + +# The libxau and others requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +python populate_packages_prepend () { + do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) +} diff --git a/meta/recipes-graphics/xorg-lib/libxcb_git.bb b/meta/recipes-graphics/xorg-lib/libxcb_git.bb deleted file mode 100644 index 186636e1eb..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -include libxcb.inc - -SRCREV = "625ed596cae6dd8175aeb6cb6f26784928042f22" -PV = "1.1.90.1+gitr${SRCPV}" -PR = "r1" - -SRC_URI = "git://anongit.freedesktop.org/git/xcb/libxcb" -S = "${WORKDIR}/git" |