Accepting request 961641 from X11:XOrg

- U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch 
  * Due to a typo the private requires to libdrm were lost in dri.pc.
    Fixed another typo (only comment).

- enabled "i915" Gallium-based Intel Gen3 driver

- fixed llvm/clang buildrequires for sle15-sp4/Leap 15.4 

- no longer try to build classic non-Gallium OpenGL drivers 
  i915, i965, nouveau, r100 and r200, which have been dropped with
  Mesa 22.0.0; see also some documentation on Phoronix
  https://www.phoronix.com/scan.php?page=news_item&px=Mesa-Classic-Retired

- update to 22.0.0
  * lavapipe,radv,anv KHR_dynamic_rendering
  * radv EXT_image_view_min_lod
  * VK_KHR_synchronization2 on RADV.
  * OpenSWR has been moved to the Amber branch
  * radeonsi, zink ARB_sparse_texture
  * d3d12 GLES3.1 (shader storage buffers, images, compute, indirect draw, draw params, 
    ARB_framebuffer_no_attachments, ARB_sample_shading, and GLSL400)
  * radeonsi, zink ARB_sparse_texture2
  * zink EXT_memory_object, EXT_memory_object_fd, EXT_semaphore, EXT_semaphore_fd
  * anv VK_VALVE_mutable_descriptor_type
  * Vulkan 1.3 on RADV,Anv.
  * radeonsi, zink ARB_sparse_texture_clamp

OBS-URL: https://build.opensuse.org/request/show/961641
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=432

Mesa-drivers.changes

@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Mon Mar 14 10:43:10 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch 
+  * Due to a typo the private requires to libdrm were lost in dri.pc.
+    Fixed another typo (only comment).
+
+-------------------------------------------------------------------
+Sat Mar 12 20:04:00 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- enabled "i915" Gallium-based Intel Gen3 driver
+
+-------------------------------------------------------------------
+Fri Mar 11 13:25:28 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- fixed llvm/clang buildrequires for sle15-sp4/Leap 15.4 
+
+-------------------------------------------------------------------
+Fri Mar 11 09:08:27 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- no longer try to build classic non-Gallium OpenGL drivers 
+  i915, i965, nouveau, r100 and r200, which have been dropped with
+  Mesa 22.0.0; see also some documentation on Phoronix
+  https://www.phoronix.com/scan.php?page=news_item&px=Mesa-Classic-Retired
+
+-------------------------------------------------------------------
+Thu Mar 10 18:39:34 UTC 2022 - Aaron Stern <ukbeast89@protonmail.com>
+
+- update to 22.0.0
+  * lavapipe,radv,anv KHR_dynamic_rendering
+  * radv EXT_image_view_min_lod
+  * VK_KHR_synchronization2 on RADV.
+  * OpenSWR has been moved to the Amber branch
+  * radeonsi, zink ARB_sparse_texture
+  * d3d12 GLES3.1 (shader storage buffers, images, compute, indirect draw, draw params, 
+    ARB_framebuffer_no_attachments, ARB_sample_shading, and GLSL400)
+  * radeonsi, zink ARB_sparse_texture2
+  * zink EXT_memory_object, EXT_memory_object_fd, EXT_semaphore, EXT_semaphore_fd
+  * anv VK_VALVE_mutable_descriptor_type
+  * Vulkan 1.3 on RADV,Anv.
+  * radeonsi, zink ARB_sparse_texture_clamp
+
 -------------------------------------------------------------------
 Thu Mar  3 09:14:36 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 

Mesa-drivers.spec

@@ -41,7 +41,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 21.3.7
+%define _version 22.0.0
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -114,7 +114,7 @@
 %endif
 
 Name:           Mesa-drivers
-Version:        21.3.7
+Version:        22.0.0
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -136,6 +136,7 @@ Patch100:       U_fix-mpeg1_2-decode-mesa-20.2.patch
 Patch200:       u_fix-build-on-ppc64le.patch
 Patch300:       n_buildfix-21.3.0.patch
 Patch400:       n_no-sse2-on-ix86-except-for-intel-drivers.patch
+Patch500:       U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
@@ -220,6 +221,9 @@ BuildRequires:  pkgconfig(wayland-server) >= 1.11
 %if 0%{?suse_version} >= 1550
 BuildRequires:  llvm-devel
 %else
+%if 0%{?sle_version} >= 150400
+BuildRequires:  llvm13-devel
+%else
 %if 0%{?sle_version} >= 150300
 BuildRequires:  llvm11-devel
 %else
@@ -227,17 +231,22 @@ BuildRequires:  llvm9-devel
 %endif
 %endif
 %endif
+%endif
 
 %if 0%{with_opencl}
 %if 0%{?suse_version} >= 1550
 BuildRequires:  clang-devel
 %else
