From c38ea883fe6b1922de998aa7cb64aae80969a7bbc6777b36a2f252b8e0c46483 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 31 Dec 2022 09:55:24 +0000 Subject: [PATCH 1/2] Accepting request 1045769 from home:XRevan86 - Update to version 22.3.2. OBS-URL: https://build.opensuse.org/request/show/1045769 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1170 --- Mesa.changes | 17 ++++ Mesa.spec | 89 ++++++++---------- U_fix-mpeg1_2-decode-mesa-20.2.patch | 7 +- baselibs.conf | 3 +- mesa-22.2.4.tar.xz | 3 - mesa-22.2.4.tar.xz.sig | Bin 119 -> 0 bytes mesa-22.3.2.tar.xz | 3 + mesa-22.3.2.tar.xz.sig | Bin 0 -> 329 bytes n_buildfix-21.3.0.patch | 11 --- ...rc-disable-rgb10-for-chromium-on-amd.patch | 12 +-- u_dep_xcb.patch | 15 ++- 11 files changed, 75 insertions(+), 85 deletions(-) delete mode 100644 mesa-22.2.4.tar.xz delete mode 100644 mesa-22.2.4.tar.xz.sig create mode 100644 mesa-22.3.2.tar.xz create mode 100644 mesa-22.3.2.tar.xz.sig delete mode 100644 n_buildfix-21.3.0.patch diff --git a/Mesa.changes b/Mesa.changes index 015b349..9f9c64d 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Dec 29 22:21:35 UTC 2022 - Alexei Sorokin + +- Update to version 22.3.0: + * See https://docs.mesa3d.org/relnotes/22.3.0.html +- Update to version 22.3.1: + * See https://docs.mesa3d.org/relnotes/22.3.1.html +- Update to version 22.3.2: + * See https://docs.mesa3d.org/relnotes/22.3.2.html +- Remove the libXvMC_nouveau and libXvMC_r600 packages as XVMC + support was removed. +- Add libvdpau_virtio_gpu package for VirtIO GPU. +- Rebase n_drirc-disable-rgb10-for-chromium-on-amd.patch. +- Rebase u_dep_xcb.patch. +- Rebase U_fix-mpeg1_2-decode-mesa-20.2.patch. +- Drop n_buildfix-21.3.0.patch: fixed upstream. + ------------------------------------------------------------------- Sat Dec 3 09:53:53 UTC 2022 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index 49708b2..2c080c6 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 22.2.4 +%define _version 22.3.2 %define with_opencl 0 %define with_vulkan 0 %define with_llvm 0 @@ -53,14 +53,14 @@ %define gallium_loader 0 %endif -%define xvmc_support 0 %define vdpau_nouveau 0 %define vdpau_radeon 0 +%define vdpau_virtio_gpu 0 %ifarch %{ix86} x86_64 aarch64 %{arm} ppc64 ppc64le riscv64 - %define xvmc_support 1 %define vdpau_nouveau 1 %define vdpau_radeon 1 + %define vdpau_virtio_gpu 1 %endif %ifarch %{ix86} x86_64 %{arm} aarch64 @@ -71,7 +71,7 @@ %define with_opencl 1 %ifarch %{ix86} x86_64 %define with_vulkan 1 - %define vulkan_drivers swrast,amd,intel + %define vulkan_drivers swrast,amd,intel,intel_hasvk %endif %ifarch %{arm} aarch64 %define with_vulkan 1 @@ -111,15 +111,15 @@ # Not built because nouveau driver is not built. %define vdpau_nouveau 0 - # Not built. (Why?) - %define xvmc_support 0 + # Not built because virtio_gpu driver is not built. + %define vdpau_virtio_gpu 0 # Vulkan includes radv driver which requires llvm %define with_vulkan 0 %endif Name: Mesa%{psuffix} -Version: 22.2.4 +Version: 22.3.2 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -139,9 +139,8 @@ 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_buildfix-21.3.0.patch -Patch400: n_no-sse2-on-ix86-except-for-intel-drivers.patch -Patch500: n_stop-iris-flicker.patch +Patch300: n_no-sse2-on-ix86-except-for-intel-drivers.patch +Patch400: n_stop-iris-flicker.patch %ifarch %{ix86} x86_64 BuildRequires: DirectX-Headers %endif @@ -194,7 +193,6 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xshmfence) -BuildRequires: pkgconfig(xvmc) BuildRequires: pkgconfig(xxf86vm) BuildRequires: pkgconfig(zlib) Provides: Mesa7 = %{version} @@ -209,6 +207,10 @@ Obsoletes: Mesa-nouveau3d < %{version} Obsoletes: xorg-x11-Mesa < %{version} Provides: s2tc = %{version} Obsoletes: s2tc < %{version} +Provides: libXvMC_nouveau = %{version} +Obsoletes: libXvMC_nouveau < %{version} +Provides: libXvMC_r600 = %{version} +Obsoletes: libXvMC_r600 < %{version} Provides: libtxc_dxtn = %{version} Obsoletes: libtxc_dxtn < %{version} %ifarch %{arm} aarch64 @@ -600,26 +602,8 @@ Requires: Mesa-libd3d = %{version} %description -n Mesa-libd3d-devel Mesa Direct3D9 state tracker development package -%package -n libXvMC_nouveau -Summary: XVMC state tracker for Nouveau -Group: System/Libraries - -%description -n libXvMC_nouveau -This package contains the XvMC state tracker for Nouveau. This is -still "work in progress", i.e. expect poor video quality, choppy -videos and artefacts all over. - -%package -n libXvMC_r600 -Summary: XVMC state tracker for R600 -Group: System/Libraries - -%description -n libXvMC_r600 -This package contains the XvMC state tracker for R600. This is -still "work in progress", i.e. expect poor video quality, choppy -videos and artefacts all over. - %package -n libvdpau_nouveau -Summary: XVMC state tracker for Nouveau +Summary: VDPAU state tracker for Nouveau Group: System/Libraries Supplements: modalias(pci:v000010DEd*sv*sd*bc03sc*i*) Supplements: modalias(pci:v000012D2d*sv*sd*bc03sc*i*) @@ -628,7 +612,7 @@ Supplements: modalias(pci:v000012D2d*sv*sd*bc03sc*i*) This package contains the VDPAU state tracker for Nouveau. %package -n libvdpau_r300 -Summary: XVMC state tracker for R300 +Summary: VDPAU state tracker for R300 Group: System/Libraries Supplements: modalias(pci:v00001002d*sv*sd*bc03sc*i*) @@ -636,7 +620,7 @@ Supplements: modalias(pci:v00001002d*sv*sd*bc03sc*i*) This package contains the VDPAU state tracker for R300. %package -n libvdpau_r600 -Summary: XVMC state tracker for R600 +Summary: VDPAU state tracker for R600 Group: System/Libraries Supplements: modalias(pci:v00001002d*sv*sd*bc03sc*i*) @@ -644,13 +628,20 @@ Supplements: modalias(pci:v00001002d*sv*sd*bc03sc*i*) This package contains the VDPAU state tracker for R600. %package -n libvdpau_radeonsi -Summary: XVMC state tracker for radeonsi +Summary: VDPAU state tracker for radeonsi Group: System/Libraries Supplements: modalias(pci:v00001002d*sv*sd*bc03sc*i*) %description -n libvdpau_radeonsi This package contains the VDPAU state tracker for radeonsi. +%package -n libvdpau_virtio_gpu +Summary: VDPAU state tracker for VirtIO GPU +Group: System/Libraries + +%description -n libvdpau_virtio_gpu +This package contains the VDPAU state tracker for VirtIO GPU. + %package -n Mesa-libOpenCL Summary: Mesa OpenCL implementation Group: System/Libraries @@ -769,11 +760,10 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch58 -p1 %patch100 -p1 %patch200 -p1 -%patch300 -p1 %ifarch %{ix86} -%patch400 -p1 +%patch300 -p1 %endif -%patch500 -p1 +%patch400 -p1 # Remove requires to vulkan libs from baselibs.conf on platforms # where vulkan build is disabled; ugly ... @@ -782,12 +772,6 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \ mv "%{_sourcedir}/temp" "%{_sourcedir}/baselibs.conf" %endif -# Avoid build error for PowerPC -# https://bugzilla.opensuse.org/show_bug.cgi?id=1171045 -%ifarch ppc64 ppc64le -sed -i -e s/cpp_std=gnu++11/cpp_std=gnu++14/g meson.build -%endif - %build # try to avoid OOM on ppc64 (boo#1194739) %ifarch ppc64 ppc64le @@ -840,7 +824,6 @@ egl_platforms=x11,wayland %endif %if %{gallium_loader} -Dgallium-vdpau=true \ - -Dgallium-xvmc=true \ -Dgallium-va=true \ -Dgallium-xa=true \ %endif @@ -900,7 +883,7 @@ rm -f %{buildroot}/%{_libdir}/libEGL.so* # in Mesa-libEGL-devel rm %{buildroot}/%{_includedir}/EGL/egl.h rm %{buildroot}/%{_includedir}/EGL/eglext.h -rm %{buildroot}/%{_includedir}/EGL/eglextchromium.h +rm %{buildroot}/%{_includedir}/EGL/eglext_angle.h rm %{buildroot}/%{_includedir}/EGL/eglmesaext.h rm %{buildroot}/%{_includedir}/EGL/eglplatform.h rm %{buildroot}/%{_libdir}/pkgconfig/egl.pc @@ -1062,14 +1045,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/pkgconfig/xatracker.pc %endif -%if %{xvmc_support} -%files -n libXvMC_nouveau -%{_libdir}/libXvMCnouveau.so* - -%files -n libXvMC_r600 -%{_libdir}/libXvMCr600.so* -%endif - %if %{vdpau_nouveau} %files -n libvdpau_nouveau %{_libdir}/vdpau/libvdpau_nouveau.so @@ -1101,6 +1076,14 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %endif %endif +%if %{vdpau_virtio_gpu} +%files -n libvdpau_virtio_gpu +%{_libdir}/vdpau/libvdpau_virtio_gpu.so +%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1 +%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1.0 +%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1.0.0 +%endif + %if "%{flavor}" != "drivers" %files libglapi0 %{_libdir}/libglapi.so.0* @@ -1192,6 +1175,8 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %dir %{_datadir}/vulkan/icd.d %{_datadir}/vulkan/icd.d/intel_icd.*.json %{_libdir}/libvulkan_intel.so +%{_datadir}/vulkan/icd.d/intel_hasvk_icd.*.json +%{_libdir}/libvulkan_intel_hasvk.so %endif %files -n libvulkan_radeon diff --git a/U_fix-mpeg1_2-decode-mesa-20.2.patch b/U_fix-mpeg1_2-decode-mesa-20.2.patch index eeb2562..501b751 100644 --- a/U_fix-mpeg1_2-decode-mesa-20.2.patch +++ b/U_fix-mpeg1_2-decode-mesa-20.2.patch @@ -2,15 +2,16 @@ --- src/gallium/drivers/r600/evergreen_state.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) + --- a/src/gallium/drivers/r600/evergreen_state.c -+++ a/src/gallium/drivers/r600/evergreen_state.c -@@ -575,7 +575,8 @@ static void *evergreen_create_sampler_state(struct pipe_context *ctx, ++++ b/src/gallium/drivers/r600/evergreen_state.c +@@ -580,7 +580,8 @@ static void *evergreen_create_sampler_st : state->max_anisotropy; unsigned max_aniso_ratio = r600_tex_aniso_filter(max_aniso); bool trunc_coord = state->min_img_filter == PIPE_TEX_FILTER_NEAREST && - state->mag_img_filter == PIPE_TEX_FILTER_NEAREST; + state->mag_img_filter == PIPE_TEX_FILTER_NEAREST && -+ !state->normalized_coords; ++ state->unnormalized_coords; float max_lod = state->max_lod; if (!ss) { diff --git a/baselibs.conf b/baselibs.conf index cd0e41e..872dda4 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -87,12 +87,11 @@ libvulkan_radeon targetarch ppc64le +/usr/share/vulkan/icd.d/radeon_icd.*.json targetarch x86_64 +/usr/share/vulkan/icd.d/radeon_icd.*.json requires "Mesa-vulkan-device-select- = " -libXvMC_nouveau -libXvMC_r600 libvdpau_nouveau libvdpau_r300 libvdpau_r600 libvdpau_radeonsi +libvdpau_virtio_gpu Mesa-vulkan-device-select Mesa-vulkan-overlay Mesa-dri-vc4 diff --git a/mesa-22.2.4.tar.xz b/mesa-22.2.4.tar.xz deleted file mode 100644 index 1dd7dc2..0000000 --- a/mesa-22.2.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65d76b53ca5c7b46019e0e8e5b414de45d2fecd3fcd71707f6c3bc7691c9f7ab -size 16497852 diff --git a/mesa-22.2.4.tar.xz.sig b/mesa-22.2.4.tar.xz.sig deleted file mode 100644 index bde986d29e86a1755bf8fa2b8ef99c35eeb737629295d95606511606065a1a69..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAuWnmEGVvrS6WGOtdJxpOwX+gL5ZB?JCzgF9AD1O7rlw4XciGhn#048!mk&)rU z$JsSCJEHG$ulKGi=6Kk*8A#g0A0W{KmY&$ diff --git a/mesa-22.3.2.tar.xz b/mesa-22.3.2.tar.xz new file mode 100644 index 0000000..a2c0b1b --- /dev/null +++ b/mesa-22.3.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c15df758a8795f53e57f2a228eb4593c22b16dffd9b38f83901f76cd9533140b +size 16988720 diff --git a/mesa-22.3.2.tar.xz.sig b/mesa-22.3.2.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..b6224a53e94614998841b68cb9aae191647da93f135226501b7c7ae784786f92 GIT binary patch literal 329 zcmV-P0k-~$0Y(G>0SEvv79j*zRUP45mXBjW!btXwjxn#pBq*i@0%NW5{}LQ!a%p2g zWo~C>b98cVZ7ySI0162ZjgB#|!z3uCEc*xkJSFsVeYL{z(bxz|v*@@FU-L&^fb^79 zOyB4$54+?es2p{6KCxGW=6($S3qC#swKa|Um?S!z@c)LINqJFY2v{A6p;7%d+!P8V)%K>s|F1x zN;A6+`!!UkOz{V>nQ0hY;BaztxQ$~c(wl6ElFin()!t-~rH3dIX-D_dO=iAS!D8)& zre%Ui;f4+W$lEIlEPrUe`z(Gq(!<-BGEIO%u3@Sj2_9v43NIcw@15;2*xpx8%BvQ* bMxpC}^A1;vX1>XK{s@vw@FSxS^W>f2r8J -+#include - #include "vulkan_wayland.h" - #endif - diff --git a/n_drirc-disable-rgb10-for-chromium-on-amd.patch b/n_drirc-disable-rgb10-for-chromium-on-amd.patch index bda802f..5d52fac 100644 --- a/n_drirc-disable-rgb10-for-chromium-on-amd.patch +++ b/n_drirc-disable-rgb10-for-chromium-on-amd.patch @@ -1,10 +1,10 @@ -Index: mesa-20.2.0/src/util/00-mesa-defaults.conf +Index: mesa-22.3.2/src/util/00-mesa-defaults.conf =================================================================== ---- mesa-20.2.0.orig/src/util/00-mesa-defaults.conf -+++ mesa-20.2.0/src/util/00-mesa-defaults.conf -@@ -633,6 +633,14 @@ TODO: document the other workarounds. - -