From c9d636980800163d915b71ec5a9bcd0f4e3ebe8c2e277a9640d3e7b678452038 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 17 Jun 2023 07:08:42 +0000 Subject: [PATCH 1/2] Accepting request 1093519 from home:XRevan86 OBS-URL: https://build.opensuse.org/request/show/1093519 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1214 --- Mesa.changes | 8 ++++++++ Mesa.spec | 6 ++++-- baselibs.conf | 4 ++++ u_fix-glx-context-opengl-4.5.patch | 12 ++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 u_fix-glx-context-opengl-4.5.patch diff --git a/Mesa.changes b/Mesa.changes index 1838601..dd78250 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 16 15:59:56 UTC 2023 - Alexei Sorokin + +- 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. +- Add intel_hasvk icd to baselibs.conf. + ------------------------------------------------------------------- Fri Jun 16 12:48:49 UTC 2023 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index b975b86..5c5e459 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -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 ... diff --git a/baselibs.conf b/baselibs.conf index cd96fa2..2e31850 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -75,9 +75,13 @@ Mesa-libd3d-devel requires "Mesa-libd3d- = " 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- = " provides "Mesa-libVulkan-devel- = 22.0.0" obsoletes "Mesa-libVulkan-devel- < 22.0.0" diff --git a/u_fix-glx-context-opengl-4.5.patch b/u_fix-glx-context-opengl-4.5.patch new file mode 100644 index 0000000..853e966 --- /dev/null +++ b/u_fix-glx-context-opengl-4.5.patch @@ -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. + */ From 8f196fbd8b81bdeee74e52ff801944c18820e5b72df47d29e3cdbc7a3c76fdb0 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Sat, 17 Jun 2023 07:14:55 +0000 Subject: [PATCH 2/2] improved changelog OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1215 --- Mesa.changes | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Mesa.changes b/Mesa.changes index dd78250..d0e8cd2 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -3,7 +3,16 @@ Fri Jun 16 15:59:56 UTC 2023 - Alexei Sorokin - 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. + 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. -------------------------------------------------------------------