From 7148e81eb98665a7abc64f0dbb68d6b1fc69a2dba25afce3c5c42d361f020a05 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 11 Sep 2018 13:32:10 +0000 Subject: [PATCH] - get rid of libwayland-egl1/libwayland-egl-devel completely; also for older Leap versions OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=771 --- Mesa-drivers.changes | 6 ++++++ Mesa-drivers.spec | 36 ------------------------------------ Mesa.changes | 6 ++++++ Mesa.spec | 36 ------------------------------------ baselibs.conf | 8 -------- 5 files changed, 12 insertions(+), 80 deletions(-) diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes index 3841a05..613776b 100644 --- a/Mesa-drivers.changes +++ b/Mesa-drivers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 11 13:28:26 UTC 2018 - sndirsch@suse.com + +- get rid of libwayland-egl1/libwayland-egl-devel completely; also + for older Leap versions + ------------------------------------------------------------------- Mon Sep 10 13:29:24 UTC 2018 - sndirsch@suse.com diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec index 3654de3..16115d8 100644 --- a/Mesa-drivers.spec +++ b/Mesa-drivers.spec @@ -278,9 +278,6 @@ Provides: s2tc-devel = %{version} Obsoletes: s2tc-devel < %{version} Provides: libtxc_dxtn-devel = %{version} Obsoletes: libtxc_dxtn-devel < %{version} -%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) -Requires: libwayland-egl-devel -%endif %description devel Mesa is a 3-D graphics library with an API which is very similar to @@ -578,24 +575,6 @@ openwfd. This package provides the development environment for compiling programs against the GBM library. -%package -n libwayland-egl1 -Summary: Additional egl functions for wayland -Group: System/Libraries - -%description -n libwayland-egl1 -This package provides additional functions for egl-using programs -that run within the wayland framework. This allows for applications -that need not run full-screen and cooperate with a compositor. - -%package -n libwayland-egl-devel -Summary: Development files for libwayland-egl1 -Group: Development/Libraries/C and C++ -Requires: libwayland-egl1 = %{version} - -%description -n libwayland-egl-devel -This package is required to link wayland client applications to the EGL -implementation of Mesa. - %package -n Mesa-libd3d Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) @@ -852,11 +831,9 @@ 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 @@ -947,10 +924,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %postun libglapi0 -p /sbin/ldconfig -%post -n libwayland-egl1 -p /sbin/ldconfig - -%postun -n libwayland-egl1 -p /sbin/ldconfig - %post -n Mesa-libd3d -p /sbin/ldconfig %postun -n Mesa-libd3d -p /sbin/ldconfig @@ -1035,15 +1008,6 @@ 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} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) -%files -n libwayland-egl1 -%{_libdir}/libwayland-egl.so.1* - -%files -n libwayland-egl-devel -%{_libdir}/libwayland-egl.so -%{_libdir}/pkgconfig/wayland-egl.pc -%endif - %files -n libgbm1 %{_libdir}/libgbm.so.1* diff --git a/Mesa.changes b/Mesa.changes index 3841a05..613776b 100644 --- a/Mesa.changes +++ b/Mesa.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 11 13:28:26 UTC 2018 - sndirsch@suse.com + +- get rid of libwayland-egl1/libwayland-egl-devel completely; also + for older Leap versions + ------------------------------------------------------------------- Mon Sep 10 13:29:24 UTC 2018 - sndirsch@suse.com diff --git a/Mesa.spec b/Mesa.spec index bac8e57..d67d17a 100644 --- a/Mesa.spec +++ b/Mesa.spec @@ -277,9 +277,6 @@ Provides: s2tc-devel = %{version} Obsoletes: s2tc-devel < %{version} Provides: libtxc_dxtn-devel = %{version} Obsoletes: libtxc_dxtn-devel < %{version} -%if 0%{?suse_version} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) -Requires: libwayland-egl-devel -%endif %description devel Mesa is a 3-D graphics library with an API which is very similar to @@ -577,24 +574,6 @@ openwfd. This package provides the development environment for compiling programs against the GBM library. -%package -n libwayland-egl1 -Summary: Additional egl functions for wayland -Group: System/Libraries - -%description -n libwayland-egl1 -This package provides additional functions for egl-using programs -that run within the wayland framework. This allows for applications -that need not run full-screen and cooperate with a compositor. - -%package -n libwayland-egl-devel -Summary: Development files for libwayland-egl1 -Group: Development/Libraries/C and C++ -Requires: libwayland-egl1 = %{version} - -%description -n libwayland-egl-devel -This package is required to link wayland client applications to the EGL -implementation of Mesa. - %package -n Mesa-libd3d Summary: Mesa Direct3D9 state tracker # Manually provide d3d library (bnc#918294) @@ -851,11 +830,9 @@ 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 @@ -946,10 +923,6 @@ echo "The \"Mesa\" package does not have the ability to render, but is supplemen %postun libglapi0 -p /sbin/ldconfig -%post -n libwayland-egl1 -p /sbin/ldconfig - -%postun -n libwayland-egl1 -p /sbin/ldconfig - %post -n Mesa-libd3d -p /sbin/ldconfig %postun -n Mesa-libd3d -p /sbin/ldconfig @@ -1034,15 +1007,6 @@ 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} < 1550 && (0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse})) -%files -n libwayland-egl1 -%{_libdir}/libwayland-egl.so.1* - -%files -n libwayland-egl-devel -%{_libdir}/libwayland-egl.so -%{_libdir}/pkgconfig/wayland-egl.pc -%endif - %files -n libgbm1 %{_libdir}/libgbm.so.1* diff --git a/baselibs.conf b/baselibs.conf index 7f07edd..f90a933 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -23,7 +23,6 @@ Mesa-devel requires "Mesa-libglapi-devel- = " requires "libOSMesa-devel- = " requires "libgbm-devel- = " - requires "libwayland-egl-devel- = " requires "libglvnd-devel- >= 0.1.0" obsoletes "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" provides "XFree86-Mesa-devel- xorg-x11-Mesa-devel-" @@ -63,12 +62,6 @@ libOSMesa-devel libgbm1 libgbm-devel requires "libgbm1- = " -libwayland-egl-devel - targetarch aarch64 requires "libwayland-egl1- = " - targetarch ppc64 requires "libwayland-egl1- = " - targetarch ppc64le requires "libwayland-egl1- = " - targetarch s390x requires "libwayland-egl1- = " - targetarch x86_64 requires "libwayland-egl1- = " Mesa-libglapi0 Mesa-libglapi-devel requires "Mesa-libglapi0- = " @@ -105,7 +98,6 @@ libvdpau_nouveau libvdpau_r300 libvdpau_r600 libvdpau_radeonsi -libwayland-egl1 Mesa-dri-vc4 Mesa-dri-nouveau Mesa-dri