SHA256
1
0
forked from pool/Mesa

Accepting request 631630 from home:Vogtinator:branches:X11:XOrg

- Add wayland to egl_platforms for Leap 15.0+ and TW again (boo#1105798)

- Add wayland to egl_platforms for Leap 15.0+ and TW again (boo#1105798)

OBS-URL: https://build.opensuse.org/request/show/631630
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=768
This commit is contained in:
Stefan Dirsch 2018-08-27 11:00:14 +00:00 committed by Git OBS Bridge
parent d5bc6b44c9
commit 6e229153b9
4 changed files with 24 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Aug 26 19:03:01 UTC 2018 - fabian@ritter-vogt.de
- Add wayland to egl_platforms for Leap 15.0+ and TW again (boo#1105798)
-------------------------------------------------------------------
Fri Aug 17 11:53:08 UTC 2018 - sndirsch@suse.com

View File

@ -764,7 +764,7 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \
%endif
%build
%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}))
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
egl_platforms=x11,drm,wayland
%else
egl_platforms=x11,drm
@ -846,6 +846,12 @@ make %{?_smp_mflags} V=1
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
%if !(0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})))
# libwayland-egl is provided by wayland itself
rm -f %{buildroot}/%{_libdir}/libwayland-egl.so*
rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc
%endif
%if %{drivers}
# Delete things that we do not package in the Mesa-drivers variant, but can
# not disable from buildling and installing.

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Aug 26 19:03:01 UTC 2018 - fabian@ritter-vogt.de
- Add wayland to egl_platforms for Leap 15.0+ and TW again (boo#1105798)
-------------------------------------------------------------------
Fri Aug 17 11:53:08 UTC 2018 - sndirsch@suse.com

View File

@ -763,7 +763,7 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \
%endif
%build
%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}))
%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})
egl_platforms=x11,drm,wayland
%else
egl_platforms=x11,drm
@ -845,6 +845,12 @@ make %{?_smp_mflags} V=1
%make_install
find %{buildroot} -type f -name "*.la" -delete -print
%if !(0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})))
# libwayland-egl is provided by wayland itself
rm -f %{buildroot}/%{_libdir}/libwayland-egl.so*
rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc
%endif
%if %{drivers}
# Delete things that we do not package in the Mesa-drivers variant, but can
# not disable from buildling and installing.