diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index d7f8381..4fa1b19 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -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 diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 4f421d7..cc702d1 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -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. diff --git a/Mesa.changes b/Mesa.changes index d7f8381..4fa1b19 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -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 diff --git a/Mesa.spec b/Mesa.spec index 9a9bd14..35d2351 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -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.