From ab59043d32dffd113a5f62ca8e55627fa60d0b60ef14a5fa920d9b2f62369923 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 16 Jun 2023 11:55:11 +0000 Subject: [PATCH 1/2] Accepting request 1093479 from home:jtorres:branches:X11:XOrg - Fix of bsc#1212345 * After update to 23.1.1 this change affected our build split: https://gitlab.freedesktop.org/mesa/mesa/-/commit/2630f4b310f534c830250be44d285e485da83869 OBS-URL: https://build.opensuse.org/request/show/1093479 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1212 --- Mesa.changes | 7 +++++++ Mesa.spec | 27 ++++++++++++++++++--------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Mesa.changes b/Mesa.changes index a6411bb..91bc488 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 16 11:01:52 UTC 2023 - Joan Torres + +- Fix of bsc#1212345 + * After update to 23.1.1 this change affected our build split: + https://gitlab.freedesktop.org/mesa/mesa/-/commit/2630f4b310f534c830250be44d285e485da83869 + ------------------------------------------------------------------- Sat Jun 10 14:28:05 UTC 2023 - Stefan Dirsch diff --git a/Mesa.spec b/Mesa.spec index ae8a1b6..2790134 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -811,24 +811,21 @@ egl_platforms=x11,wayland %meson \ --auto-features=disabled \ %if "%{flavor}" == "drivers" - -Dgles1=disabled \ - -Dgles2=disabled \ - -Degl=enabled \ - -Dglx=disabled \ -Dosmesa=false \ + -Dglx=disabled \ -Dxmlconfig=enabled \ -Dshader-cache=enabled \ %else - -Dglvnd=true \ - -Dgles1=enabled \ - -Dgles2=enabled \ - -Degl=enabled \ -Dosmesa=true \ -Dglx=auto \ -Dllvm=disabled \ -Dvulkan-drivers= \ -Dxlib-lease=enabled \ %endif + -Dglvnd=true \ + -Dgles1=enabled \ + -Dgles2=enabled \ + -Degl=enabled \ -Dallow-kcmp=enabled \ -Dplatforms=$egl_platforms \ -Ddri3=enabled \ @@ -917,11 +914,23 @@ rm %{buildroot}/%{_includedir}/EGL/eglext.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 # in Mesa-libGL-devel rm -rf %{buildroot}/%{_includedir}/GL +#in Mesa-libGLESv1_CM-devel +rm -rf %{buildroot}/%{_includedir}/GLES + +#in Mesa-libGLESv2-devel +rm -rf %{buildroot}/%{_includedir}/GLES2 + +#in Mesa-libGLESv3-devel +rm -rf %{buildroot}/%{_includedir}/GLES3 + +#in Mesa-libEGL1 +rm -f %{buildroot}/%{_libdir}/libEGL_mesa.so* +rm -rf %{buildroot}/%{_datadir}/glvnd + # in Mesa-libglapi0 rm %{buildroot}/%{_libdir}/libglapi.so* From e14148cf3f300e0b4e9f3c434d0fa3d783cbbc2440dfe2ea46b36abd7cf01a86 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Fri, 16 Jun 2023 12:49:52 +0000 Subject: [PATCH 2/2] - use -Dxlib-lease=enabled also for -drivers build OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1213 --- Mesa.changes | 5 +++++ Mesa.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Mesa.changes b/Mesa.changes index 91bc488..1838601 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 16 12:48:49 UTC 2023 - Stefan Dirsch + +- use -Dxlib-lease=enabled also for -drivers build + ------------------------------------------------------------------- Fri Jun 16 11:01:52 UTC 2023 - Joan Torres diff --git a/Mesa.spec b/Mesa.spec index 2790134..b975b86 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -820,8 +820,8 @@ egl_platforms=x11,wayland -Dglx=auto \ -Dllvm=disabled \ -Dvulkan-drivers= \ - -Dxlib-lease=enabled \ %endif + -Dxlib-lease=enabled \ -Dglvnd=true \ -Dgles1=enabled \ -Dgles2=enabled \