From c7ad8ef77de2eb533c13d9501c5bba396bc14f6d90a8cdbfbd921bb70f6e8565 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 10 Jun 2023 14:16:28 +0000 Subject: [PATCH] Accepting request 1092012 from home:sndirsch:branches:X11:XOrg - needed to fix build of Mesa 23.1 * Mesa-drivers: -Dshader-cache=enabled * Mesa: -Dxlib-lease=enabled * recommended for both Mesa and Mesa-drivers to avoid some scary messages when comparing fds: -Dallow-kcmp=enabled - Credits for figuring this out go to "llyyr" - gbm files are no longer needed to be removed manually for -drivers build - VDPAU support for r300 has been dropped with Mesa 23.1 - supersedes n_no-sse2-on-ix86-except-for-intel-drivers.patch - Update to bugfix release 23.1.1 - adjusted u_dep_xcb.patch - Update to 23.1.0 * new feature release * some highlights + Our OpenCL implementation Rusticl added support for AMD GPUs. + Both ANV (Intel) and RADV (AMD) got initial support for Vulkan Video decoding. + Vulkan Graphics Pipeline Libraries (GPL) are now supported in RADV. - adjusted n_stop-iris-flicker.patch - supersedes U_ReturnME.patch - meson option "-Ddri-drivers" has been removed; wasn't used any longer by us --> killed it OBS-URL: https://build.opensuse.org/request/show/1092012 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1209 --- Mesa.changes | 34 +++++++++++ Mesa.spec | 44 ++++---------- U_ReturnME.patch | 54 ------------------ baselibs.conf | 1 - mesa-23.0.3.tar.xz | 3 - mesa-23.0.3.tar.xz.sig | Bin 119 -> 0 bytes mesa-23.1.1.tar.xz | 3 + mesa-23.1.1.tar.xz.sig | Bin 0 -> 329 bytes ...se2-on-ix86-except-for-intel-drivers.patch | 40 ------------- n_stop-iris-flicker.patch | 8 +-- u_dep_xcb.patch | 31 +++++----- 11 files changed, 68 insertions(+), 150 deletions(-) delete mode 100644 U_ReturnME.patch delete mode 100644 mesa-23.0.3.tar.xz delete mode 100644 mesa-23.0.3.tar.xz.sig create mode 100644 mesa-23.1.1.tar.xz create mode 100644 mesa-23.1.1.tar.xz.sig delete mode 100644 n_no-sse2-on-ix86-except-for-intel-drivers.patch diff --git a/Mesa.changes b/Mesa.changes index 948348b..8b12e19 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Sat Jun 10 11:42:42 UTC 2023 - Stefan Dirsch + +- needed to fix build of Mesa 23.1 + * Mesa-drivers: -Dshader-cache=enabled + * Mesa: -Dxlib-lease=enabled + * recommended for both Mesa and Mesa-drivers to avoid some scary messages when + comparing fds: -Dallow-kcmp=enabled +- Credits for figuring this out go to "llyyr" +- gbm files are no longer needed to be removed manually for -drivers build +- VDPAU support for r300 has been dropped with Mesa 23.1 +- supersedes n_no-sse2-on-ix86-except-for-intel-drivers.patch + +------------------------------------------------------------------- +Fri May 26 13:42:06 UTC 2023 - Stefan Dirsch + +- Update to bugfix release 23.1.1 +- adjusted u_dep_xcb.patch + +------------------------------------------------------------------- +Thu May 11 08:29:57 UTC 2023 - Stefan Dirsch + +- Update to 23.1.0 + * new feature release + * some highlights + + Our OpenCL implementation Rusticl added support for AMD GPUs. + + Both ANV (Intel) and RADV (AMD) got initial support for Vulkan Video + decoding. + + Vulkan Graphics Pipeline Libraries (GPL) are now supported in RADV. +- adjusted n_stop-iris-flicker.patch +- supersedes U_ReturnME.patch +- meson option "-Ddri-drivers" has been removed; wasn't used any + longer by us --> killed it + ------------------------------------------------------------------- Sat Apr 22 08:32:04 UTC 2023 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index ebcfb06..b0f2d4d 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 23.0.3 +%define _version 23.1.1 %define with_opencl 0 %define with_rusticl 0 %define with_vulkan 0 @@ -123,7 +123,7 @@ %endif Name: Mesa%{psuffix} -Version: 23.0.3 +Version: 23.1.1 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -143,9 +143,7 @@ Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch Patch58: u_dep_xcb.patch Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch Patch200: u_fix-build-on-ppc64le.patch -Patch300: n_no-sse2-on-ix86-except-for-intel-drivers.patch Patch400: n_stop-iris-flicker.patch -Patch500: U_ReturnME.patch Patch600: U_glx-Remove-pointless-GLX_INTEL_swap_event-paranoia.patch %ifarch %{ix86} x86_64 BuildRequires: DirectX-Headers @@ -627,14 +625,6 @@ Supplements: modalias(pci:v000012D2d*sv*sd*bc03sc*i*) %description -n libvdpau_nouveau This package contains the VDPAU state tracker for Nouveau. -%package -n libvdpau_r300 -Summary: VDPAU state tracker for R300 -Group: System/Libraries -Supplements: modalias(pci:v00001002d*sv*sd*bc03sc*i*) - -%description -n libvdpau_r300 -This package contains the VDPAU state tracker for R300. - %package -n libvdpau_r600 Summary: VDPAU state tracker for R600 Group: System/Libraries @@ -788,11 +778,7 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch58 -p1 %patch100 -p1 %patch200 -p1 -%ifarch %{ix86} -%patch300 -p1 -%endif %patch400 -p1 -%patch500 -p1 # reverse apply to fix a regression (boo#1209005) %patch600 -p1 -R @@ -815,6 +801,13 @@ export CXX=g++-12 egl_platforms=x11,wayland +# needed to fix build of Mesa 23.1 +# Mesa-drivers: -Dshader-cache=enabled +# Mesa: -Dxlib-lease=enabled +# recommended for both Mesa and Mesa-drivers to avoid some scary messages when +# comparing fds: -Dallow-kcmp=enabled +# Credits for figuring this out go to "llyyr" + %meson \ --auto-features=disabled \ %if "%{flavor}" == "drivers" @@ -824,6 +817,7 @@ egl_platforms=x11,wayland -Dglx=disabled \ -Dosmesa=false \ -Dxmlconfig=enabled \ + -Dshader-cache=enabled \ %else -Dglvnd=true \ -Dgles1=enabled \ @@ -833,7 +827,9 @@ egl_platforms=x11,wayland -Dglx=auto \ -Dllvm=disabled \ -Dvulkan-drivers= \ + -Dxlib-lease=enabled \ %endif + -Dallow-kcmp=enabled \ -Dplatforms=$egl_platforms \ -Ddri3=enabled \ -Dshared-glapi=enabled \ @@ -874,24 +870,19 @@ egl_platforms=x11,wayland -Dvulkan-drivers= \ %endif %ifarch %{ix86} x86_64 - -Ddri-drivers= \ -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,svga,virgl,iris,crocus,i915,d3d12,zink \ %else %ifarch %{arm} aarch64 - -Ddri-drivers= \ -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,virgl,freedreno,vc4,etnaviv,lima,panfrost,v3d,svga,tegra \ %else %ifarch ppc64 ppc64le riscv64 - -Ddri-drivers= \ -Dgallium-drivers=r300,r600,radeonsi,nouveau,swrast,virgl \ %else - -Ddri-drivers= \ -Dgallium-drivers=swrast \ %endif %endif %endif %else - -Ddri-drivers= \ -Dgallium-drivers=swrast \ %endif %ifarch aarch64 %{ix86} x86_64 ppc64le s390x @@ -941,11 +932,6 @@ rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc # in Mesa-dri-devel rm %{buildroot}/%{_libdir}/pkgconfig/dri.pc -# in libgbm-devel -rm %{buildroot}/%{_includedir}/gbm.h -rm %{buildroot}/%{_libdir}/libgbm.so* -rm %{buildroot}/%{_libdir}/pkgconfig/gbm.pc - # in KHR-devel rm -rf %{buildroot}/%{_includedir}/KHR @@ -1094,12 +1080,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %endif %if %{vdpau_radeon} -%files -n libvdpau_r300 -%{_libdir}/vdpau/libvdpau_r300.so -%{_libdir}/vdpau/libvdpau_r300.so.1 -%{_libdir}/vdpau/libvdpau_r300.so.1.0 -%{_libdir}/vdpau/libvdpau_r300.so.1.0.0 - %files -n libvdpau_r600 %{_libdir}/vdpau/libvdpau_r600.so %{_libdir}/vdpau/libvdpau_r600.so.1 diff --git a/U_ReturnME.patch b/U_ReturnME.patch deleted file mode 100644 index 1d2156c..0000000 --- a/U_ReturnME.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8491b1fd5e7c97edc104a3ac3b8ece5464e652b0 Mon Sep 17 00:00:00 2001 -From: Illia Polishchuk -Date: Fri, 13 Jan 2023 20:54:44 +0200 -Subject: [PATCH] ANV: Add extra memory types for ANV driver instead of a - single one - -Some game engines can't handle single type well -And Intel on Windows uses 3 types so it's better to add extra one here - -Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7360 -Reviewed-by: Lionel Landwerlin -Signed-off-by: Illia Polishchuk -Part-of: ---- - src/intel/vulkan/anv_device.c | 21 +++++++++++++++------ - 1 file changed, 15 insertions(+), 6 deletions(-) - -diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c -index a2e5d2ba398f..40d8949f011a 100644 ---- a/src/intel/vulkan/anv_device.c -+++ b/src/intel/vulkan/anv_device.c -@@ -509,14 +509,23 @@ anv_physical_device_init_heaps(struct anv_physical_device *device, int fd) - - /* Big core GPUs share LLC with the CPU and thus one memory type can be - * both cached and coherent at the same time. -+ * -+ * But some game engines can't handle single type well -+ * https://gitlab.freedesktop.org/mesa/mesa/-/issues/7360#note_1719438 -+ * -+ * And Intel on Windows uses 3 types so it's better to add extra one here - */ -- device->memory.type_count = 1; -+ device->memory.type_count = 2; - device->memory.types[0] = (struct anv_memory_type) { -- .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | -- VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | -- VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | -- VK_MEMORY_PROPERTY_HOST_CACHED_BIT, -- .heapIndex = 0, -+ .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, -+ .heapIndex = 0, -+ }; -+ device->memory.types[1] = (struct anv_memory_type) { -+ .propertyFlags = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT | -+ VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | -+ VK_MEMORY_PROPERTY_HOST_COHERENT_BIT | -+ VK_MEMORY_PROPERTY_HOST_CACHED_BIT, -+ .heapIndex = 0, - }; - } else { - device->memory.heap_count = 1; --- -GitLab - diff --git a/baselibs.conf b/baselibs.conf index 872dda4..cd96fa2 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -88,7 +88,6 @@ libvulkan_radeon targetarch x86_64 +/usr/share/vulkan/icd.d/radeon_icd.*.json requires "Mesa-vulkan-device-select- = " libvdpau_nouveau -libvdpau_r300 libvdpau_r600 libvdpau_radeonsi libvdpau_virtio_gpu diff --git a/mesa-23.0.3.tar.xz b/mesa-23.0.3.tar.xz deleted file mode 100644 index fcbd79e..0000000 --- a/mesa-23.0.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:386362a5d80df3b096636b67f340e1ce67b705b44767d5bdd11d2ed1037192d5 -size 17627728 diff --git a/mesa-23.0.3.tar.xz.sig b/mesa-23.0.3.tar.xz.sig deleted file mode 100644 index 475a79d284d80f595eae540131a22756b599643959078647e57126b1962f4ebe..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7rl;U_gn}Lf{046ehEhEGA zlO}P`w>3Q9bhp{}YWmY-2Hf8lzOVg1b&~i$Wxiu8bQl?4CEfLzX0j*Z$SL0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0%UK(&JrADa%p2g zWo~C>b98cVZ7ySI0162ZjgB#|!z3uC)^=>48d;!Z z#yLwX@l|@$EM&%MaSEuy2V8s&`q`q{P6fasw~!v8cVW`zhHQ5Q*zq|NMTJL`^k(D@ ziGPafFhGjh*^_yz2n($g`dPl)6fC17s4ia!q}F;%QX=v4xS9WJX98EU0RAfV4?hSv zJnsH zWWR!n@cT`;Bx9pY#@&3Y3{!;$OB5s`aPDk$ckY(?z6hJFR0~1-#gH1aMLNeeEJW3P bHW2on7uiFRaHwwI=br!thV7-YL|yTv#fOwf literal 0 HcmV?d00001 diff --git a/n_no-sse2-on-ix86-except-for-intel-drivers.patch b/n_no-sse2-on-ix86-except-for-intel-drivers.patch deleted file mode 100644 index f83c69d..0000000 --- a/n_no-sse2-on-ix86-except-for-intel-drivers.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: mesa-23.0.0/meson.build -=================================================================== ---- mesa-23.0.0.orig/meson.build -+++ mesa-23.0.0/meson.build -@@ -1295,35 +1295,6 @@ endif - - sse41_args = [] - with_sse41 = false --if host_machine.cpu_family().startswith('x86') -- pre_args += '-DUSE_SSE41' -- with_sse41 = true -- -- if cc.get_id() != 'msvc' -- sse41_args = ['-msse4.1'] -- -- if host_machine.cpu_family() == 'x86' -- if get_option('sse2') -- # These settings make generated GCC code match MSVC and follow -- # GCC advice on https://gcc.gnu.org/wiki/FloatingPointMath#x86note -- # -- # NOTE: We need to ensure stack is realigned given that we -- # produce shared objects, and have no control over the stack -- # alignment policy of the application. Therefore we need -- # -mstackrealign or -mincoming-stack-boundary=2. -- # -- # XXX: We could have SSE without -mstackrealign if we always used -- # __attribute__((force_align_arg_pointer)), but that's not -- # always the case. -- c_args += ['-msse2', '-mfpmath=sse', '-mstackrealign'] -- else -- # GCC on x86 (not x86_64) with -msse* assumes a 16 byte aligned stack, but -- # that's not guaranteed -- sse41_args += '-mstackrealign' -- endif -- endif -- endif --endif - - # Check for GCC style atomics - dep_atomic = null_dep diff --git a/n_stop-iris-flicker.patch b/n_stop-iris-flicker.patch index ee37501..8ea62c5 100644 --- a/n_stop-iris-flicker.patch +++ b/n_stop-iris-flicker.patch @@ -4,11 +4,11 @@ Date: Tue May 24 14:47:53 2022 -0400 Adjusting 'iris_batch.c' per 'https://gitlab.freedesktop.org/mesa/mesa/-/issues/5731'. -Index: mesa-23.0.0/src/gallium/drivers/iris/iris_batch.c +Index: mesa-23.1.0/src/gallium/drivers/iris/i915/iris_kmd_backend.c =================================================================== ---- mesa-23.0.0.orig/src/gallium/drivers/iris/iris_batch.c -+++ mesa-23.0.0/src/gallium/drivers/iris/iris_batch.c -@@ -923,8 +923,7 @@ submit_batch(struct iris_batch *batch) +--- mesa-23.1.0.orig/src/gallium/drivers/iris/i915/iris_kmd_backend.c ++++ mesa-23.1.0/src/gallium/drivers/iris/i915/iris_kmd_backend.c +@@ -273,8 +273,7 @@ i915_batch_submit(struct iris_batch *bat (struct drm_i915_gem_exec_object2) { .handle = bo->gem_handle, .offset = bo->address, diff --git a/u_dep_xcb.patch b/u_dep_xcb.patch index 13309c4..e92160f 100644 --- a/u_dep_xcb.patch +++ b/u_dep_xcb.patch @@ -1,8 +1,8 @@ -Index: mesa-23.0.0/meson.build +Index: mesa-23.1.1/meson.build =================================================================== ---- mesa-23.0.0.orig/meson.build -+++ mesa-23.0.0/meson.build -@@ -2191,9 +2191,11 @@ if with_platform_x11 +--- mesa-23.1.1.orig/meson.build ++++ mesa-23.1.1/meson.build +@@ -1966,9 +1966,11 @@ if with_platform_x11 endif endif if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm') @@ -14,16 +14,15 @@ Index: mesa-23.0.0/meson.build dep_xcb_dri3 = dependency('xcb-dri3') dep_xcb_present = dependency('xcb-present') # until xcb-dri3 has been around long enough to make a hard-dependency: -Index: mesa-23.0.0/src/loader/meson.build +Index: mesa-23.1.1/src/loader/meson.build =================================================================== ---- mesa-23.0.0.orig/src/loader/meson.build -+++ mesa-23.0.0/src/loader/meson.build -@@ -28,7 +28,7 @@ if with_platform_x11 and with_dri3 - include_directories : [inc_include, inc_src], - dependencies : [ - dep_libdrm, dep_xcb_dri3, dep_xcb_present, dep_xcb_sync, dep_xshmfence, -- dep_xcb_xfixes, dep_xcb_xrandr, -+ dep_xcb_xfixes, dep_xcb_xrandr, dep_xcb, - ], - build_by_default : false, - ) +--- mesa-23.1.1.orig/src/loader/meson.build ++++ mesa-23.1.1/src/loader/meson.build +@@ -46,6 +46,6 @@ libloader = static_library( + c_args : loader_c_args, + gnu_symbol_visibility : 'hidden', + include_directories : [inc_include, inc_src, inc_util], +- dependencies : [dep_libdrm, dep_thread, dep_xcb_xrandr], ++ dependencies : [dep_libdrm, dep_thread, dep_xcb_xrandr, dep_xcb], + build_by_default : false, + )