From ff8e6a6a293246b8347378a446e8f3e68b449e29 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Wed, 7 Oct 2020 19:02:50 +0300 Subject: [PATCH 1/2] Disable examples to avoid needing ffmpeg as makedepends, remove libcap --- .SRCINFO | 7 +++---- PKGBUILD | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index dafdbb7..5d180c8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = wlroots-git pkgdesc = Modular Wayland compositor library - pkgver = 0.9.1.r7.g6d3f3b93 - pkgrel = 2 + pkgver = 0.11.0.r46.g87836dcb + pkgrel = 1 url = https://github.com/swaywm/wlroots arch = x86_64 license = custom:MIT @@ -10,7 +10,6 @@ pkgbase = wlroots-git makedepends = git makedepends = wayland-protocols makedepends = xorgproto - depends = libcap depends = systemd depends = wayland depends = opengl-driver @@ -20,7 +19,7 @@ pkgbase = wlroots-git depends = pixman depends = libinput depends = libxkbcommon - provides = wlroots=0.9.1 + provides = wlroots=0.11.0 conflicts = wlroots options = debug source = wlroots-git::git+https://github.com/swaywm/wlroots diff --git a/PKGBUILD b/PKGBUILD index 7ecd89d..39112c2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Adrian Perez de Castro pkgname=wlroots-git -pkgver=0.9.1.r7.g6d3f3b93 -pkgrel=2 +pkgver=0.11.0.r46.g87836dcb +pkgrel=1 license=(custom:MIT) pkgdesc='Modular Wayland compositor library' url=https://github.com/swaywm/wlroots @@ -9,7 +9,7 @@ arch=(x86_64) provides=("wlroots=${pkgver%%.r*}") conflicts=(wlroots) options=(debug) -depends=(libcap systemd wayland opengl-driver libxcb xcb-util-errors +depends=(systemd wayland opengl-driver libxcb xcb-util-errors xcb-util-wm pixman libinput libxkbcommon) makedepends=(meson ninja git wayland-protocols xorgproto) source=("${pkgname}::git+${url}") @@ -38,7 +38,7 @@ build () { -Dxcb-icccm=enabled \ -Dxwayland=enabled \ -Dx11-backend=enabled \ - -Dexamples=true + -Dexamples=false ninja -C build } From 95f8a9215a2adcdeccaebbc7af6ad90c0ee7e5fb Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Sat, 31 Oct 2020 01:21:26 +0200 Subject: [PATCH 2/2] Do not pass -Dlibcap option to Meson --- .SRCINFO | 2 +- PKGBUILD | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5d180c8..66c460e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = wlroots-git pkgdesc = Modular Wayland compositor library - pkgver = 0.11.0.r46.g87836dcb + pkgver = 0.11.0.r71.g85757665 pkgrel = 1 url = https://github.com/swaywm/wlroots arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index 39112c2..090d32f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Adrian Perez de Castro pkgname=wlroots-git -pkgver=0.11.0.r46.g87836dcb +pkgver=0.11.0.r71.g85757665 pkgrel=1 license=(custom:MIT) pkgdesc='Modular Wayland compositor library' @@ -31,7 +31,6 @@ build () { meson build \ --prefix /usr \ --buildtype debug \ - -Dlibcap=enabled \ -Dlogind=enabled \ -Dlogind-provider=systemd \ -Dxcb-errors=enabled \