From d6691877a9987c23e9f23a058add3e2f31041ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 24 Jul 2020 00:03:29 -0300 Subject: [PATCH] wlroots: provide all dependencies in wlroots-devel. These dependencies are all required when building applications that use wlroots, so it doesn't make sense to include them individually into each application's template. Also remove libcap, which was dropped by upstream. --- srcpkgs/wlroots/template | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/srcpkgs/wlroots/template b/srcpkgs/wlroots/template index 5a171277978..8968bba8cef 100644 --- a/srcpkgs/wlroots/template +++ b/srcpkgs/wlroots/template @@ -1,17 +1,18 @@ # Template file for 'wlroots' pkgname=wlroots version=0.11.0 -revision=1 +revision=2 build_style=meson -configure_args="-Dlibcap=enabled -Dlogind=enabled -Dlogind-provider=elogind +configure_args="-Dlogind=enabled -Dlogind-provider=elogind -Dxcb-errors=enabled -Dxcb-icccm=enabled -Dxwayland=enabled -Dx11-backend=enabled -Dexamples=false" hostmakedepends="pkg-config wayland-devel" -makedepends="elogind-devel libcap-devel wayland-devel wayland-protocols - MesaLib-devel libinput-devel libxkbcommon-devel libdrm-devel pixman-devel +_devel_depends="MesaLib-devel elogind-devel eudev-libudev-devel libdrm-devel + libinput-devel libxkbcommon-devel pixman-devel wayland-devel wayland-protocols + xcb-util-errors-devel xcb-util-wm-devel" +makedepends="${_devel_depends} libxcb-devel xcb-util-cursor-devel xcb-util-devel xcb-util-image-devel - xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-wm-devel - xcb-util-errors-devel xcb-util-xrm-devel" + xcb-util-keysyms-devel xcb-util-renderutil-devel xcb-util-xrm-devel" short_desc="Modular Wayland compositor library" maintainer="Isaac Freund " license="MIT" @@ -24,9 +25,7 @@ post_install() { } wlroots-devel_package() { - depends="MesaLib-devel elogind-devel eudev-libudev-devel libcap-devel - libdrm-devel libinput-devel libxkbcommon-devel pixman-devel wayland-devel - wayland-protocols wlroots-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} ${_devel_depends}" short_desc+=" - development files" pkg_install() { vmove usr/include