mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 17:39:31 +00:00
libxcb: use python3 to build it
Backport Fix-inconsistent-use-of-tabs-vs.-space.patch to make it can be built by python3. (From OE-Core rev: c488656825accf4543754cb712256a775d5a92e7) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
ede331909b
commit
1d3b825191
@@ -0,0 +1,62 @@
|
|||||||
|
From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thomas Klausner <wiz@NetBSD.org>
|
||||||
|
Date: Thu, 19 May 2016 17:31:18 +0200
|
||||||
|
Subject: [PATCH] Fix inconsistent use of tabs vs. space.
|
||||||
|
|
||||||
|
Needed for at least python-3.5.x.
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
|
||||||
|
Signed-off-by: Uli Schlachter <psychon@znc.in>
|
||||||
|
|
||||||
|
Upstream-Status: Backport
|
||||||
|
|
||||||
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||||
|
---
|
||||||
|
src/c_client.py | 14 +++++++-------
|
||||||
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/c_client.py b/src/c_client.py
|
||||||
|
index 57de3fb..043338d 100644
|
||||||
|
--- a/src/c_client.py
|
||||||
|
+++ b/src/c_client.py
|
||||||
|
@@ -1364,7 +1364,7 @@ def _c_serialize(context, self):
|
||||||
|
_c(' unsigned int xcb_align_to = 0;')
|
||||||
|
if self.is_switch:
|
||||||
|
_c(' unsigned int xcb_padding_offset = %d;',
|
||||||
|
- self.get_align_offset() )
|
||||||
|
+ self.get_align_offset() )
|
||||||
|
prefix = [('_aux', '->', self)]
|
||||||
|
aux_ptr = 'xcb_out'
|
||||||
|
|
||||||
|
@@ -1390,7 +1390,7 @@ def _c_serialize(context, self):
|
||||||
|
_c(' unsigned int xcb_align_to = 0;')
|
||||||
|
if self.is_switch:
|
||||||
|
_c(' unsigned int xcb_padding_offset = %d;',
|
||||||
|
- self.get_align_offset() )
|
||||||
|
+ self.get_align_offset() )
|
||||||
|
|
||||||
|
elif 'sizeof' == context:
|
||||||
|
param_names = [p[2] for p in params]
|
||||||
|
@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field):
|
||||||
|
# from the request size and divide that by the member size
|
||||||
|
return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))'
|
||||||
|
else:
|
||||||
|
- # use the accessor to get the start of the list, then
|
||||||
|
- # compute the length of it by subtracting it from
|
||||||
|
+ # use the accessor to get the start of the list, then
|
||||||
|
+ # compute the length of it by subtracting it from
|
||||||
|
# the adress of the first byte after the end of the
|
||||||
|
# request
|
||||||
|
- after_end_of_request = '(((char*)R) + R->length * 4)'
|
||||||
|
- start_of_list = '%s(R)' % (field.c_accessor_name)
|
||||||
|
+ after_end_of_request = '(((char*)R) + R->length * 4)'
|
||||||
|
+ start_of_list = '%s(R)' % (field.c_accessor_name)
|
||||||
|
bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list)
|
||||||
|
- return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
|
||||||
|
+ return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
|
||||||
|
else:
|
||||||
|
raise Exception(
|
||||||
|
"lengthless lists with varsized members are not supported. Fieldname '%s'"
|
||||||
|
--
|
||||||
|
2.9.0
|
||||||
|
|
||||||
@@ -13,6 +13,7 @@ SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
|
|||||||
file://xcbincludedir.patch \
|
file://xcbincludedir.patch \
|
||||||
file://disable-check.patch \
|
file://disable-check.patch \
|
||||||
file://gcc-mips-pr68302-mips-workaround.patch \
|
file://gcc-mips-pr68302-mips-workaround.patch \
|
||||||
|
file://Fix-inconsistent-use-of-tabs-vs.-space.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "28e552bd78bc1050b6b26ca1db0e5bb6"
|
SRC_URI[md5sum] = "28e552bd78bc1050b6b26ca1db0e5bb6"
|
||||||
SRC_URI[sha256sum] = "4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b"
|
SRC_URI[sha256sum] = "4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b"
|
||||||
@@ -31,6 +32,8 @@ inherit autotools pkgconfig distro_features_check
|
|||||||
REQUIRED_DISTRO_FEATURES = "x11"
|
REQUIRED_DISTRO_FEATURES = "x11"
|
||||||
REQUIRED_DISTRO_FEATURES_class-native = ""
|
REQUIRED_DISTRO_FEATURES_class-native = ""
|
||||||
|
|
||||||
|
export PYTHON = "python3"
|
||||||
|
|
||||||
python populate_packages_prepend () {
|
python populate_packages_prepend () {
|
||||||
do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True)
|
do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user