pool/Mesa
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Mesa-libGLESv3-devel replaced by libglvnd-devel

Browse Source 
Adjusted baselibs.conf accordingly.

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=874
This commit is contained in:
Stefan Dirsch 2019-09-26 22:59:16 +00:00 committed by Git OBS Bridge
parent c3d49fc896
commit 1faa2da88a
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mesa-drivers.changes
View File

@ -6,9 +6,10 @@ Thu Sep 26 15:41:07 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
* Mesa-libEGL-devel * Mesa-libEGL-devel
* Mesa-libGLESv1_CM-devel * Mesa-libGLESv1_CM-devel
* Mesa-libGLESv2-devel * Mesa-libGLESv2-devel
* Mesa-libGLESv3-devel
Instead of requiring these let Mesa-devel package require Instead of requiring these let Mesa-devel package require
libglvnd-devel >= 1.2.0, which provides the contents of these libglvnd-devel >= 1.2.0, which provides the contents of these
packages now packages now. Adjusted baselibs.conf accordingly.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch <sndirsch@suse.com> Thu Sep 26 14:03:05 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

30
Mesa-drivers.spec
View File

@ -959,6 +959,34 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%doc docs/README* %doc docs/README*
%dir %{_datadir}/drirc.d %dir %{_datadir}/drirc.d
%config %{_datadir}/drirc.d/* %config %{_datadir}/drirc.d/*
%if 0%{?libglvnd} >= 120
%exclude /usr/include/EGL/egl.h
%exclude /usr/include/EGL/eglext.h
%exclude /usr/include/EGL/eglextchromium.h
%exclude /usr/include/EGL/eglmesaext.h
%exclude /usr/include/EGL/eglplatform.h
%exclude /usr/include/GL/gl.h
%exclude /usr/include/GL/gl_mangle.h
%exclude /usr/include/GL/glcorearb.h
%exclude /usr/include/GL/glext.h
%exclude /usr/include/GL/glx.h
%exclude /usr/include/GL/glx_mangle.h
%exclude /usr/include/GL/glxext.h
%exclude /usr/include/GLES/egl.h
%exclude /usr/include/GLES/gl.h
%exclude /usr/include/GLES/glext.h
%exclude /usr/include/GLES/glplatform.h
%exclude /usr/include/GLES2/gl2.h
%exclude /usr/include/GLES2/gl2ext.h
%exclude /usr/include/GLES2/gl2platform.h
%exclude /usr/include/GLES3/
%exclude /usr/include/KHR/khrplatform.h
%exclude %{_libdir}/pkgconfig/egl.pc
%exclude %{_libdir}/pkgconfig/gl.pc
%exclude %{_libdir}/pkgconfig/glesv1_cm.pc
%exclude %{_libdir}/pkgconfig/glesv2.pc
%exclude /usr/share/man/man3/*
%endif
%files libEGL1 %files libEGL1
%if 0%{?libglvnd} %if 0%{?libglvnd}
@ -1029,10 +1057,10 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%{_libdir}/libGLESv2.so %{_libdir}/libGLESv2.so
%endif %endif
%{_libdir}/pkgconfig/glesv2.pc %{_libdir}/pkgconfig/glesv2.pc
%endif
%files libGLESv3-devel %files libGLESv3-devel
%{_includedir}/GLES3 %{_includedir}/GLES3
%endif
%files -n libOSMesa8 %files -n libOSMesa8
%{_libdir}/libOSMesa.so.8.0.0 %{_libdir}/libOSMesa.so.8.0.0

1
Mesa.spec
View File

@ -978,6 +978,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%exclude /usr/include/GLES2/gl2.h %exclude /usr/include/GLES2/gl2.h
%exclude /usr/include/GLES2/gl2ext.h %exclude /usr/include/GLES2/gl2ext.h
%exclude /usr/include/GLES2/gl2platform.h %exclude /usr/include/GLES2/gl2platform.h
%exclude /usr/include/GLES3/
%exclude /usr/include/KHR/khrplatform.h %exclude /usr/include/KHR/khrplatform.h
%exclude %{_libdir}/pkgconfig/egl.pc %exclude %{_libdir}/pkgconfig/egl.pc
%exclude %{_libdir}/pkgconfig/gl.pc %exclude %{_libdir}/pkgconfig/gl.pc