From 8f823d2c527d93cc83d009537d24ab2b73abf1bc Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 7 May 2018 19:57:25 +0200 Subject: [PATCH] wayland: avoid conflict with libwayland-egl/MesaLib-devel This just a temporary workaround: "libwayland-egl is now part of libwayland, and will presumably be removed from mesa in the not too distant future." See https://lists.freedesktop.org/archives/wayland-devel/2018-April/037767.html. --- srcpkgs/wayland/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wayland/template b/srcpkgs/wayland/template index aa91db6a392..e1a134ad51e 100644 --- a/srcpkgs/wayland/template +++ b/srcpkgs/wayland/template @@ -1,7 +1,7 @@ # Template file for 'wayland'. pkgname=wayland version=1.15.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-documentation --disable-static" hostmakedepends="automake flex libtool pkg-config" @@ -17,8 +17,10 @@ pre_configure() { autoreconf -fi } post_install() { - # avoid conflict with libGLs libwayland-egl - rm $DESTDIR/usr/lib/libwayland-egl.so.* + # avoid conflict with libGLs libwayland-egl/MesaLib-devel + rm -f ${DESTDIR}/usr/lib/libwayland-egl.so* + rm -f ${DESTDIR}/usr/lib/pkgconfig/wayland-egl.pc + vlicense COPYING } @@ -36,7 +38,8 @@ wayland-devel_package() { pkg_install() { vmove usr/bin vmove usr/include - vmove usr/share + vmove usr/share/aclocal + vmove usr/share/wayland vmove usr/lib/pkgconfig vmove "usr/lib/*.so" }