Hello community, here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2018-02-25 12:21:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa (Old) and /work/SRC/openSUSE:Factory/.Mesa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa" Sun Feb 25 12:21:22 2018 rev:316 rq:579528 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa/Mesa-drivers.changes 2018-02-19 12:59:43.220776643 +0100 +++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa-drivers.changes 2018-02-25 12:21:25.841573388 +0100 @@ -1,0 +2,39 @@ +Fri Feb 23 13:25:16 UTC 2018 - [email protected] + +- removed no longer needed ncurses-devel BuildRequires (boo#1082315) + +------------------------------------------------------------------- +Fri Feb 23 13:19:41 UTC 2018 - [email protected] + +- redone u_add_llvm_codegen_dependencies.patch and renamed to + u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch + (boo#1082307) + +------------------------------------------------------------------- +Fri Feb 23 13:03:51 UTC 2018 - [email protected] + +- removed u_mesa-8.0.1-fix-16bpp.patch and + u_mesa-8.0-llvmpipe-shmget.patch, which we no longer apply since + about 5 years (boo#1082305) + +------------------------------------------------------------------- +Fri Feb 23 12:01:29 UTC 2018 - [email protected] + +- recreated u_mesa-python3-only.patch and renamed to + u_r600-egd_tables.py-added-support-for-python-3.patch; also + removed first hunk (boo#1082303) + +------------------------------------------------------------------- +Fri Feb 23 10:51:04 UTC 2018 - [email protected] + +- removed n_Define-GLAPIVAR-separate-from-GLAPI.patch + * bits moved to libGLw's n_Use-newly-introduced-GLAPIVAR-for-variables.patch + (boo#1082297) + +------------------------------------------------------------------- +Mon Feb 19 23:24:22 UTC 2018 - [email protected] + +- Mesa-gallium only exists if %{with_opencl} +- Add support for riscv64 + +------------------------------------------------------------------- Mesa.changes: same change Old: ---- n_Define-GLAPIVAR-separate-from-GLAPI.patch u_add_llvm_codegen_dependencies.patch u_mesa-8.0-llvmpipe-shmget.patch u_mesa-8.0.1-fix-16bpp.patch u_mesa-python3-only.patch New: ---- u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch u_r600-egd_tables.py-added-support-for-python-3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa-drivers.spec ++++++ --- /var/tmp/diff_new_pack.ZAgPiU/_old 2018-02-25 12:21:27.121527030 +0100 +++ /var/tmp/diff_new_pack.ZAgPiU/_new 2018-02-25 12:21:27.125526885 +0100 @@ -82,6 +82,12 @@ %define with_llvm 1 %endif +%if 0%{with_opencl} +%define have_gallium 1 +%else +%define have_gallium 0 +%endif + %if %{drivers} %define glamor 0 %else @@ -127,20 +133,14 @@ Source7: Mesa.keyring # to be upstreamed Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch -Patch12: u_add_llvm_codegen_dependencies.patch -# Patch from Fedora, fix 16bpp in llvmpipe -Patch13: u_mesa-8.0.1-fix-16bpp.patch -# Patch from Fedora, use shmget when available, under llvmpipe -Patch15: u_mesa-8.0-llvmpipe-shmget.patch +Patch12: u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch # never to be upstreamed Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch -# never to be upstreamed -Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch # currently needed for libglvnd support Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch Patch32: archlinux_glvnd-fix-gl-dot-pc.patch # Upstream -Patch43: u_mesa-python3-only.patch +Patch43: u_r600-egd_tables.py-added-support-for-python-3.patch Patch45: n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch Patch46: u_glsl-linker-error.patch @@ -222,9 +222,6 @@ %if 0%{with_llvm} BuildRequires: llvm-devel >= 3.9.0 %endif -%ifarch aarch64 %arm ppc64 ppc64le s390x %ix86 x86_64 -BuildRequires: ncurses-devel -%endif %if 0%{with_opencl} BuildRequires: clang-devel @@ -241,7 +238,9 @@ # do not install recommends on their system still get working Mesa. It is # ignored in obs when Mesa is installed as build dependency. Requires: Mesa-dri = %{version} +%if 0%{have_gallium} Requires: Mesa-gallium = %{version} +%endif %description Mesa is a 3-D graphics library with an API which is very similar to @@ -602,7 +601,7 @@ Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) Group: System/Libraries -%ifarch x86_64 s390x ppc64le aarch64 +%ifarch x86_64 s390x ppc64le aarch64 riscv64 Provides: d3dadapter9.so.1()(64bit) %else Provides: d3dadapter9.so.1 @@ -748,11 +747,8 @@ ### order to figure out whether the issue is still reproducable and ### hence a fix is required #%patch11 -p1 -#%patch15 -p1 -#%patch13 -p1 %patch12 -p1 %patch18 -p1 -%patch21 -p1 %if 0%{?libglvnd} %patch31 -p1 @@ -845,7 +841,7 @@ --with-dri-drivers=nouveau \ --with-gallium-drivers=r300,r600,nouveau,swrast \ %endif - %ifarch ia64 ppc hppa s390 s390x + %ifarch ia64 ppc hppa s390 s390x riscv64 --with-dri-drivers=swrast \ --with-gallium-drivers=swrast \ %endif ++++++ Mesa.spec ++++++ --- /var/tmp/diff_new_pack.ZAgPiU/_old 2018-02-25 12:21:27.153525871 +0100 +++ /var/tmp/diff_new_pack.ZAgPiU/_new 2018-02-25 12:21:27.157525726 +0100 @@ -81,6 +81,12 @@ %define with_llvm 1 %endif +%if 0%{with_opencl} +%define have_gallium 1 +%else +%define have_gallium 0 +%endif + %if %{drivers} %define glamor 0 %else @@ -126,20 +132,14 @@ Source7: Mesa.keyring # to be upstreamed Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch -Patch12: u_add_llvm_codegen_dependencies.patch -# Patch from Fedora, fix 16bpp in llvmpipe -Patch13: u_mesa-8.0.1-fix-16bpp.patch -# Patch from Fedora, use shmget when available, under llvmpipe -Patch15: u_mesa-8.0-llvmpipe-shmget.patch +Patch12: u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch # never to be upstreamed Patch18: n_VDPAU-XVMC-libs-Replace-hardlinks-with-copies.patch -# never to be upstreamed -Patch21: n_Define-GLAPIVAR-separate-from-GLAPI.patch # currently needed for libglvnd support Patch31: archlinux_0001-Fix-linkage-against-shared-glapi.patch Patch32: archlinux_glvnd-fix-gl-dot-pc.patch # Upstream -Patch43: u_mesa-python3-only.patch +Patch43: u_r600-egd_tables.py-added-support-for-python-3.patch Patch45: n_Disable-AMDGPU-GFX9-Vega-on-LLVM-lessthan-6.0.0.patch Patch46: u_glsl-linker-error.patch @@ -221,9 +221,6 @@ %if 0%{with_llvm} BuildRequires: llvm-devel >= 3.9.0 %endif -%ifarch aarch64 %arm ppc64 ppc64le s390x %ix86 x86_64 -BuildRequires: ncurses-devel -%endif %if 0%{with_opencl} BuildRequires: clang-devel @@ -240,7 +237,9 @@ # do not install recommends on their system still get working Mesa. It is # ignored in obs when Mesa is installed as build dependency. Requires: Mesa-dri = %{version} +%if 0%{have_gallium} Requires: Mesa-gallium = %{version} +%endif %description Mesa is a 3-D graphics library with an API which is very similar to @@ -601,7 +600,7 @@ Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) Group: System/Libraries -%ifarch x86_64 s390x ppc64le aarch64 +%ifarch x86_64 s390x ppc64le aarch64 riscv64 Provides: d3dadapter9.so.1()(64bit) %else Provides: d3dadapter9.so.1 @@ -747,11 +746,8 @@ ### order to figure out whether the issue is still reproducable and ### hence a fix is required #%patch11 -p1 -#%patch15 -p1 -#%patch13 -p1 %patch12 -p1 %patch18 -p1 -%patch21 -p1 %if 0%{?libglvnd} %patch31 -p1 @@ -844,7 +840,7 @@ --with-dri-drivers=nouveau \ --with-gallium-drivers=r300,r600,nouveau,swrast \ %endif - %ifarch ia64 ppc hppa s390 s390x + %ifarch ia64 ppc hppa s390 s390x riscv64 --with-dri-drivers=swrast \ --with-gallium-drivers=swrast \ %endif ++++++ u_configure.ac-Link-to-libLLVMCodegen-to-fix-cyclic-li.patch ++++++ >From 1431fecda9cd4c38eecb6bdc172a7af9ff72c056 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch <[email protected]> Date: Fri, 23 Feb 2018 14:15:19 +0100 Subject: [PATCH] configure.ac: Link to libLLVMCodegen to fix cyclic linking problems Patch by "Ismail Doenmez" <[email protected]> https://bugzilla.suse.com/show_bug.cgi?id=1082307 --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 8a9172690a..a23eb844d4 100644 --- a/configure.ac +++ b/configure.ac @@ -1032,6 +1032,7 @@ llvm_add_default_components() { # Required default components llvm_add_component "bitwriter" $driver_name + llvm_add_component "codegen" $driver_name llvm_add_component "engine" $driver_name llvm_add_component "mcdisassembler" $driver_name llvm_add_component "mcjit" $driver_name -- 2.13.6 ++++++ u_r600-egd_tables.py-added-support-for-python-3.patch ++++++ >From c1714e8bf49fc0034c91ffed4adfbb067dbdf856 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch <[email protected]> Date: Fri, 23 Feb 2018 12:46:18 +0100 Subject: [PATCH] r600/egd_tables.py: added support for python 3 Patch by "Tomas Chvatal" <[email protected]> with modifications by "Michal Srb" <[email protected]> to not break python 2. https://bugzilla.suse.com/show_bug.cgi?id=1082303 Signed-off-by: Stefan Dirsch <[email protected]> --- src/gallium/drivers/r600/egd_tables.py | 52 +++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/src/gallium/drivers/r600/egd_tables.py b/src/gallium/drivers/r600/egd_tables.py index d7b78c7fb1..b3b8b50292 100644 --- a/src/gallium/drivers/r600/egd_tables.py +++ b/src/gallium/drivers/r600/egd_tables.py @@ -60,7 +60,7 @@ class StringTable: """ 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 @@ def write_tables(regs, packets): 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 @@ struct eg_packet3 { 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('\t{%s, %s},' % (strings.add(pkt[5:]), pkt)) + print('};') + print('') - print 'static const struct eg_field egd_fields_table[] = {' + 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 @@ struct eg_packet3 { 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('};') + print('') - print 'static const struct eg_reg egd_reg_table[] = {' + 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(): -- 2.13.6
