rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 1045933 from X11:XOrg

Browse Source 
- don't try to generate libvdpau_virtio_gpu package on ppc64le; for
  some reason this driver doesn't get built on this platform

- 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.

OBS-URL: https://build.opensuse.org/request/show/1045933
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=463
This commit is contained in:
Dominique Leuenberger 2023-01-01 08:38:27 +00:00 committed by Git OBS Bridge
commit f992081808
11 changed files with 84 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Mesa.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Sat Dec 31 10:31:10 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
- don't try to generate libvdpau_virtio_gpu package on ppc64le; for
some reason this driver doesn't get built on this platform
-------------------------------------------------------------------
Thu Dec 29 22:21:35 UTC 2022 - Alexei Sorokin <sor.alexei@meowr.ru>
- 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 <sndirsch@suse.com>

92
Mesa.spec
View File

@ -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,17 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%endif
%endif
%if %{vdpau_virtio_gpu}
# for some reason driver doesn't get built on ppc64le
%ifnarch ppc64le
%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
%endif
%if "%{flavor}" != "drivers"
%files libglapi0
%{_libdir}/libglapi.so.0*
@ -1192,6 +1178,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

7
U_fix-mpeg1_2-decode-mesa-20.2.patch
View File

@ -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) {

3
baselibs.conf
View File

@ -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-<targettype> = <version>"
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

3
mesa-22.2.4.tar.xz
View File

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

BIN
mesa-22.2.4.tar.xz.sig
View File

Binary file not shown.

3
mesa-22.3.2.tar.xz Normal file
View File

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

BIN
mesa-22.3.2.tar.xz.sig Normal file
View File

Binary file not shown.

11
n_buildfix-21.3.0.patch
View File

@ -1,11 +0,0 @@
--- mesa-21.3.0/include/vulkan/vulkan.h.orig 2021-11-18 04:09:42.987222089 +0100
+++ mesa-21.3.0/include/vulkan/vulkan.h 2021-11-18 04:10:08.071701634 +0100
@@ -38,7 +38,7 @@
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-#include <wayland-client.h>
+#include <wayland/wayland-client.h>
#include "vulkan_wayland.h"
#endif

12
n_drirc-disable-rgb10-for-chromium-on-amd.patch
View File

@ -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.
<application name="DiRT Rally" executable="DirtRally">
<option name="radeonsi_prim_restart_tri_strips_only" value="true"/>
--- mesa-22.3.2.orig/src/util/00-mesa-defaults.conf
+++ mesa-22.3.2/src/util/00-mesa-defaults.conf
@@ -863,6 +863,14 @@ TODO: document the other workarounds.
<application name="Rocket League" executable="RocketLeague">
<option name="radeonsi_zerovram" value="true" />
</application>
+ <!-- This is workaround to prevent distorted colors on hardware accelerated video in Chromium. https://bugzilla.opensuse.org/show_bug.cgi?id=1113211 -->
+ <application name="Chromium" executable="chromium">

15
u_dep_xcb.patch
View File

@ -1,8 +1,8 @@
Index: mesa-20.2.0/meson.build
Index: mesa-22.3.2/meson.build
===================================================================
--- mesa-20.2.0.orig/meson.build
+++ mesa-20.2.0/meson.build
@@ -1718,10 +1718,12 @@ if with_platform_x11
--- mesa-22.3.2.orig/meson.build
+++ mesa-22.3.2/meson.build
@@ -2143,9 +2143,11 @@ if with_platform_x11
endif
endif
if with_any_vk or with_egl or (with_glx == 'dri' and with_dri_platform == 'drm')
@ -10,15 +10,14 @@ Index: mesa-20.2.0/meson.build
dep_xcb_dri2 = dependency('xcb-dri2', version : '>= 1.8')
if with_dri3
pre_args += '-DHAVE_DRI3'
+ dep_xcb = dependency('xcb')
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-20.2.0/src/loader/meson.build
Index: mesa-22.3.2/src/loader/meson.build
===================================================================
--- mesa-20.2.0.orig/src/loader/meson.build
+++ mesa-20.2.0/src/loader/meson.build
--- mesa-22.3.2.orig/src/loader/meson.build
+++ mesa-22.3.2/src/loader/meson.build
@@ -28,7 +28,7 @@ if with_platform_x11 and with_dri3
include_directories : [inc_include, inc_src],
dependencies : [