hopefully fixed conflict issues now

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1072

Mesa-drivers.changes

@@ -1,5 +1,4 @@
 -------------------------------------------------------------------
-<<<<<<< .mine
 Wed Dec  1 23:15:13 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
 
 - update to 21.3.1
@@ -51,53 +50,6 @@ Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
   * EGL_EXT_present_opaque on wayland
 
 -------------------------------------------------------------------
-=======
-Thu Nov 18 03:13:33 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
-
-- n_buildfix-21.3.0.patch
-  * fixes Mesa-drivers build 
-
--------------------------------------------------------------------
-Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
-
-- update to 21.3.0
-  * Panfrost is now officially GLES 3.1 conformant
-  * RADV has (experimental) ray tracing support
-  * Iris gained threaded shader compilation
-  * Zink has seen an enormous amount of work, and now supports GLES 3.2
-  * Lavapipe has a bunch of new extensions, and now supports Vulkan 1.2
-  * LLVMpipe got 2-3 times faster for 2D workloads, and gained support for
-    the compatibility profile on GL 4.5
-  * VA-API gained support for AV1 videos
-  * EGL now works on Windows
-  * Wayland got a workaround for games making bad assumption (alpha means
-    transparency? who could have known)
-  * VK_EXT_color_write_enable on lavapipe
-  * GL_ARB_texture_filter_anisotropic in llvmpipe
-  * Anisotropic texture filtering in lavapipe
-  * VK_EXT_shader_atomic_float2 on Intel and RADV.
-  * VK_EXT_vertex_input_dynamic_state on RADV.
-  * VK_KHR_timeline_semaphore on lavapipe
-  * VK_EXT_external_memory_host on lavapipe
-  * GL_AMD_pinned_memory on llvmpipe
-  * GL 4.5 compatibility on llvmpipe
-  * VK_EXT_primitive_topology_list_restart on RADV and lavapipe.
-  * ES 3.2 on zink
-  * VK_KHR_depth_stencil_resolve on lavapipe
-  * VK_KHR_shader_integer_dot_product on RADV.
-  * OpenGL FP16 support on llvmpipe
-  * VK_KHR_shader_float16_int8 on lavapipe
-  * VK_KHR_shader_subgroup_extended_types on lavapipe
-  * VK_KHR_spirv_1_4 on lavapipe
-  * Experimental raytracing support on RADV
-  * VK_KHR_synchronization2 on Intel
-  * NGG shader based culling is now enabled by default on GFX10.3 on RADV.
-  * VK_KHR_maintenance4 on RADV
-  * VK_KHR_format_feature_flags2 on RADV.
-  * EGL_EXT_present_opaque on wayland
-
--------------------------------------------------------------------
->>>>>>> .new
 Thu Oct 28 19:07:09 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
 
 - update to 21.2.5

Mesa-drivers.spec

@@ -41,11 +41,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-<<<<<<< .mine
 %define _version 21.3.1
-=======
-%define _version 21.3.0
->>>>>>> .new
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -118,13 +114,8 @@
 %endif
 
 Name:           Mesa-drivers
-<<<<<<< .mine
 Version:        21.3.1
 Release:        0
-=======
-Version:        21.3.0
-Release:        0
->>>>>>> .new
 Summary:        System for rendering 3-D graphics
 License:        MIT
 Group:          System/Libraries

Mesa.changes

@@ -1,5 +1,4 @@
 -------------------------------------------------------------------
-<<<<<<< .mine
 Wed Dec  1 23:15:13 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
 
 - update to 21.3.1
@@ -51,53 +50,6 @@ Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
   * EGL_EXT_present_opaque on wayland
 
 -------------------------------------------------------------------
-=======
-Thu Nov 18 03:13:33 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
-
-- n_buildfix-21.3.0.patch
-  * fixes Mesa-drivers build 
-
--------------------------------------------------------------------
-Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
-
-- update to 21.3.0
-  * Panfrost is now officially GLES 3.1 conformant
-  * RADV has (experimental) ray tracing support
-  * Iris gained threaded shader compilation
-  * Zink has seen an enormous amount of work, and now supports GLES 3.2
-  * Lavapipe has a bunch of new extensions, and now supports Vulkan 1.2
-  * LLVMpipe got 2-3 times faster for 2D workloads, and gained support for
-    the compatibility profile on GL 4.5
-  * VA-API gained support for AV1 videos
-  * EGL now works on Windows
-  * Wayland got a workaround for games making bad assumption (alpha means
-    transparency? who could have known)
-  * VK_EXT_color_write_enable on lavapipe
-  * GL_ARB_texture_filter_anisotropic in llvmpipe
-  * Anisotropic texture filtering in lavapipe
-  * VK_EXT_shader_atomic_float2 on Intel and RADV.
-  * VK_EXT_vertex_input_dynamic_state on RADV.
-  * VK_KHR_timeline_semaphore on lavapipe
-  * VK_EXT_external_memory_host on lavapipe
-  * GL_AMD_pinned_memory on llvmpipe
-  * GL 4.5 compatibility on llvmpipe
-  * VK_EXT_primitive_topology_list_restart on RADV and lavapipe.
-  * ES 3.2 on zink
-  * VK_KHR_depth_stencil_resolve on lavapipe
-  * VK_KHR_shader_integer_dot_product on RADV.
-  * OpenGL FP16 support on llvmpipe
-  * VK_KHR_shader_float16_int8 on lavapipe
-  * VK_KHR_shader_subgroup_extended_types on lavapipe
-  * VK_KHR_spirv_1_4 on lavapipe
-  * Experimental raytracing support on RADV
-  * VK_KHR_synchronization2 on Intel
-  * NGG shader based culling is now enabled by default on GFX10.3 on RADV.
-  * VK_KHR_maintenance4 on RADV
-  * VK_KHR_format_feature_flags2 on RADV.
-  * EGL_EXT_present_opaque on wayland
-
--------------------------------------------------------------------
->>>>>>> .new
 Thu Oct 28 19:07:09 UTC 2021 - Stefan Dirsch <sndirsch@suse.com>
 
 - update to 21.2.5

Mesa.spec

@@ -40,11 +40,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-<<<<<<< .mine
 %define _version 21.3.1
-=======
-%define _version 21.3.0
->>>>>>> .new
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -117,13 +113,8 @@
 %endif
 
 Name:           Mesa
-<<<<<<< .mine
 Version:        21.3.1
 Release:        0
-=======
-Version:        21.3.0
-Release:        0
->>>>>>> .new
 Summary:        System for rendering 3-D graphics
 License:        MIT
 Group:          System/Libraries

mesa-21.3.0.tar.xz

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