+%if 0%{?sle_version} >= 150400
+BuildRequires:  clang13-devel
+%else
 %if 0%{?sle_version} >= 150300
 BuildRequires:  clang11-devel
 %else
 BuildRequires:  clang9-devel
 %endif
 %endif
+%endif
 BuildRequires:  libclc
 %endif
 
@@ -750,6 +759,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %ifarch %{ix86}
 %patch400 -p1
 %endif
+%patch500 -p1
 
 # Remove requires to vulkan libs from baselibs.conf on platforms
 # where vulkan build is disabled; ugly ...
@@ -824,15 +834,15 @@ egl_platforms=x11,wayland
             -Dvulkan-drivers= \
 %endif
   %ifarch %{ix86} x86_64
-            -Ddri-drivers=i915,i965,nouveau,r100,r200 \
+            -Ddri-drivers= \
-            -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris,crocus \
+            -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris,crocus,i915 \
   %else
   %ifarch %{arm} aarch64
-            -Ddri-drivers=nouveau \
+            -Ddri-drivers= \
             -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,virgl,freedreno,vc4,etnaviv,lima,panfrost,kmsro,v3d \
   %else
   %ifarch ppc64 ppc64le riscv64
-            -Ddri-drivers=nouveau \
+            -Ddri-drivers= \
             -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast \
   %else
             -Ddri-drivers= \
