From 377f19bdd3f87d707ea1d7ea0d60a1771c306a972d68c74405637d730f53a0b8 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Wed, 10 Jan 2018 09:51:07 +0000 Subject: [PATCH] Accepting request 563225 from home:michalsrb:branches2:X11:XOrg - Update to 17.3.2 * Multiple fixes in the RADV Vulkan driver, workaround when using slibtool and a GLSL workaround for various titles using Unreal Engine 4. - Drop upstreamed u_r600-Add-support-for-B5G5R5A1.patch - Modify u_mesa-python3-only.patch to not break python 2. OBS-URL: https://build.opensuse.org/request/show/563225 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=676 --- Mesa-drivers.changes | 10 ++++++++++ Mesa-drivers.spec | 6 ++---- Mesa.changes | 10 ++++++++++ Mesa.spec | 6 ++---- mesa-17.3.1.tar.xz | 3 --- mesa-17.3.1.tar.xz.sig | Bin 566 -> 0 bytes mesa-17.3.2.tar.xz | 3 +++ mesa-17.3.2.tar.xz.sig | Bin 0 -> 566 bytes u_mesa-python3-only.patch | 12 ++++++------ u_r600-Add-support-for-B5G5R5A1.patch | 27 -------------------------- 10 files changed, 33 insertions(+), 44 deletions(-) delete mode 100644 mesa-17.3.1.tar.xz delete mode 100644 mesa-17.3.1.tar.xz.sig create mode 100644 mesa-17.3.2.tar.xz create mode 100644 mesa-17.3.2.tar.xz.sig delete mode 100644 u_r600-Add-support-for-B5G5R5A1.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index dad066e..4b17383 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 10 08:28:09 UTC 2018 - msrb@suse.com + +- Update to 17.3.2 + * Multiple fixes in the RADV Vulkan driver, workaround when using + slibtool and a GLSL workaround for various titles using Unreal + Engine 4. +- Drop upstreamed u_r600-Add-support-for-B5G5R5A1.patch +- Modify u_mesa-python3-only.patch to not break python 2. + ------------------------------------------------------------------- Mon Jan 8 14:44:46 UTC 2018 - msrb@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index e025802..34875d2 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -43,7 +43,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 17.3.1 +%define _version 17.3.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -108,7 +108,7 @@ %endif Name: Mesa-drivers -Version: 17.3.1 +Version: 17.3.2 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT @@ -138,7 +138,6 @@ 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 -Patch42: u_r600-Add-support-for-B5G5R5A1.patch # Upstream Patch43: u_mesa-python3-only.patch @@ -742,7 +741,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch32 -p1 %endif -%patch42 -p1 %patch43 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when diff --git a/Mesa.changes b/Mesa.changes index dad066e..4b17383 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 10 08:28:09 UTC 2018 - msrb@suse.com + +- Update to 17.3.2 + * Multiple fixes in the RADV Vulkan driver, workaround when using + slibtool and a GLSL workaround for various titles using Unreal + Engine 4. +- Drop upstreamed u_r600-Add-support-for-B5G5R5A1.patch +- Modify u_mesa-python3-only.patch to not break python 2. + ------------------------------------------------------------------- Mon Jan 8 14:44:46 UTC 2018 - msrb@suse.com diff --git a/Mesa.spec b/Mesa.spec index 7e63061..98acf04 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 17.3.1 +%define _version 17.3.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -107,7 +107,7 @@ %endif Name: Mesa -Version: 17.3.1 +Version: 17.3.2 Release: 0 Summary: System for rendering interactive 3-D graphics License: MIT @@ -137,7 +137,6 @@ 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 -Patch42: u_r600-Add-support-for-B5G5R5A1.patch # Upstream Patch43: u_mesa-python3-only.patch @@ -741,7 +740,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch32 -p1 %endif -%patch42 -p1 %patch43 -p1 # Remove requires to libglvnd/libglvnd-devel from baselibs.conf when diff --git a/mesa-17.3.1.tar.xz b/mesa-17.3.1.tar.xz deleted file mode 100644 index 59f59fc..0000000 --- a/mesa-17.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ae607e0998a586fb2c866cfc8e45e6f52d1c56cb1b41288253ea83eada824c1 -size 10669392 diff --git a/mesa-17.3.1.tar.xz.sig b/mesa-17.3.1.tar.xz.sig deleted file mode 100644 index cff47919464777cba7d8b7f3e32ab2072bfba148ce3296e59e2e60202f7d3f72..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j+O1GaDue&B6-Ik?vCt~anO>q!j-0$MxpSpW(N5bdrv zuq^9I4Zl|p|4qYmKsj?as1(6pR_Ow_hxNe_OkNh$=p?pbSVlFhlxN577_CgKcn|mQ}IQi;ha*T|*J55Kzi#CloGQ=}YP(OgXt7Ur@JF4A#IHEvB08+Nn-Pt?1p!^DruHiZTT6?oVbp zQ0MIDrAYT@FeB0rILZl>P+sFLdhqT1d(;dG=We;H9`k@Tpp9)Wsog1l@wUgWreW#7 z?hxC{i=5$c9uD`E(Rc3Gdf~^Gc8Y&O$akiWRk0@r5ivXmh8^)E>vfq!j-0$Nn)Isgg@5bdrv zuq^9I4Uc^f|4l_CKysKLZ2;?dqlIJh7^g}RZB!ERmdRYv0gavn~uIFuDlfw9QH6pLpr!#DRexzfc1%}}t1O9aYb zKIJlnJ-_<9-`%}15&d|i9^{e2;bGH7C)VSFoofdc4n|Jr@_x9B*Jg2`7=~g%qphA7 zs5nB7hPQ3N2@%XjgvEJL{ifLY6nc(38d2g_G^W7dQ7H10&((Zm&Y&-p@O?l!Y7P}8 zJr5l_FWC6{TRbRJx5+nKA!}{6I>jUXNa#=(Y?^(dAfbPjOy1AF`o?^Nj?7Z;nLcjR zcV|yvyJ0$5gkO;HRGlO@J+NA`ZH1xb^_zvPbf!oYTz_sfFB6=Fd(`OihwedAZLh+% z$Ka*0GE!SISi-J(n6z045$#ORAeI}!@XgTF2-{4b=vQLnAvWbL`RWAwM0W-s=0Vs? zpRy4|5TeevMz(v&{HK=X+(Fj_efwtaYNK`dlc EA=$4Jt^fc4 literal 0 HcmV?d00001 diff --git a/u_mesa-python3-only.patch b/u_mesa-python3-only.patch index a56396d..a6a96f8 100644 --- a/u_mesa-python3-only.patch +++ b/u_mesa-python3-only.patch @@ -26,7 +26,7 @@ index d7b78c7fb1..7bda44ce83 100644 - print CopyRight.strip() - print ''' + print('/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */') -+ print() ++ print('') + print(CopyRight.strip()) + print(''' #ifndef EG_TABLES_H @@ -47,7 +47,7 @@ index d7b78c7fb1..7bda44ce83 100644 - print + print('\t{%s, %s},' % (strings.add(pkt[5:]), pkt)) + print('};') -+ print() ++ print('') - print 'static const struct eg_field egd_fields_table[] = {' + print('static const struct eg_field egd_fields_table[] = {') @@ -77,7 +77,7 @@ index d7b78c7fb1..7bda44ce83 100644 - print '};' - print + print('};') -+ print() ++ print('') - print 'static const struct eg_reg egd_reg_table[] = {' + print('static const struct eg_reg egd_reg_table[] = {') @@ -93,18 +93,18 @@ index d7b78c7fb1..7bda44ce83 100644 - print + print('\t{%s, %s},' % (strings.add(reg.name), reg.r_name)) + print('};') -+ print() ++ print('') strings.emit(sys.stdout, "egd_strings") - print -+ print() ++ print('') strings_offsets.emit(sys.stdout, "egd_strings_offsets") - print - print '#endif' -+ print() ++ print('') + print('#endif') diff --git a/u_r600-Add-support-for-B5G5R5A1.patch b/u_r600-Add-support-for-B5G5R5A1.patch deleted file mode 100644 index 8eec796..0000000 --- a/u_r600-Add-support-for-B5G5R5A1.patch +++ /dev/null @@ -1,27 +0,0 @@ -Author: Michal Srb -Subject: r600: Add support for B5G5R5A1. -Patch-Mainline: To be upstreamed -References: bnc#1047154 - -Fixes rendercheck errors when using glamor acceleration in X server. ---- - src/gallium/drivers/r600/r600_asm.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c -index 9e00528c5c..be2a086594 100644 ---- a/src/gallium/drivers/r600/r600_asm.c -+++ b/src/gallium/drivers/r600/r600_asm.c -@@ -2350,6 +2350,12 @@ void r600_vertex_data_type(enum pipe_for - return; - } - -+ if (pformat == PIPE_FORMAT_B5G5R5A1_UNORM) { -+ *format = FMT_1_5_5_5; -+ *endian = r600_endian_swap(16); -+ return; -+ } -+ - desc = util_format_description(pformat); - if (desc->layout != UTIL_FORMAT_LAYOUT_PLAIN) { - goto out_unknown;