From c172e18f0c66587a14b828778fefff3c61ec6955db2def9eff36c7ca4f155d83 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 10 Mar 2022 19:20:36 +0000 Subject: [PATCH 1/6] Accepting request 960915 from home:ukbeast89:branches:X11:XOrg - 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 - 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/960915 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1088 --- Mesa-drivers.changes | 17 +++++++++++++++++ Mesa-drivers.spec | 4 ++-- Mesa.changes | 17 +++++++++++++++++ Mesa.spec | 4 ++-- mesa-21.3.7.tar.xz | 3 --- mesa-21.3.7.tar.xz.sig | Bin 329 -> 0 bytes mesa-22.0.0.tar.xz | 3 +++ mesa-22.0.0.tar.xz.sig | Bin 0 -> 119 bytes 8 files changed, 41 insertions(+), 7 deletions(-) delete mode 100644 mesa-21.3.7.tar.xz delete mode 100644 mesa-21.3.7.tar.xz.sig create mode 100644 mesa-22.0.0.tar.xz create mode 100644 mesa-22.0.0.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 06046b9..fdd1001 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Mar 10 18:32:42 UTC 2022 - Aaron Stern + +- 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 diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 2f7d17d..a97c1ce 100644 --- a/Mesa-drivers.spec +++ b/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 diff --git a/Mesa.changes b/Mesa.changes index 06046b9..b52725b 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Mar 10 18:39:34 UTC 2022 - Aaron Stern + +- 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 diff --git a/Mesa.spec b/Mesa.spec index f463879..87e6215 100644 --- a/Mesa.spec +++ b/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 diff --git a/mesa-21.3.7.tar.xz b/mesa-21.3.7.tar.xz deleted file mode 100644 index 6acf65e..0000000 --- a/mesa-21.3.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d -size 16569592 diff --git a/mesa-21.3.7.tar.xz.sig b/mesa-21.3.7.tar.xz.sig deleted file mode 100644 index 95b99b23e431ee1c38a3ed53e447a8bc7da90aa6f9e3776e174c9d00931fa629..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmV-P0k-~$0Y(G>0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0%8_}DH0rIa%p2g zWo~C>b98cVZ7ySI0162ZjgB#|!z3uCT^tAgKP}W?HsG}_+5cU**3|T9SbyU5!#ne? zlvom0e`qjZ61R4{l_e3~<7${xf$TAN=h{=t%1Gq@xgkbVJJy&9i?m|Z-d|&&PMO=n zc1_AD=lXS;=WvI=d(@FqC8Idmgp(!*AUsuEi>1(y_u*T#HOjlsNO8U|^~ zPhCf=fRF_AoQLJ@H}E47W5)`q3pKCq%IN@UCHOF6zq)xyJ${4@Xz)bVB?@wG`+)8U z_3JGp3iqoCHor#{_2B!vlFL?c?bPq4d9hepT+{u(`0g!lO6opWl1Mad*vQJ5I*#w$ bKb((5Igj^1P`Pv@9|Im{u{HJMI-`*bv-F-C diff --git a/mesa-22.0.0.tar.xz b/mesa-22.0.0.tar.xz new file mode 100644 index 0000000..0d349c4 --- /dev/null +++ b/mesa-22.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e6c41928b5b9917485bd67cec22d15e62cad7a358bf4c711a647979987601250 +size 15565680 diff --git a/mesa-22.0.0.tar.xz.sig b/mesa-22.0.0.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..a7e578e595599bdafcb8790983f718d686772d5adcf43db1e389e4992fb68947 GIT binary patch literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7rl%y&DnSqN_048F%g5iJ0 zf4d*%?>2>-UJm+kswLoYqNv5STG=?8Xg&xH+I7t5G0RY6-H39$t literal 0 HcmV?d00001 From cd164f01bc498d20dee5a9d687e8f3645fcc6bf162672a95b2eaaeabcee3ffb3 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 11 Mar 2022 09:15:38 +0000 Subject: [PATCH 2/6] - 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 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1089 --- Mesa-drivers.changes | 10 +++++++++- Mesa-drivers.spec | 6 +++--- Mesa.changes | 8 ++++++++ Mesa.spec | 6 +++--- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index fdd1001..029cea3 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,5 +1,13 @@ ------------------------------------------------------------------- -Thu Mar 10 18:32:42 UTC 2022 - Aaron Stern +Fri Mar 11 09:08:27 UTC 2022 - Stefan Dirsch + +- 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 - update to 22.0.0 * lavapipe,radv,anv KHR_dynamic_rendering diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index a97c1ce..b0bd4f8 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -824,15 +824,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 \ %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= \ diff --git a/Mesa.changes b/Mesa.changes index b52725b..029cea3 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Mar 11 09:08:27 UTC 2022 - Stefan Dirsch + +- 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 diff --git a/Mesa.spec b/Mesa.spec index 87e6215..6e31b4b 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -823,15 +823,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 \ %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= \ From 7c3258e6ad8d3a589c0f5bcca726d34d82792b42ff7894c432fbc197cbd9545b Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 11 Mar 2022 10:12:00 +0000 Subject: [PATCH 3/6] nouveau_vieux_dri gone OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1090 --- Mesa-drivers.spec | 2 -- Mesa.spec | 2 -- 2 files changed, 4 deletions(-) diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index b0bd4f8..866ec21 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -1094,7 +1094,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 +1109,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} diff --git a/Mesa.spec b/Mesa.spec index 6e31b4b..2e9b992 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -1093,7 +1093,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 +1108,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} From a49ba3220d209aa56fcd7587a17c4d0fefadb4da106fdf7c3ec177ec1e47e49a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 11 Mar 2022 13:26:33 +0000 Subject: [PATCH 4/6] - fixed llvm/clang buildrequires for sle15-sp4/Leap 15.4 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1091 --- Mesa-drivers.changes | 5 +++++ Mesa-drivers.spec | 8 ++++++++ Mesa.changes | 5 +++++ Mesa.spec | 8 ++++++++ 4 files changed, 26 insertions(+) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 029cea3..ee28b35 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 11 13:25:28 UTC 2022 - Stefan Dirsch + +- fixed llvm/clang buildrequires for sle15-sp4/Leap 15.4 + ------------------------------------------------------------------- Fri Mar 11 09:08:27 UTC 2022 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 866ec21..dfd8315 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -220,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 @@ -227,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 diff --git a/Mesa.changes b/Mesa.changes index 029cea3..ee28b35 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 11 13:25:28 UTC 2022 - Stefan Dirsch + +- fixed llvm/clang buildrequires for sle15-sp4/Leap 15.4 + ------------------------------------------------------------------- Fri Mar 11 09:08:27 UTC 2022 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 2e9b992..32fcc26 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -219,6 +219,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 +229,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 From d30db8903404362b272ba95d8852a4022de3193e8bc068247cf78492075ca80e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 12 Mar 2022 20:31:31 +0000 Subject: [PATCH 5/6] - enabled "i915" Gallium-based Intel Gen3 driver OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1092 --- Mesa-drivers.changes | 5 +++++ Mesa-drivers.spec | 2 +- Mesa.changes | 5 +++++ Mesa.spec | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index ee28b35..49e82fb 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 12 20:04:00 UTC 2022 - Stefan Dirsch + +- enabled "i915" Gallium-based Intel Gen3 driver + ------------------------------------------------------------------- Fri Mar 11 13:25:28 UTC 2022 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index dfd8315..5b886c9 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -833,7 +833,7 @@ egl_platforms=x11,wayland %endif %ifarch %{ix86} x86_64 -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= \ diff --git a/Mesa.changes b/Mesa.changes index ee28b35..49e82fb 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 12 20:04:00 UTC 2022 - Stefan Dirsch + +- enabled "i915" Gallium-based Intel Gen3 driver + ------------------------------------------------------------------- Fri Mar 11 13:25:28 UTC 2022 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 32fcc26..5fbea51 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -832,7 +832,7 @@ egl_platforms=x11,wayland %endif %ifarch %{ix86} x86_64 -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= \ From 2d3a89e8aa2b05b8609182932996b44a9ac2b726b574754929602687514f6a07 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 14 Mar 2022 10:51:54 +0000 Subject: [PATCH 6/6] - 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). OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1093 --- Mesa-drivers.changes | 7 ++++ Mesa-drivers.spec | 2 ++ Mesa.changes | 7 ++++ Mesa.spec | 2 ++ ...ivate-requires-to-libdrm-in-dri.pc-f.patch | 34 +++++++++++++++++++ 5 files changed, 52 insertions(+) create mode 100644 U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 49e82fb..963e32e 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 14 10:43:10 UTC 2022 - Stefan Dirsch + +- 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 diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 5b886c9..4e54918 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -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 @@ -758,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 ... diff --git a/Mesa.changes b/Mesa.changes index 49e82fb..963e32e 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 14 10:43:10 UTC 2022 - Stefan Dirsch + +- 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 diff --git a/Mesa.spec b/Mesa.spec index 5fbea51..63a9330 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -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 @@ -757,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 ... diff --git a/U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch b/U_meson-restore-private-requires-to-libdrm-in-dri.pc-f.patch new file mode 100644 index 0000000..b4b2c5d --- /dev/null +++ b/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 +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 +