From aaf56abff9d93b2538b598992b43d0e2e5781e750ead6415397bbdac3c456f16 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 13 Aug 2018 15:19:50 +0000 Subject: [PATCH] - disabled build of libwayland-egl for factory/sle16/Leap 16 now being provided by Wayland itself and probably be removed from Mesa soon; see also https://build.opensuse.org/request/show/613048 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=765 --- Mesa-drivers.changes | 7 +++++++ Mesa-drivers.spec | 10 +++++----- Mesa.changes | 7 +++++++ Mesa.spec | 10 +++++----- 4 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index b8c5014..04eec56 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 13 14:51:24 UTC 2018 - sndirsch@suse.com + +- disabled build of libwayland-egl for factory/sle16/Leap 16 now + being provided by Wayland itself and probably be removed from + Mesa soon; see also https://build.opensuse.org/request/show/613048 + ------------------------------------------------------------------- Thu Aug 2 20:13:36 UTC 2018 - mimi.vx@gmail.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 0dd3c40..0a2bd44 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -275,7 +275,7 @@ Provides: s2tc-devel = %{version} Obsoletes: s2tc-devel < %{version} Provides: libtxc_dxtn-devel = %{version} Obsoletes: libtxc_dxtn-devel < %{version} -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) Requires: libwayland-egl-devel %endif @@ -766,7 +766,7 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \ %endif %build -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) egl_platforms=x11,drm,wayland %else egl_platforms=x11,drm @@ -862,8 +862,8 @@ rm -rf %{buildroot}/%{_includedir}/GL rm %{buildroot}/%{_libdir}/libglapi.so* # in libwayland-egl1 -rm %{buildroot}/%{_libdir}/libwayland-egl.so* -rm %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc +rm -f %{buildroot}/%{_libdir}/libwayland-egl.so* +rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc # in Mesa-dri-devel rm %{buildroot}/%{_libdir}/pkgconfig/dri.pc @@ -1025,7 +1025,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libOSMesa.so %{_libdir}/pkgconfig/osmesa.pc -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) %files -n libwayland-egl1 %{_libdir}/libwayland-egl.so.1* diff --git a/Mesa.changes b/Mesa.changes index b8c5014..04eec56 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 13 14:51:24 UTC 2018 - sndirsch@suse.com + +- disabled build of libwayland-egl for factory/sle16/Leap 16 now + being provided by Wayland itself and probably be removed from + Mesa soon; see also https://build.opensuse.org/request/show/613048 + ------------------------------------------------------------------- Thu Aug 2 20:13:36 UTC 2018 - mimi.vx@gmail.com diff --git a/Mesa.spec b/Mesa.spec index 3ed2e4a..f876c64 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -274,7 +274,7 @@ Provides: s2tc-devel = %{version} Obsoletes: s2tc-devel < %{version} Provides: libtxc_dxtn-devel = %{version} Obsoletes: libtxc_dxtn-devel < %{version} -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) Requires: libwayland-egl-devel %endif @@ -765,7 +765,7 @@ grep -v -i vulkan "%{_sourcedir}/baselibs.conf" >"%{_sourcedir}/temp" && \ %endif %build -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) egl_platforms=x11,drm,wayland %else egl_platforms=x11,drm @@ -861,8 +861,8 @@ rm -rf %{buildroot}/%{_includedir}/GL rm %{buildroot}/%{_libdir}/libglapi.so* # in libwayland-egl1 -rm %{buildroot}/%{_libdir}/libwayland-egl.so* -rm %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc +rm -f %{buildroot}/%{_libdir}/libwayland-egl.so* +rm -f %{buildroot}/%{_libdir}/pkgconfig/wayland-egl.pc # in Mesa-dri-devel rm %{buildroot}/%{_libdir}/pkgconfig/dri.pc @@ -1024,7 +1024,7 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %{_libdir}/libOSMesa.so %{_libdir}/pkgconfig/osmesa.pc -%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) %files -n libwayland-egl1 %{_libdir}/libwayland-egl.so.1*