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

Accepting request 1093734 from X11:XOrg

Browse Source 
- Add patch u_fix-glx-context-opengl-4.5.patch: Fix a regression
  that causes Wine to crash on GPUs that don't support OpenGL 4.6
  and later:.
  Mesa 23.1 has a regression [1] that breaks Wine if the GPU does not 
  support OpenGL 4.6 (reportedly), Intel HD 4000 is affected.
  The problem was narrowed down to commit e89e1f504 [2] so this patch
  removes the offending [3] part from there to fix the problem.
  It's unlikely that there will be any side effects from that, 
  should be just as good as it was in Mesa 23.0.
  [1] https://gitlab.freedesktop.org/mesa/mesa/-/issues/8901
  [2] e89e1f5049
  [3] https://gitlab.freedesktop.org/mesa/mesa/-/issues/8901#note_1962991
- Add intel_hasvk icd to baselibs.conf.

OBS-URL: https://build.opensuse.org/request/show/1093734
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=480
This commit is contained in:
Dominique Leuenberger 2023-06-20 14:40:05 +00:00 committed by Git OBS Bridge
commit 6e8cee3787
4 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Mesa.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Fri Jun 16 15:59:56 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
- Add patch u_fix-glx-context-opengl-4.5.patch: Fix a regression
that causes Wine to crash on GPUs that don't support OpenGL 4.6
and later:.
Mesa 23.1 has a regression [1] that breaks Wine if the GPU does not
support OpenGL 4.6 (reportedly), Intel HD 4000 is affected.
The problem was narrowed down to commit e89e1f504 [2] so this patch
removes the offending [3] part from there to fix the problem.
It's unlikely that there will be any side effects from that,
should be just as good as it was in Mesa 23.0.
[1] https://gitlab.freedesktop.org/mesa/mesa/-/issues/8901
[2] https://gitlab.freedesktop.org/mesa/mesa/-/commit/e89e1f5049d3b78542fcd69b7d6106dd4bdafc39
[3] https://gitlab.freedesktop.org/mesa/mesa/-/issues/8901#note_1962991
- Add intel_hasvk icd to baselibs.conf.
-------------------------------------------------------------------
Fri Jun 16 12:48:49 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>

6
Mesa.spec
View File

@ -130,8 +130,8 @@ License: MIT
Group: System/Libraries
URL: https://www.mesa3d.org
#Git-Clone: git://anongit.freedesktop.org/mesa/mesa
Source: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz
Source1: https://mesa.freedesktop.org/archive/%{_name_archive}-%{_version}.tar.xz.sig
Source: https://archive.mesa3d.org/%{_name_archive}-%{_version}.tar.xz
Source1: https://archive.mesa3d.org/%{_name_archive}-%{_version}.tar.xz.sig
Source2: baselibs.conf
Source3: README.updates
Source4: manual-pages.tar.bz2
@ -145,6 +145,7 @@ Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch
Patch200: u_fix-build-on-ppc64le.patch
Patch400: n_stop-iris-flicker.patch
Patch600: U_glx-Remove-pointless-GLX_INTEL_swap_event-paranoia.patch
Patch800: u_fix-glx-context-opengl-4.5.patch
%ifarch %{ix86} x86_64
BuildRequires: DirectX-Headers
%endif
@ -781,6 +782,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch400 -p1
# reverse apply to fix a regression (boo#1209005)
%patch600 -p1 -R
%patch800 -p1
# Remove requires to vulkan libs from baselibs.conf on platforms
# where vulkan build is disabled; ugly ...

4
baselibs.conf
View File

@ -75,9 +75,13 @@ Mesa-libd3d-devel
requires "Mesa-libd3d-<targettype> = <version>"
libvulkan_intel
targetarch aarch64 +/usr/share/vulkan/icd.d/intel_icd.*.json
targetarch aarch64 +/usr/share/vulkan/icd.d/intel_hasvk_icd.*.json
targetarch ppc64 +/usr/share/vulkan/icd.d/intel_icd.*.json
targetarch ppc64 +/usr/share/vulkan/icd.d/intel_hasvk_icd.*.json
targetarch ppc64le +/usr/share/vulkan/icd.d/intel_icd.*.json
targetarch ppc64le +/usr/share/vulkan/icd.d/intel_hasvk_icd.*.json
targetarch x86_64 +/usr/share/vulkan/icd.d/intel_icd.*.json
targetarch x86_64 +/usr/share/vulkan/icd.d/intel_hasvk_icd.*.json
requires "Mesa-vulkan-device-select-<targettype> = <version>"
provides "Mesa-libVulkan-devel-<targettype> = 22.0.0"
obsoletes "Mesa-libVulkan-devel-<targettype> < 22.0.0"

12
u_fix-glx-context-opengl-4.5.patch Normal file
View File

@ -0,0 +1,12 @@
--- a/src/glx/create_context.c
+++ b/src/glx/create_context.c
@@ -115,6 +115,9 @@ glXCreateContextAttribsARB(Display *dpy,
#endif
if (gc == NULL) {
+ /* increment dpy->request in order to give a unique serial number to the
+ * error */
+ XNoOp(dpy);
/* -1 isn't a legal XID, which is sort of the point, we've failed
* before we even got to XID allocation.
*/