From 96df9b4a601cc4532b54f5848608bc1944a9efe2ff7529cd4ca6480998f0594a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 2 Dec 2021 10:51:16 +0000 Subject: [PATCH] hopefully fixed conflict issues now OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1072 --- Mesa-drivers.changes | 48 ----------------------------------------- Mesa-drivers.spec | 9 -------- Mesa.changes | 48 ----------------------------------------- Mesa.spec | 9 -------- mesa-21.3.0.tar.xz | 3 --- mesa-21.3.0.tar.xz.sig | Bin 329 -> 0 bytes 6 files changed, 117 deletions(-) delete mode 100644 mesa-21.3.0.tar.xz delete mode 100644 mesa-21.3.0.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 6e00d7a..e0a48a5 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,5 +1,4 @@ ------------------------------------------------------------------- -<<<<<<< .mine Wed Dec 1 23:15:13 UTC 2021 - Stefan Dirsch - update to 21.3.1 @@ -51,53 +50,6 @@ Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch * EGL_EXT_present_opaque on wayland ------------------------------------------------------------------- -======= -Thu Nov 18 03:13:33 UTC 2021 - Stefan Dirsch - -- n_buildfix-21.3.0.patch - * fixes Mesa-drivers build - -------------------------------------------------------------------- -Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch - -- 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 - update to 21.2.5 diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index a0e1b22..478c38c 100644 --- a/Mesa-drivers.spec +++ b/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 diff --git a/Mesa.changes b/Mesa.changes index 6e00d7a..e0a48a5 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,5 +1,4 @@ ------------------------------------------------------------------- -<<<<<<< .mine Wed Dec 1 23:15:13 UTC 2021 - Stefan Dirsch - update to 21.3.1 @@ -51,53 +50,6 @@ Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch * EGL_EXT_present_opaque on wayland ------------------------------------------------------------------- -======= -Thu Nov 18 03:13:33 UTC 2021 - Stefan Dirsch - -- n_buildfix-21.3.0.patch - * fixes Mesa-drivers build - -------------------------------------------------------------------- -Wed Nov 17 21:33:28 UTC 2021 - Stefan Dirsch - -- 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 - update to 21.2.5 diff --git a/Mesa.spec b/Mesa.spec index 936f7ae..3c8e9d9 100644 --- a/Mesa.spec +++ b/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 diff --git a/mesa-21.3.0.tar.xz b/mesa-21.3.0.tar.xz deleted file mode 100644 index 97b4697..0000000 --- a/mesa-21.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a2753c09deef0ba14d35ae8a2ceff3fe5cd13698928c7bb62c2ec8736eb09ce1 -size 16427424 diff --git a/mesa-21.3.0.tar.xz.sig b/mesa-21.3.0.tar.xz.sig deleted file mode 100644 index 0e4300c6c44eb5afffb1f4c0460cbfd39c1f70fe839e1968e0a763689d24c5a2..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmV-P0k-~$0Y(G>0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0%4VBOcESra%p2g zWo~C>b98cVZ7ySI0162ZjgB#|!z3uC$zBKkCMp1w#Vk7X3aH{wRv}}h^bylzG)b*i z{68N?4It_f`6$1J}KEL}~wU8Btr1!pa(s21_ZAM&t zoEqdOq%=vxyb4jgbtwN1f;Nv4$k@6g3B`qf(P|u`t`N#jQm*aQkce+^E+O3^XQH3~?M84w=b$rNh2WR+