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

Accepting request 1093479 from home:jtorres:branches:X11:XOrg

Browse Source 
- Fix of bsc#1212345
  * After update to 23.1.1 this change affected our build split:
    2630f4b310

OBS-URL: https://build.opensuse.org/request/show/1093479
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=1212
This commit is contained in:
Stefan Dirsch 2023-06-16 11:55:11 +00:00 committed by Git OBS Bridge
parent 15f23f12c6
commit ab59043d32
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Mesa.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jun 16 11:01:52 UTC 2023 - Joan Torres <joan.torres@suse.com>
- 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 <sndirsch@suse.com> Sat Jun 10 14:28:05 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>

27
Mesa.spec
View File

@ -811,24 +811,21 @@ egl_platforms=x11,wayland
%meson \ %meson \
--auto-features=disabled \ --auto-features=disabled \
%if "%{flavor}" == "drivers" %if "%{flavor}" == "drivers"
-Dgles1=disabled \
-Dgles2=disabled \
-Degl=enabled \
-Dglx=disabled \
-Dosmesa=false \ -Dosmesa=false \
-Dglx=disabled \
-Dxmlconfig=enabled \ -Dxmlconfig=enabled \
-Dshader-cache=enabled \ -Dshader-cache=enabled \
%else %else
-Dglvnd=true \
-Dgles1=enabled \
-Dgles2=enabled \
-Degl=enabled \
-Dosmesa=true \ -Dosmesa=true \
-Dglx=auto \ -Dglx=auto \
-Dllvm=disabled \ -Dllvm=disabled \
-Dvulkan-drivers= \ -Dvulkan-drivers= \
-Dxlib-lease=enabled \ -Dxlib-lease=enabled \
%endif %endif
-Dglvnd=true \
-Dgles1=enabled \
-Dgles2=enabled \
-Degl=enabled \
-Dallow-kcmp=enabled \ -Dallow-kcmp=enabled \
-Dplatforms=$egl_platforms \ -Dplatforms=$egl_platforms \
-Ddri3=enabled \ -Ddri3=enabled \
@ -917,11 +914,23 @@ rm %{buildroot}/%{_includedir}/EGL/eglext.h
rm %{buildroot}/%{_includedir}/EGL/eglext_angle.h rm %{buildroot}/%{_includedir}/EGL/eglext_angle.h
rm %{buildroot}/%{_includedir}/EGL/eglmesaext.h rm %{buildroot}/%{_includedir}/EGL/eglmesaext.h
rm %{buildroot}/%{_includedir}/EGL/eglplatform.h rm %{buildroot}/%{_includedir}/EGL/eglplatform.h
rm %{buildroot}/%{_libdir}/pkgconfig/egl.pc
# in Mesa-libGL-devel # in Mesa-libGL-devel
rm -rf %{buildroot}/%{_includedir}/GL 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 # in Mesa-libglapi0
rm %{buildroot}/%{_libdir}/libglapi.so* rm %{buildroot}/%{_libdir}/libglapi.so*