From 4a3bff301423820caca6cce7645ea2a18cdaa4c3b52a44f7e4c4709edcabfac3 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 20 May 2021 10:54:53 +0000 Subject: [PATCH 1/2] - update to 21.1.1 * bugfix release * mostly AMD and Intel changes as usual, but also a decent amount of ARM fixes and more OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1040 --- Mesa-drivers.changes | 8 ++++++++ Mesa-drivers.spec | 4 ++-- Mesa.changes | 8 ++++++++ Mesa.spec | 4 ++-- mesa-21.1.0.tar.xz | 3 --- mesa-21.1.0.tar.xz.sig | Bin 329 -> 0 bytes mesa-21.1.1.tar.xz | 3 +++ mesa-21.1.1.tar.xz.sig | Bin 0 -> 329 bytes 8 files changed, 23 insertions(+), 7 deletions(-) delete mode 100644 mesa-21.1.0.tar.xz delete mode 100644 mesa-21.1.0.tar.xz.sig create mode 100644 mesa-21.1.1.tar.xz create mode 100644 mesa-21.1.1.tar.xz.sig diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 90d1be4..824eec4 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 20 10:25:35 UTC 2021 - Stefan Dirsch + +- update to 21.1.1 + * bugfix release + * mostly AMD and Intel changes as usual, but also a decent amount + of ARM fixes and more + ------------------------------------------------------------------- Fri May 14 03:24:24 UTC 2021 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 288757b..a9ffd97 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -41,7 +41,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 21.1.0 +%define _version 21.1.1 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -109,7 +109,7 @@ %endif Name: Mesa-drivers -Version: 21.1.0 +Version: 21.1.1 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/Mesa.changes b/Mesa.changes index 90d1be4..824eec4 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 20 10:25:35 UTC 2021 - Stefan Dirsch + +- update to 21.1.1 + * bugfix release + * mostly AMD and Intel changes as usual, but also a decent amount + of ARM fixes and more + ------------------------------------------------------------------- Fri May 14 03:24:24 UTC 2021 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index adcfec1..0710e1c 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -40,7 +40,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 21.1.0 +%define _version 21.1.1 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -108,7 +108,7 @@ %endif Name: Mesa -Version: 21.1.0 +Version: 21.1.1 Release: 0 Summary: System for rendering 3-D graphics License: MIT diff --git a/mesa-21.1.0.tar.xz b/mesa-21.1.0.tar.xz deleted file mode 100644 index fc2d8c2..0000000 --- a/mesa-21.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0128f10e22970d3aed3d1034003731f94623015cd9797c07151417649c1b1ff8 -size 15145196 diff --git a/mesa-21.1.0.tar.xz.sig b/mesa-21.1.0.tar.xz.sig deleted file mode 100644 index a765fb16a2704487d5eaa9f6393db1e59ba217487f2b2dfa2ef5d155ae3c4699..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 329 zcmV-P0k-~$0Y(G>0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0$`HUz7iZ|a%p2g zWo~C>b98cVZ7ySI0162ZjgB#|!z3uCH*yF6Y=bYxiryjhBm&lRJnZ4;udLJYz@4dy zCM?yTizR)>uUeSvMm9^5D5;;-iJlr4Q6@fS9$siw8-#Vnrpky!j@%4` z#N2b5HQ^sh=oOsb#>{YdFH9?Fl_OI2rB)-*=AlkHbVEK2J-FY=iDm30?1vjD>R>VI zl-{#v7|}s*;+)Dbq~=}k(M6tOi3`;Ek|c(;z=O$AC0gqLvbYm<7uf;{ZxsHv_L^En zJ%YVaAnLD0ASkF1Vb;Ph2Y1jKv4UNA;4+`CKS!un%IIp9z^8f0(>x%fk|4YLi-xV5 b?LLDK_urP_Scxc|a8S|GZ#f9b;-R4*tJRx> diff --git a/mesa-21.1.1.tar.xz b/mesa-21.1.1.tar.xz new file mode 100644 index 0000000..8ee7ffc --- /dev/null +++ b/mesa-21.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eec25ea379054e8911bc5de816aeb50f581b5b708414725003d2f00386b38dd2 +size 15169732 diff --git a/mesa-21.1.1.tar.xz.sig b/mesa-21.1.1.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..9c67a6fcca39174a352c5182f28fa2309b63f275ed4e4966b706933b312daa53 GIT binary patch literal 329 zcmV-P0k-~$0Y(G>0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0$`b98cVZ7ySI0162ZjgB#|!z3uCA0`L=5m#bgDXF^lyga>r`5>}@0UPB~i;X29 zQ+U#Sm$0h4{2kpasz|SFAY?218_0y5O3@wU6t5-zmaqsQb+qs>BLC4M)3uG)^rtuM#r)%JSP{0WkrM z&9v*|PpV&~Xu*{$VBz!3H%`3Pm_<2X( bSOAXOs7&o$!X@^OwgeGhD`#hnwWHEC>T{a; literal 0 HcmV?d00001 From feb8a3baf5179a3d6ee8d79cdcb8f6137c8770709a70bd4d8bab68fd96f88a72 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 22 May 2021 09:30:52 +0000 Subject: [PATCH 2/2] Accepting request 894262 from home:Guillaume_G:branches:X11:XOrg - Add swrast to vulkan - Enable vulkan on %{arm} and aarch64 with: swrast, amd, broadcom and freedreno OBS-URL: https://build.opensuse.org/request/show/894262 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1041 --- Mesa-drivers.changes | 7 +++++ Mesa-drivers.spec | 73 +++++++++++++++++++++++++++++++++++++++++++- Mesa.changes | 7 +++++ Mesa.spec | 73 +++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 158 insertions(+), 2 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 824eec4..10a2519 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -6,6 +6,13 @@ Thu May 20 10:25:35 UTC 2021 - Stefan Dirsch * mostly AMD and Intel changes as usual, but also a decent amount of ARM fixes and more +------------------------------------------------------------------- +Wed May 19 08:29:07 UTC 2021 - Guillaume GARDET + +- Add swrast to vulkan +- Enable vulkan on %{arm} and aarch64 with: swrast, amd, + broadcom and freedreno + ------------------------------------------------------------------- Fri May 14 03:24:24 UTC 2021 - Stefan Dirsch diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index a9ffd97..fe02d00 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -70,6 +70,11 @@ %define with_opencl 1 %ifarch %{ix86} x86_64 %define with_vulkan 1 + %define vulkan_drivers swrast,amd,intel + %endif + %ifarch %{arm} aarch64 + %define with_vulkan 1 + %define vulkan_drivers swrast,amd,broadcom,freedreno %endif %endif @@ -650,11 +655,41 @@ Supplements: xf86-video-ati %description -n libvulkan_radeon This package contains the Vulkan parts for Mesa. +%package -n libvulkan_lvp +Summary: Mesa vulkan driver for LVP +Group: System/Libraries + +%description -n libvulkan_lvp +This package contains the Vulkan parts for Mesa. + +%ifarch %{arm} aarch64 +%package -n libvulkan_broadcom +Summary: Mesa vulkan driver for Broadcom +Group: System/Libraries + +%description -n libvulkan_broadcom +This package contains the Vulkan parts for Mesa. + +%package -n libvulkan_freedreno +Summary: Mesa vulkan driver for Freedreno +Group: System/Libraries + +%description -n libvulkan_freedreno +This package contains the Vulkan parts for Mesa. +%endif + %package -n Mesa-libVulkan-devel Summary: Mesa's Vulkan development files Group: Development/Libraries/C and C++ +%ifarch %{ix86} x86_64 Requires: libvulkan_intel = %{version} +%endif +Requires: libvulkan_lvp = %{version} Requires: libvulkan_radeon = %{version} +%ifarch %arm} aarch64 +Requires: libvulkan_broadcom = %{version} +Requires: libvulkan_freedreno = %{version} +%endif %description -n Mesa-libVulkan-devel This package contains the development files for Mesa's Vulkan implementation. @@ -662,8 +697,15 @@ This package contains the development files for Mesa's Vulkan implementation. %package -n Mesa-vulkan-device-select Summary: Vulkan layer to select Vulkan devices provided by Mesa Group: System/Libraries +%ifarch %{ix86} x86_64 Requires: libvulkan_intel = %{version} +%endif +Requires: libvulkan_lvp = %{version} Requires: libvulkan_radeon = %{version} +%ifarch %arm} aarch64 +Requires: libvulkan_broadcom = %{version} +Requires: libvulkan_freedreno = %{version} +%endif %description -n Mesa-vulkan-device-select This package contains the VK_MESA_device_select Vulkan layer @@ -671,8 +713,15 @@ This package contains the VK_MESA_device_select Vulkan layer %package -n Mesa-vulkan-overlay Summary: Mesa Vulkan Overlay layer Group: System/Libraries +%ifarch %{ix86} x86_64 Requires: libvulkan_intel = %{version} +%endif +Requires: libvulkan_lvp = %{version} Requires: libvulkan_radeon = %{version} +%ifarch %arm} aarch64 +Requires: libvulkan_broadcom = %{version} +Requires: libvulkan_freedreno = %{version} +%endif %description -n Mesa-vulkan-overlay This package contains the VK_MESA_Overlay Vulkan layer @@ -777,7 +826,7 @@ egl_platforms=x11,wayland -Dgallium-xa=true \ %endif %if 0%{with_vulkan} - -Dvulkan-drivers=intel,amd \ + -Dvulkan-drivers=%{?vulkan_drivers} \ -Dvulkan-layers=device-select,overlay \ %else -Dvulkan-drivers= \ @@ -1120,11 +1169,13 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %endif %if 0%{with_vulkan} +%ifarch %{ix86} x86_64 %files -n libvulkan_intel %dir %{_datadir}/vulkan %dir %{_datadir}/vulkan/icd.d %{_datadir}/vulkan/icd.d/intel_icd.*.json %{_libdir}/libvulkan_intel.so +%endif %files -n libvulkan_radeon %{_libdir}/libvulkan_radeon.so @@ -1132,6 +1183,26 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %dir %{_datadir}/vulkan/icd.d %{_datadir}/vulkan/icd.d/radeon_icd.*.json +%files -n libvulkan_lvp +%{_libdir}/libvulkan_lvp.so +%dir %{_datadir}/vulkan +%dir %{_datadir}/vulkan/icd.d +%{_datadir}/vulkan/icd.d/lvp_icd.*.json + +%ifarch %{arm} aarch64 +%files -n libvulkan_broadcom +%{_libdir}/libvulkan_broadcom.so +%dir %{_datadir}/vulkan +%dir %{_datadir}/vulkan/icd.d +%{_datadir}/vulkan/icd.d/broadcom_icd.*.json + +%files -n libvulkan_freedreno +%{_libdir}/libvulkan_freedreno.so +%dir %{_datadir}/vulkan +%dir %{_datadir}/vulkan/icd.d +%{_datadir}/vulkan/icd.d/freedreno_icd.*.json +%endif + %files -n Mesa-libVulkan-devel %dir %{_includedir}/vulkan diff --git a/Mesa.changes b/Mesa.changes index 824eec4..10a2519 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -6,6 +6,13 @@ Thu May 20 10:25:35 UTC 2021 - Stefan Dirsch * mostly AMD and Intel changes as usual, but also a decent amount of ARM fixes and more +------------------------------------------------------------------- +Wed May 19 08:29:07 UTC 2021 - Guillaume GARDET + +- Add swrast to vulkan +- Enable vulkan on %{arm} and aarch64 with: swrast, amd, + broadcom and freedreno + ------------------------------------------------------------------- Fri May 14 03:24:24 UTC 2021 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 0710e1c..4363800 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -69,6 +69,11 @@ %define with_opencl 1 %ifarch %{ix86} x86_64 %define with_vulkan 1 + %define vulkan_drivers swrast,amd,intel + %endif + %ifarch %{arm} aarch64 + %define with_vulkan 1 + %define vulkan_drivers swrast,amd,broadcom,freedreno %endif %endif @@ -649,11 +654,41 @@ Supplements: xf86-video-ati %description -n libvulkan_radeon This package contains the Vulkan parts for Mesa. +%package -n libvulkan_lvp +Summary: Mesa vulkan driver for LVP +Group: System/Libraries + +%description -n libvulkan_lvp +This package contains the Vulkan parts for Mesa. + +%ifarch %{arm} aarch64 +%package -n libvulkan_broadcom +Summary: Mesa vulkan driver for Broadcom +Group: System/Libraries + +%description -n libvulkan_broadcom +This package contains the Vulkan parts for Mesa. + +%package -n libvulkan_freedreno +Summary: Mesa vulkan driver for Freedreno +Group: System/Libraries + +%description -n libvulkan_freedreno +This package contains the Vulkan parts for Mesa. +%endif + %package -n Mesa-libVulkan-devel Summary: Mesa's Vulkan development files Group: Development/Libraries/C and C++ +%ifarch %{ix86} x86_64 Requires: libvulkan_intel = %{version} +%endif +Requires: libvulkan_lvp = %{version} Requires: libvulkan_radeon = %{version} +%ifarch %arm} aarch64 +Requires: libvulkan_broadcom = %{version} +Requires: libvulkan_freedreno = %{version} +%endif %description -n Mesa-libVulkan-devel This package contains the development files for Mesa's Vulkan implementation. @@ -661,8 +696,15 @@ This package contains the development files for Mesa's Vulkan implementation. %package -n Mesa-vulkan-device-select Summary: Vulkan layer to select Vulkan devices provided by Mesa Group: System/Libraries +%ifarch %{ix86} x86_64 Requires: libvulkan_intel = %{version} +%endif +Requires: libvulkan_lvp = %{version} Requires: libvulkan_radeon = %{version} +%ifarch %arm} aarch64 +Requires: libvulkan_broadcom = %{version} +Requires: libvulkan_freedreno = %{version} +%endif %description -n Mesa-vulkan-device-select This package contains the VK_MESA_device_select Vulkan layer @@ -670,8 +712,15 @@ This package contains the VK_MESA_device_select Vulkan layer %package -n Mesa-vulkan-overlay Summary: Mesa Vulkan Overlay layer Group: System/Libraries +%ifarch %{ix86} x86_64 Requires: libvulkan_intel = %{version} +%endif +Requires: libvulkan_lvp = %{version} Requires: libvulkan_radeon = %{version} +%ifarch %arm} aarch64 +Requires: libvulkan_broadcom = %{version} +Requires: libvulkan_freedreno = %{version} +%endif %description -n Mesa-vulkan-overlay This package contains the VK_MESA_Overlay Vulkan layer @@ -776,7 +825,7 @@ egl_platforms=x11,wayland -Dgallium-xa=true \ %endif %if 0%{with_vulkan} - -Dvulkan-drivers=intel,amd \ + -Dvulkan-drivers=%{?vulkan_drivers} \ -Dvulkan-layers=device-select,overlay \ %else -Dvulkan-drivers= \ @@ -1119,11 +1168,13 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %endif %if 0%{with_vulkan} +%ifarch %{ix86} x86_64 %files -n libvulkan_intel %dir %{_datadir}/vulkan %dir %{_datadir}/vulkan/icd.d %{_datadir}/vulkan/icd.d/intel_icd.*.json %{_libdir}/libvulkan_intel.so +%endif %files -n libvulkan_radeon %{_libdir}/libvulkan_radeon.so @@ -1131,6 +1182,26 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %dir %{_datadir}/vulkan/icd.d %{_datadir}/vulkan/icd.d/radeon_icd.*.json +%files -n libvulkan_lvp +%{_libdir}/libvulkan_lvp.so +%dir %{_datadir}/vulkan +%dir %{_datadir}/vulkan/icd.d +%{_datadir}/vulkan/icd.d/lvp_icd.*.json + +%ifarch %{arm} aarch64 +%files -n libvulkan_broadcom +%{_libdir}/libvulkan_broadcom.so +%dir %{_datadir}/vulkan +%dir %{_datadir}/vulkan/icd.d +%{_datadir}/vulkan/icd.d/broadcom_icd.*.json + +%files -n libvulkan_freedreno +%{_libdir}/libvulkan_freedreno.so +%dir %{_datadir}/vulkan +%dir %{_datadir}/vulkan/icd.d +%{_datadir}/vulkan/icd.d/freedreno_icd.*.json +%endif + %files -n Mesa-libVulkan-devel %dir %{_includedir}/vulkan