From b4620992fb5d81ca0bab3979297aa78fe00da85f Mon Sep 17 00:00:00 2001 From: Richard Leitner Date: Wed, 10 Mar 2021 13:54:20 +0100 Subject: xcb-proto: update to 1.14.1 This fixes [1] the following build error for nativesdk on Fedora 33 which is caused by the removal of fractions.gcd() in favor of math.gcd() in python 3.9 [2]: ImportError: cannot import name 'gcd' from 'fractions' (/usr/lib64/python3.9/fractions.py) Furthermore the SRC_URI is adapted as the old one doesn't provide the 1.14.1 archive. [1] https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512 [2] https://bugs.python.org/issue39350 It's needed in gatesgarth and possibly dunfell as well to support distributions with python-3.9 as we build libxcb-native, which is failing with xcb-proto-1.14. 1.14.1 is a bug fix release: https://lists.x.org/archives/xorg-announce/2020-October/003061.html Signed-off-by: Richard Leitner Signed-off-by: Richard Purdie Signed-off-by: Anuj Mittal --- .../xorg-proto/xcb-proto_1.14.1.bb | 28 ++++++++++++++++++++++ meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb | 28 ---------------------- 2 files changed, 28 insertions(+), 28 deletions(-) create mode 100644 meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb delete mode 100644 meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb new file mode 100644 index 0000000000..52e474a2e9 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.1.bb @@ -0,0 +1,28 @@ +SUMMARY = "XCB: The X protocol C binding headers" +DESCRIPTION = "Function prototypes for the X protocol C-language Binding \ +(XCB). 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 \ + file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" + +SRC_URI = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz" +SRC_URI[sha256sum] = "f04add9a972ac334ea11d9d7eb4fc7f8883835da3e4859c9afa971efdf57fcc3" + +inherit autotools pkgconfig python3native + +PACKAGES += "python-xcbgen" + +FILES_${PN} = "" +FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" +FILES_python-xcbgen = "${PYTHON_SITEPACKAGES_DIR}" + +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb deleted file mode 100644 index 6de30098d6..0000000000 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.14.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "XCB: The X protocol C binding headers" -DESCRIPTION = "Function prototypes for the X protocol C-language Binding \ -(XCB). 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 \ - file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" - -SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.xz" -SRC_URI[sha256sum] = "186a3ceb26f9b4a015f5a44dcc814c93033a5fc39684f36f1ecc79834416a605" - -inherit autotools pkgconfig python3native - -PACKAGES += "python-xcbgen" - -FILES_${PN} = "" -FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" -FILES_python-xcbgen = "${PYTHON_SITEPACKAGES_DIR}" - -RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg