summaryrefslogtreecommitdiff
path: root/user/mesa/python3-compat.patch
diff options
context:
space:
mode:
Diffstat (limited to 'user/mesa/python3-compat.patch')
-rw-r--r--user/mesa/python3-compat.patch119
1 files changed, 0 insertions, 119 deletions
diff --git a/user/mesa/python3-compat.patch b/user/mesa/python3-compat.patch
deleted file mode 100644
index 9dc213e9f..000000000
--- a/user/mesa/python3-compat.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- mesa-17.3.1/src/gallium/drivers/r600/egd_tables.py (original)
-+++ mesa-17.3.1/src/gallium/drivers/r600/egd_tables.py (refactored)
-@@ -60,7 +60,7 @@
- """
- fragments = [
- '"%s\\0" /* %s */' % (
-- te[0].encode('string_escape'),
-+ te[0].encode('unicode-escape'),
- ', '.join(str(idx) for idx in te[2])
- )
- for te in self.table
-@@ -217,10 +217,10 @@
- strings = StringTable()
- strings_offsets = IntTable("int")
-
-- print '/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */'
-- print
-- print CopyRight.strip()
-- print '''
-+ print('/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */')
-+ print()
-+ print(CopyRight.strip())
-+ print('''
- #ifndef EG_TABLES_H
- #define EG_TABLES_H
-
-@@ -242,20 +242,20 @@
- unsigned name_offset;
- unsigned op;
- };
--'''
--
-- print 'static const struct eg_packet3 packet3_table[] = {'
-+''')
-+
-+ print('static const struct eg_packet3 packet3_table[] = {')
- for pkt in packets:
-- print '\t{%s, %s},' % (strings.add(pkt[5:]), pkt)
-- print '};'
-- print
--
-- print 'static const struct eg_field egd_fields_table[] = {'
-+ print('\t{%s, %s},' % (strings.add(pkt[5:]), pkt))
-+ print('};')
-+ print()
-+
-+ print('static const struct eg_field egd_fields_table[] = {')
-
- fields_idx = 0
- for reg in regs:
- if len(reg.fields) and reg.own_fields:
-- print '\t/* %s */' % (fields_idx)
-+ print('\t/* %s */' % (fields_idx))
-
- reg.fields_idx = fields_idx
-
-@@ -266,34 +266,34 @@
- while value[1] >= len(values_offsets):
- values_offsets.append(-1)
- values_offsets[value[1]] = strings.add(strip_prefix(value[0]))
-- print '\t{%s, %s(~0u), %s, %s},' % (
-+ print('\t{%s, %s(~0u), %s, %s},' % (
- strings.add(field.name), field.s_name,
-- len(values_offsets), strings_offsets.add(values_offsets))
-+ len(values_offsets), strings_offsets.add(values_offsets)))
- else:
-- print '\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name)
-+ print('\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name))
- fields_idx += 1
-
-- print '};'
-- print
--
-- print 'static const struct eg_reg egd_reg_table[] = {'
-+ print('};')
-+ print()
-+
-+ print('static const struct eg_reg egd_reg_table[] = {')
- for reg in regs:
- if len(reg.fields):
-- print '\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name,
-- len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx)
-+ print('\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name,
-+ len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx))
- else:
-- print '\t{%s, %s},' % (strings.add(reg.name), reg.r_name)
-- print '};'
-- print
-+ print('\t{%s, %s},' % (strings.add(reg.name), reg.r_name))
-+ print('};')
-+ print()
-
- strings.emit(sys.stdout, "egd_strings")
-
-- print
-+ print()
-
- strings_offsets.emit(sys.stdout, "egd_strings_offsets")
-
-- print
-- print '#endif'
-+ print()
-+ print('#endif')
-
-
- def main():
---- mesa-18.1.3/m4/ax_check_python_mako_module.m4.old 2018-06-29 17:47:29.000000000 +0000
-+++ mesa-18.1.3/m4/ax_check_python_mako_module.m4 2018-07-09 01:55:22.740000000 +0000
-@@ -48,8 +48,8 @@
- except ImportError as err:
- sys.exit(err)
- else:
-- ver_req = map(int, '$1'.split('.'))
-- ver_act = map(int, mako.__version__.split('.'))
-+ ver_req = list(map(int, '$1'.split('.')))
-+ ver_act = list(map(int, mako.__version__.split('.')))
- sys.exit(int(ver_req > ver_act))
- " | $PYTHON2 -
-