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

@@ -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
 

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

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
 

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

mesa-17.3.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ae607e0998a586fb2c866cfc8e45e6f52d1c56cb1b41288253ea83eada824c1
-size 10669392

mesa-17.3.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e2844a13f2d6f8f24bee65804a51c42d8dc6ae9c36cff7ee61d0940e796d64c6
+size 10670568

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')
  
  

u_r600-Add-support-for-B5G5R5A1.patch

@@ -1,27 +0,0 @@
-Author: Michal Srb <michalsrb@gmail.com>
-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;