diff --git a/Mesa.changes b/Mesa.changes index d0e8cd2..52d14d0 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jun 23 07:24:59 UTC 2023 - Stefan Dirsch + +- Update to bugfix release 23.1.3 +- supersedes U_glx-Remove-pointless-GLX_INTEL_swap_event-paranoia.patch + (boo#1209005) +- -Dxmlconfig=enabled now also needs -Dexpat=enabled as dependancy + ------------------------------------------------------------------- Fri Jun 16 15:59:56 UTC 2023 - Alexei Sorokin diff --git a/Mesa.spec b/Mesa.spec index 5c5e459..396189e 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -42,7 +42,7 @@ %define glamor 1 %define _name_archive mesa -%define _version 23.1.2 +%define _version 23.1.3 %define with_opencl 0 %define with_rusticl 0 %define with_vulkan 0 @@ -123,7 +123,7 @@ %endif Name: Mesa%{psuffix} -Version: 23.1.2 +Version: 23.1.3 Release: 0 Summary: System for rendering 3-D graphics License: MIT @@ -144,7 +144,6 @@ Patch58: u_dep_xcb.patch 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 @@ -780,8 +779,6 @@ rm -rf docs/README.{VMS,WIN32,OS2} %patch100 -p1 %patch200 -p1 %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 @@ -816,6 +813,7 @@ egl_platforms=x11,wayland -Dosmesa=false \ -Dglx=disabled \ -Dxmlconfig=enabled \ + -Dexpat=enabled \ -Dshader-cache=enabled \ %else -Dosmesa=true \ diff --git a/U_glx-Remove-pointless-GLX_INTEL_swap_event-paranoia.patch b/U_glx-Remove-pointless-GLX_INTEL_swap_event-paranoia.patch deleted file mode 100644 index e53accd..0000000 --- a/U_glx-Remove-pointless-GLX_INTEL_swap_event-paranoia.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 19c57ea3bf6d77cf6f07f2a56e781f55b0e6013b Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 13 Dec 2022 12:26:58 -0500 -Subject: [PATCH] glx: Remove pointless GLX_INTEL_swap_event paranoia - -It's not our job to filter this out, it's the server's job to not send -events that haven't been selected for. We'll still throw the event away -if we don't have any client-side state for it though. - -Acked-by: David Heidelberg -Part-of: ---- - src/glx/dri2_glx.c | 2 +- - src/glx/glx_pbuffer.c | 20 -------------------- - src/glx/glxclient.h | 1 - - 3 files changed, 1 insertion(+), 22 deletions(-) - -diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c -index 9a47f40ca9c..85d6faee5f4 100644 ---- a/src/glx/dri2_glx.c -+++ b/src/glx/dri2_glx.c -@@ -649,7 +649,7 @@ unsigned dri2GetSwapEventType(Display* dpy, XID drawable) - struct glx_display *glx_dpy = __glXInitialize(dpy); - __GLXDRIdrawable *pdraw; - pdraw = dri2GetGlxDrawableFromXDrawableId(dpy, drawable); -- if (!pdraw || !(pdraw->eventMask & GLX_BUFFER_SWAP_COMPLETE_INTEL_MASK)) -+ if (!pdraw) - return 0; - return glx_dpy->codes.first_event + GLX_BufferSwapComplete; - } -diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c -index b74fed99efe..f66a520ea30 100644 ---- a/src/glx/glx_pbuffer.c -+++ b/src/glx/glx_pbuffer.c -@@ -64,10 +64,6 @@ ChangeDrawableAttribute(Display * dpy, GLXDrawable drawable, - const CARD32 * attribs, size_t num_attribs) - { - struct glx_display *priv = __glXInitialize(dpy); --#ifdef GLX_DIRECT_RENDERING -- __GLXDRIdrawable *pdraw; -- int i; --#endif - CARD32 *output; - CARD8 opcode; - -@@ -112,22 +108,6 @@ ChangeDrawableAttribute(Display * dpy, GLXDrawable drawable, - UnlockDisplay(dpy); - SyncHandle(); - --#ifdef GLX_DIRECT_RENDERING -- pdraw = GetGLXDRIDrawable(dpy, drawable); -- -- if (!pdraw) -- return; -- -- for (i = 0; i < num_attribs; i++) { -- switch(attribs[i * 2]) { -- case GLX_EVENT_MASK: -- /* Keep a local copy for masking out DRI2 proto events as needed */ -- pdraw->eventMask = attribs[i * 2 + 1]; -- break; -- } -- } --#endif -- - return; - } - -diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h -index af7759bec02..8eda47988b4 100644 ---- a/src/glx/glxclient.h -+++ b/src/glx/glxclient.h -@@ -127,7 +127,6 @@ struct __GLXDRIdrawableRec - struct glx_screen *psc; - GLenum textureTarget; - GLenum textureFormat; /* EXT_texture_from_pixmap support */ -- unsigned long eventMask; - int refcount; - }; - --- -2.35.3 - diff --git a/mesa-23.1.2.tar.xz b/mesa-23.1.2.tar.xz deleted file mode 100644 index 3b2f201..0000000 --- a/mesa-23.1.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60b1f3adb1561830c158bf3c68508943674fb9d69f384c3c7289694385ab5c7e -size 18333300 diff --git a/mesa-23.1.2.tar.xz.sig b/mesa-23.1.2.tar.xz.sig deleted file mode 100644 index dbf6dd6..0000000 Binary files a/mesa-23.1.2.tar.xz.sig and /dev/null differ diff --git a/mesa-23.1.3.tar.xz b/mesa-23.1.3.tar.xz new file mode 100644 index 0000000..054d1b3 --- /dev/null +++ b/mesa-23.1.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f6d7381bc10fbd2d6263ad1022785b8b511046c1a904162f8f7da18eea8aed9 +size 18358052 diff --git a/mesa-23.1.3.tar.xz.sig b/mesa-23.1.3.tar.xz.sig new file mode 100644 index 0000000..e2fa01a Binary files /dev/null and b/mesa-23.1.3.tar.xz.sig differ