@@ -1094,7 +1104,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %{_libdir}/dri/*_dri.so
 %ifarch %{ix86} x86_64 aarch64 %{arm} ppc64 ppc64le riscv64
 %exclude %{_libdir}/dri/nouveau_dri.so
-%exclude %{_libdir}/dri/nouveau_vieux_dri.so
 %endif
 %ifarch %{arm} aarch64
 %exclude %{_libdir}/dri/vc4_dri.so
@@ -1110,7 +1119,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %ifarch %{ix86} x86_64 aarch64 %{arm} ppc64 ppc64le riscv64
 %files -n Mesa-dri-nouveau
 %{_libdir}/dri/nouveau_dri.so
-%{_libdir}/dri/nouveau_vieux_dri.so
 %endif
 
 %ifarch aarch64 %{arm}

Mesa.changes

@@ -1,3 +1,45 @@
+-------------------------------------------------------------------
+Mon Mar 14 10:43:10 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch 
+  * Due to a typo the private requires to libdrm were lost in dri.pc.
+    Fixed another typo (only comment).
+
+-------------------------------------------------------------------
+Sat Mar 12 20:04:00 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- enabled "i915" Gallium-based Intel Gen3 driver
+
+-------------------------------------------------------------------
+Fri Mar 11 13:25:28 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- fixed llvm/clang buildrequires for sle15-sp4/Leap 15.4 
+
+-------------------------------------------------------------------
+Fri Mar 11 09:08:27 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
+
+- no longer try to build classic non-Gallium OpenGL drivers 
+  i915, i965, nouveau, r100 and r200, which have been dropped with
+  Mesa 22.0.0; see also some documentation on Phoronix
+  https://www.phoronix.com/scan.php?page=news_item&px=Mesa-Classic-Retired
+
+-------------------------------------------------------------------
+Thu Mar 10 18:39:34 UTC 2022 - Aaron Stern <ukbeast89@protonmail.com>
+
+- update to 22.0.0
+  * lavapipe,radv,anv KHR_dynamic_rendering
+  * radv EXT_image_view_min_lod
+  * VK_KHR_synchronization2 on RADV.
+  * OpenSWR has been moved to the Amber branch
+  * radeonsi, zink ARB_sparse_texture
+  * d3d12 GLES3.1 (shader storage buffers, images, compute, indirect draw, draw params, 
+    ARB_framebuffer_no_attachments, ARB_sample_shading, and GLSL400)
+  * radeonsi, zink ARB_sparse_texture2
+  * zink EXT_memory_object, EXT_memory_object_fd, EXT_semaphore, EXT_semaphore_fd
+  * anv VK_VALVE_mutable_descriptor_type
+  * Vulkan 1.3 on RADV,Anv.
+  * radeonsi, zink ARB_sparse_texture_clamp
+
 -------------------------------------------------------------------
 Thu Mar  3 09:14:36 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
 

Mesa.spec

@@ -40,7 +40,7 @@
 
 %define glamor 1
 %define _name_archive mesa
-%define _version 21.3.7
+%define _version 22.0.0
 %define with_opencl 0
 %define with_vulkan 0
 %define with_llvm 0
@@ -113,7 +113,7 @@
 %endif
 
 Name:           Mesa
-Version:        21.3.7
+Version:        22.0.0
 Release:        0
 Summary:        System for rendering 3-D graphics
 License:        MIT
@@ -135,6 +135,7 @@ Patch100:       U_fix-mpeg1_2-decode-mesa-20.2.patch
 Patch200:       u_fix-build-on-ppc64le.patch
 Patch300:       n_buildfix-21.3.0.patch
 Patch400:       n_no-sse2-on-ix86-except-for-intel-drivers.patch
+Patch500:       U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch
 BuildRequires:  bison
 BuildRequires:  fdupes
 BuildRequires:  flex
@@ -219,6 +220,9 @@ BuildRequires:  pkgconfig(wayland-server) >= 1.11
 %if 0%{?suse_version} >= 1550
 BuildRequires:  llvm-devel
 %else
+%if 0%{?sle_version} >= 150400
+BuildRequires:  llvm13-devel
+%else
 %if 0%{?sle_version} >= 150300
 BuildRequires:  llvm11-devel
 %else
@@ -226,17 +230,22 @@ BuildRequires:  llvm9-devel
 %endif
 %endif
 %endif
+%endif
 
 %if 0%{with_opencl}
 %if 0%{?suse_version} >= 1550
 BuildRequires:  clang-devel
 %else
+%if 0%{?sle_version} >= 150400
+BuildRequires:  clang13-devel
+%else
 %if 0%{?sle_version} >= 150300
 BuildRequires:  clang11-devel
 %else
 BuildRequires:  clang9-devel
 %endif
 %endif
+%endif
 BuildRequires:  libclc
 %endif
 
@@ -749,6 +758,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
 %ifarch %{ix86}
 %patch400 -p1
 %endif
+%patch500 -p1
 
 # Remove requires to vulkan libs from baselibs.conf on platforms
 # where vulkan build is disabled; ugly ...
@@ -823,15 +833,15 @@ egl_platforms=x11,wayland
             -Dvulkan-drivers= \
 %endif
   %ifarch %{ix86} x86_64
-            -Ddri-drivers=i915,i965,nouveau,r100,r200 \
+            -Ddri-drivers= \
-            -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris,crocus \
+            -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris,crocus,i915 \
   %else
   %ifarch %{arm} aarch64
-            -Ddri-drivers=nouveau \
+            -Ddri-drivers= \
             -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,virgl,freedreno,vc4,etnaviv,lima,panfrost,kmsro,v3d \
   %else
   %ifarch ppc64 ppc64le riscv64
-            -Ddri-drivers=nouveau \
+            -Ddri-drivers= \
             -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast \
   %else
             -Ddri-drivers= \
@@ -1093,7 +1103,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %{_libdir}/dri/*_dri.so
 %ifarch %{ix86} x86_64 aarch64 %{arm} ppc64 ppc64le riscv64
 %exclude %{_libdir}/dri/nouveau_dri.so
-%exclude %{_libdir}/dri/nouveau_vieux_dri.so
 %endif
 %ifarch %{arm} aarch64
 %exclude %{_libdir}/dri/vc4_dri.so
@@ -1109,7 +1118,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
 %ifarch %{ix86} x86_64 aarch64 %{arm} ppc64 ppc64le riscv64
 %files -n Mesa-dri-nouveau
 %{_libdir}/dri/nouveau_dri.so
-%{_libdir}/dri/nouveau_vieux_dri.so
 %endif
 
 %ifarch aarch64 %{arm}

U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch

@@ -0,0 +1,34 @@
+From 31809f8419514f2130e9661d9989662165366e83 Mon Sep 17 00:00:00 2001
+From: Stefan Dirsch <sndirsch@suse.de>
+Date: Mon, 14 Mar 2022 11:38:23 +0100
+Subject: [PATCH] meson: restore private requires to libdrm in dri.pc file
+
+Due to a typo the private requires to libdrm were lost in dri.pc.
+Fixed another typo (only comment).
+---
+ src/gallium/frontends/dri/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/frontends/dri/meson.build b/src/gallium/frontends/dri/meson.build
+index a0ae961c5fc..139707ea719 100644
+--- a/src/gallium/frontends/dri/meson.build
++++ b/src/gallium/frontends/dri/meson.build
+@@ -68,13 +68,13 @@ libdri = static_library(
+ if with_dri
+   dri_req_private = []
+   if dep_libdrm.found()
+-    dir_req_private = ['libdrm >= @0@'.format(_drm_ver)]
++    dri_req_private = ['libdrm >= @0@'.format(_drm_ver)]
+   endif
+ 
+   pkg.generate(
+     name : 'dri',
+     filebase : 'dri',
+-    description : 'Direct Rendering Infastructure',
++    description : 'Direct Rendering Infrastructure',
+     version : meson.project_version(),
+     variables : ['dridriverdir=@0@'.format(dri_drivers_path)],
+     requires_private : dri_req_private,
+-- 
+2.34.1
+

mesa-21.3.7.tar.xz

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

mesa-22.0.0.tar.xz

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