From dd24a74e58cd5d4143bf408d5b5217d78cacba92 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 6 Jul 2022 10:07:19 +0200 Subject: xcb-proto: upgrade 1.15 -> 1.15.2 (From OE-Core rev: 1123d6ead7e59c5c181c37a14dba2417afbe55f0) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../0001-xcb-proto.pc.in-reinstate-libdir.patch | 29 +++++++++++++++++++++ .../xorg-proto/xcb-proto_1.15.2.bb | 30 ++++++++++++++++++++++ meta/recipes-graphics/xorg-proto/xcb-proto_1.15.bb | 28 -------------------- 3 files changed, 59 insertions(+), 28 deletions(-) create mode 100644 meta/recipes-graphics/xorg-proto/xcb-proto/0001-xcb-proto.pc.in-reinstate-libdir.patch create mode 100644 meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb delete mode 100644 meta/recipes-graphics/xorg-proto/xcb-proto_1.15.bb diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto/0001-xcb-proto.pc.in-reinstate-libdir.patch b/meta/recipes-graphics/xorg-proto/xcb-proto/0001-xcb-proto.pc.in-reinstate-libdir.patch new file mode 100644 index 0000000000..fe0a96c207 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xcb-proto/0001-xcb-proto.pc.in-reinstate-libdir.patch @@ -0,0 +1,29 @@ +From ed499cffabe64fc1dc5898cb69ffa7e62c19e9d8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Tue, 5 Jul 2022 21:19:20 +0200 +Subject: [PATCH] xcb-proto.pc.in: reinstate libdir + +Otherwise the following occurs when building libxcb: +| checking for xcb-proto >= 1.14... no +| configure: error: Package requirements (xcb-proto >= 1.14) were not met: +| +| Variable 'libdir' not defined in '/srv/work/alex/poky/build-64-alt/tmp/work/core2-64-poky-linux/libxcb/1.15-r0/recipe-sysroot/usr/share/pkgconfig/xcb-proto.pc' + +Upstream-Status: Submitted [https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests/31] +Signed-off-by: Alexander Kanavin +--- + xcb-proto.pc.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/xcb-proto.pc.in b/xcb-proto.pc.in +index 0822b18..c7c8b47 100644 +--- a/xcb-proto.pc.in ++++ b/xcb-proto.pc.in +@@ -2,6 +2,7 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ + datadir=@datadir@ ++libdir=@libdir@ + xcbincludedir=${pc_sysrootdir}@xcbincludedir@ + PYTHON_PREFIX=@PYTHON_PREFIX@ + pythondir=${pc_sysrootdir}@pythondir@ diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb new file mode 100644 index 0000000000..4e4472a9c1 --- /dev/null +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb @@ -0,0 +1,30 @@ +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 \ + file://0001-xcb-proto.pc.in-reinstate-libdir.patch \ + " +SRC_URI[sha256sum] = "7072beb1f680a2fe3f9e535b797c146d22528990c72f63ddb49d2f350a3653ed" + +inherit autotools pkgconfig python3native + +PACKAGES += "python-xcbgen" + +FILES:${PN} = "" +FILES:${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" +FILES:python-xcbgen = "${PYTHON_SITEPACKAGES_DIR}" + +DEV_PKG_DEPENDENCY = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.bb deleted file mode 100644 index 070fb62455..0000000000 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.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 = "https://xorg.freedesktop.org/archive/individual/proto/${BP}.tar.xz" -SRC_URI[sha256sum] = "d34c3b264e8365d16fa9db49179cfa3e9952baaf9275badda0f413966b65955f" - -inherit autotools pkgconfig python3native - -PACKAGES += "python-xcbgen" - -FILES:${PN} = "" -FILES:${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" -FILES:python-xcbgen = "${PYTHON_SITEPACKAGES_DIR}" - -DEV_PKG_DEPENDENCY = "" -RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" - -BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf