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

- pickup gl, egl, glesv1_cm and glesv2 pkgconfig files from

Browse Source 
libglvnd build and add them to the appropriate devel subpackages

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=882
This commit is contained in:
Stefan Dirsch 2019-10-07 22:02:22 +00:00 committed by Git OBS Bridge
parent c58abd7f67
commit ba297b81e5
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Mesa-drivers.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 7 21:50:32 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- pickup gl, egl, glesv1_cm and glesv2 pkgconfig files from
libglvnd build and add them to the appropriate devel subpackages
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 7 16:20:49 UTC 2019 - Stefan Dirsch <sndirsch@suse.com> Mon Oct 7 16:20:49 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

9
Mesa-drivers.spec
View File

@ -893,6 +893,11 @@ rm -f %{buildroot}%{_libdir}/libGLES*
ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0 ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
%endif %endif
# pickup pkgconfig files from libglvnd build
rm -f %{buildroot}/%{_libdir}/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc
install -m 0644 /usr/share/doc/packages/libglvnd/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \
%{buildroot}/%{_libdir}/pkgconfig/
for dir in ../xc/doc/man/{GL/gl,GL/glx}; do for dir in ../xc/doc/man/{GL/gl,GL/glx}; do
pushd $dir pushd $dir
xmkmf -a xmkmf -a
@ -1005,7 +1010,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{?libglvnd} == 0 %if 0%{?libglvnd} == 0
%{_libdir}/libGLESv1_CM.so %{_libdir}/libGLESv1_CM.so
%endif %endif
%exclude %{_libdir}/pkgconfig/glesv1_cm.pc %{_libdir}/pkgconfig/glesv1_cm.pc
%files libGLESv2-2 %files libGLESv2-2
%if 0%{?libglvnd} == 0 %if 0%{?libglvnd} == 0
@ -1017,7 +1022,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{?libglvnd} == 0 %if 0%{?libglvnd} == 0
%{_libdir}/libGLESv2.so %{_libdir}/libGLESv2.so
%endif %endif
%exclude %{_libdir}/pkgconfig/glesv2.pc %{_libdir}/pkgconfig/glesv2.pc
%files libGLESv3-devel %files libGLESv3-devel
%{_includedir}/GLES3 %{_includedir}/GLES3

6
Mesa.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Oct 7 21:50:32 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>
- pickup gl, egl, glesv1_cm and glesv2 pkgconfig files from
libglvnd build and add them to the appropriate devel subpackages
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 7 16:20:49 UTC 2019 - Stefan Dirsch <sndirsch@suse.com> Mon Oct 7 16:20:49 UTC 2019 - Stefan Dirsch <sndirsch@suse.com>

13
Mesa.spec
View File

@ -892,6 +892,11 @@ rm -f %{buildroot}%{_libdir}/libGLES*
ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0 ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
%endif %endif
# pickup pkgconfig files from libglvnd build
rm -f %{buildroot}/%{_libdir}/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc
install -m 0644 /usr/share/doc/packages/libglvnd/pkgconfig/{gl,egl,glesv1_cm,glesv2}.pc \
%{buildroot}/%{_libdir}/pkgconfig/
for dir in ../xc/doc/man/{GL/gl,GL/glx}; do for dir in ../xc/doc/man/{GL/gl,GL/glx}; do
pushd $dir pushd $dir
xmkmf -a xmkmf -a
@ -970,7 +975,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if !0%{?libglvnd} %if !0%{?libglvnd}
%{_libdir}/libEGL.so %{_libdir}/libEGL.so
%endif %endif
%exclude %{_libdir}/pkgconfig/egl.pc %{_libdir}/pkgconfig/egl.pc
%files KHR-devel %files KHR-devel
%dir %{_includedir}/KHR %dir %{_includedir}/KHR
@ -991,7 +996,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{?libglvnd} == 0 %if 0%{?libglvnd} == 0
%{_libdir}/libGL.so %{_libdir}/libGL.so
%endif %endif
%exclude %{_libdir}/pkgconfig/gl.pc %{_libdir}/pkgconfig/gl.pc
%{_mandir}/man3/gl[A-Z]* %{_mandir}/man3/gl[A-Z]*
%files libGLESv1_CM1 %files libGLESv1_CM1
@ -1004,7 +1009,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{?libglvnd} == 0 %if 0%{?libglvnd} == 0
%{_libdir}/libGLESv1_CM.so %{_libdir}/libGLESv1_CM.so
%endif %endif
%exclude %{_libdir}/pkgconfig/glesv1_cm.pc %{_libdir}/pkgconfig/glesv1_cm.pc
%files libGLESv2-2 %files libGLESv2-2
%if 0%{?libglvnd} == 0 %if 0%{?libglvnd} == 0
@ -1016,7 +1021,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen
%if 0%{?libglvnd} == 0 %if 0%{?libglvnd} == 0
%{_libdir}/libGLESv2.so %{_libdir}/libGLESv2.so
%endif %endif
%exclude %{_libdir}/pkgconfig/glesv2.pc %{_libdir}/pkgconfig/glesv2.pc
%files libGLESv3-devel %files libGLESv3-devel
%{_includedir}/GLES3 %{_includedir}/GLES3