From 373984df4dc14601a2dd7b6a44bf06090811fe34 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 18 May 2022 12:58:03 +0200 Subject: libxcb: update 1.14 -> 1.15 Drop disable-check.patch, with recipe-specific sysroots it is no longer necessary. (From OE-Core rev: 300afee4835c451db139aff6d5a2a465ca6b14f5) Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie --- .../xorg-lib/libxcb/disable-check.patch | 25 -------------- meta/recipes-graphics/xorg-lib/libxcb_1.14.bb | 39 ---------------------- meta/recipes-graphics/xorg-lib/libxcb_1.15.bb | 37 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch delete mode 100644 meta/recipes-graphics/xorg-lib/libxcb_1.14.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxcb_1.15.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch b/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch deleted file mode 100644 index c0efbdc213..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -The "check" package is checked for without an explicit enable/disable option, -which can lead to non-deterministic build issues with both check and libxslt. - -As the unit test suite is minimal at present, simply disable the test suite. In -the future if the test suite is expanded this can be made conditional on the -ptest DISTRO_FEATURE. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - - -Index: libxcb-1.12/configure.ac -=================================================================== ---- libxcb-1.12.orig/configure.ac -+++ libxcb-1.12/configure.ac -@@ -36,7 +36,8 @@ if test x"$HAVE_DOT" = xno; then - AC_MSG_WARN([dot not found - doxygen targets will be skipped]) - fi - --PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) -+dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) -+HAVE_CHECK=no - AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes) - - XSLTPROC=no diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb deleted file mode 100644 index 5341bbd4bc..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb +++ /dev/null @@ -1,39 +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" -SECTION = "x11/libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" - -SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ - file://disable-check.patch \ - " - -SRC_URI[sha256sum] = "a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34" - -BBCLASSEXTEND = "native nativesdk" - -DEPENDS = "xcb-proto xorgproto libxau libpthread-stubs libxdmcp" - -PACKAGES_DYNAMIC = "^${PN}-.*" - -FILES:${PN} = "${libdir}/libxcb.so.*" - -inherit autotools pkgconfig features_check - -# The libxau and others requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" - -export PYTHON = "python3" - -do_install:append () { - chown root.root ${D}${datadir}/doc/${BPN}/tutorial -R -} - -python populate_packages:prepend () { - do_split_packages(d, '${libdir}', r'^libxcb-(.*)\.so\..*$', '${PN}-%s', 'XCB library module for %s', allow_links=True) -} diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.15.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.15.bb new file mode 100644 index 0000000000..839577326e --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.15.bb @@ -0,0 +1,37 @@ +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" + +SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz" + +SRC_URI[sha256sum] = "cc38744f817cf6814c847e2df37fcb8997357d72fa4bcbc228ae0fe47219a059" + +BBCLASSEXTEND = "native nativesdk" + +DEPENDS = "xcb-proto xorgproto libxau libpthread-stubs libxdmcp" + +PACKAGES_DYNAMIC = "^${PN}-.*" + +FILES:${PN} = "${libdir}/libxcb.so.*" + +inherit autotools pkgconfig features_check + +# The libxau and others requires x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +export PYTHON = "python3" + +do_install:append () { + chown root.root ${D}${datadir}/doc/${BPN}/tutorial -R +} + +python populate_packages:prepend () { + do_split_packages(d, '${libdir}', r'^libxcb-(.*)\.so\..*$', '${PN}-%s', 'XCB library module for %s', allow_links=True) +} -- cgit v1.2.3-54-g00ecf