From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Clean up wlroots build
Date: Tue, 28 Jul 2020 15:39:31 +0200 [thread overview]
Message-ID: <20200728133931.PxB1BUteSEjcS87tbkpfNg6LPnG46M-w-pWb_8Q83NI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-23793@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 718 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages wlroots
https://github.com/void-linux/void-packages/pull/23793
Clean up wlroots build
Include all dependencies needed for building wlroots based applications into `wlroots-devel`. If they aren't included, `meson` complains about missing deps. Clean up templates accordingly.
I am only revbumping the packages that actually change, so wlroots and wf-config. The rest are unchanged, because it's only how the dependencies are pulled in that changes.
I guess @ifreund @ahesford @travankor
A patch file from https://github.com/void-linux/void-packages/pull/23793.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wlroots-23793.patch --]
[-- Type: text/x-diff, Size: 9325 bytes --]
From 6e9e8e64577d5c1dbc8b22d45248b54337440342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:03:29 -0300
Subject: [PATCH 1/7] 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 <ifreund@ifreund.xyz>"
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
From f0503e925b2f67ab170929dde605d1dbe0d7f61a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:05:24 -0300
Subject: [PATCH 2/7] sway: clean up makedepends.
---
srcpkgs/sway/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/sway/template b/srcpkgs/sway/template
index 6e191ba70e5..af50ab91379 100644
--- a/srcpkgs/sway/template
+++ b/srcpkgs/sway/template
@@ -5,9 +5,8 @@ revision=2
build_style=meson
conf_files="/etc/sway/config"
hostmakedepends="pkg-config wayland-devel scdoc git"
-makedepends="xcb-util-wm-devel xcb-util-errors-devel wlroots-devel
- wayland-devel wayland-protocols pcre-devel
- json-c-devel pango-devel cairo-devel gdk-pixbuf-devel"
+makedepends="wlroots-devel pcre-devel json-c-devel pango-devel cairo-devel
+ gdk-pixbuf-devel"
depends="swaybg xorg-server-xwayland $(vopt_if elogind elogind)"
short_desc="Tiling Wayland compositor compatible with i3"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From 6702148e93fb80fbd433297f6bc8efff822c3876 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:05:47 -0300
Subject: [PATCH 3/7] hikari: update to 2.1.1, clean up makedepends.
Removed the dependencies provided by wlroots, removed libevdev-devel,
which isn't required, and put wayland-devel unconditionally in
hostmakedepends, to follow the pattern of the other templates.
---
srcpkgs/hikari/template | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/srcpkgs/hikari/template b/srcpkgs/hikari/template
index 754f052de2f..4d71b69622b 100644
--- a/srcpkgs/hikari/template
+++ b/srcpkgs/hikari/template
@@ -1,6 +1,6 @@
# Template file for 'hikari'
pkgname=hikari
-version=2.1.0
+version=2.1.1
revision=1
build_style=gnu-makefile
make_cmd=bmake
@@ -8,24 +8,17 @@ make_use_env=yes
make_build_args="WITH_POSIX_C_SOURCE=YES WITH_XWAYLAND=YES
WITH_SCREENCOPY=YES WITH_GAMMACONTROL=YES WITH_LAYERSHELL=YES ETC_PREFIX="
make_install_args="ETC_PREFIX="
-hostmakedepends="bmake pkg-config"
-makedepends="wlroots-devel pango-devel cairo-devel pam-devel glib-devel
- libinput-devel xcb-util-errors-devel xcb-util-wm-devel libucl-devel
- libxkbcommon-devel pixman-devel libevdev-devel"
+hostmakedepends="bmake pkg-config wayland-devel"
+makedepends="wlroots-devel pango-devel cairo-devel pam-devel glib-devel libucl-devel"
short_desc="Stacking Wayland compositor with tiling features"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-2-Clause"
homepage="https://hikari.acmelabs.space"
changelog="https://hub.darcs.net/raichoo/hikari/browse/CHANGELOG.md"
distfiles="${homepage}/releases/${pkgname}-${version}.tar.gz"
-checksum=6a1f14a73119b227b7d2c364c0627aade2630b080fe730bb11e9854d3408b59b
+checksum=ab75c4563aa57ae3f207b05cbb6e023cad9fd2f96cabafa1b16ed7eaf22f546d
conf_files="/etc/pam.d/hikari-unlocker /etc/hikari/hikari.conf"
-if [ "$CROSS_BUILD" ]; then
- # Makefile executes wayland-scanner
- hostmakedepends+=" wayland-devel"
-fi
-
pre_build() {
# The hikari Makefile appends to the CFLAGS and LDFLAGS variables;
# bmake ignores these appends altogether when passing variables on the
From d79b4dfbf6c8ecbb5b37cc28973a308bc18d9d47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:06:55 -0300
Subject: [PATCH 4/7] cage: clean up makedepends.
---
srcpkgs/cage/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cage/template b/srcpkgs/cage/template
index 76ba731cc58..2857720b73f 100644
--- a/srcpkgs/cage/template
+++ b/srcpkgs/cage/template
@@ -4,7 +4,7 @@ version=0.1.2.1
revision=1
build_style=meson
hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="xcb-util-wm-devel xcb-util-errors-devel libxkbcommon-devel pixman-devel wayland-devel wlroots-devel"
+makedepends="wlroots-devel"
short_desc="Kiosk compositor for Wayland"
maintainer="Illia Shestakov <ishestakov@airmail.cc>"
license="MIT"
From e9a8cb7021a29d8620a7f7e44ebe49e8a72eeaee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:12:36 -0300
Subject: [PATCH 5/7] wf-config: include correct devel deps.
---
srcpkgs/wf-config/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wf-config/template b/srcpkgs/wf-config/template
index 0da874c532a..075f283d6a4 100644
--- a/srcpkgs/wf-config/template
+++ b/srcpkgs/wf-config/template
@@ -1,7 +1,7 @@
# Template file for 'wf-config'
pkgname=wf-config
version=0.4.0
-revision=3
+revision=4
build_style=meson
hostmakedepends="pkg-config"
makedepends="glm libevdev-devel libxml2-devel"
@@ -17,8 +17,7 @@ post_install() {
}
wf-config-devel_package() {
- depends="libevdev-devel wlroots-devel libxml2-devel
- ${sourcepkg}>=${version}_${revision}"
+ depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
From 13e9e47b55701a98bb563c810b844ef1bfcea40c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:13:48 -0300
Subject: [PATCH 6/7] wayfire: clean up makedepends.
---
srcpkgs/wayfire/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/wayfire/template b/srcpkgs/wayfire/template
index ee4f3199a00..df2b9d9db8f 100644
--- a/srcpkgs/wayfire/template
+++ b/srcpkgs/wayfire/template
@@ -4,8 +4,7 @@ version=0.4.0
revision=3
build_style=meson
hostmakedepends="pkg-config wayland-devel"
-makedepends="xcb-util-wm-devel xcb-util-errors-devel glm cairo-devel
- wf-config-devel wlroots-devel"
+makedepends="cairo-devel wf-config-devel wlroots-devel"
depends="xorg-server-xwayland"
short_desc="3D wayland compositor"
maintainer="Young Jin Park <youngjinpark20@gmail.com>"
From f2bb02d0bfe9e6ffb18565e437a7376a5d78ddf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 24 Jul 2020 00:37:03 -0300
Subject: [PATCH 7/7] wf-shell: clean up makedepends.
---
srcpkgs/wf-shell/template | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/wf-shell/template b/srcpkgs/wf-shell/template
index af62c3c5207..d5568edf252 100644
--- a/srcpkgs/wf-shell/template
+++ b/srcpkgs/wf-shell/template
@@ -5,10 +5,8 @@ revision=3
build_style=meson
build_helper="gir"
hostmakedepends="gobject-introspection pkg-config wayland-devel"
-makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel
- gtk+3-devel libevdev-devel wlroots-devel wf-config-devel
- xcb-util-errors-devel xcb-util-wm-devel gtk-layer-shell-devel
- glm wayfire"
+makedepends="alsa-lib-devel pulseaudio-devel gtkmm-devel wayfire
+ gtk+3-devel wlroots-devel wf-config-devel gtk-layer-shell-devel"
short_desc="Wayfire shell with GTK-based panel and background client"
maintainer="Young Jin Park <youngjinpark20@gmail.com>"
license="MIT"
next prev parent reply other threads:[~2020-07-28 13:39 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-24 3:16 [PR PATCH] " ericonr
2020-07-24 3:37 ` [PR PATCH] [Updated] " ericonr
2020-07-24 4:00 ` ericonr
2020-07-24 4:05 ` [PR PATCH] [Updated] " ericonr
2020-07-24 4:14 ` [PR REVIEW] " ahesford
2020-07-24 4:16 ` ericonr
2020-07-24 4:17 ` [PR PATCH] [Updated] " ericonr
2020-07-24 13:03 ` ericonr
2020-07-27 10:52 ` [PR REVIEW] " travankor
2020-07-27 10:52 ` travankor
2020-07-27 11:09 ` [PR REVIEW] " ifreund
2020-07-27 11:14 ` ifreund
2020-07-27 12:29 ` [PR REVIEW] " ericonr
2020-07-27 12:32 ` [PR PATCH] [Updated] " ericonr
2020-07-27 12:32 ` [PR REVIEW] " ericonr
2020-07-27 17:26 ` ericonr
2020-07-27 18:59 ` ericonr
2020-07-28 13:30 ` ahesford
2020-07-28 13:39 ` ericonr [this message]
2020-08-04 15:52 ` [PR PATCH] [Updated] " ericonr
2020-08-04 15:53 ` ericonr
2020-08-04 15:53 ` ericonr
2020-08-04 16:17 ` [PR REVIEW] " ahesford
2020-08-04 16:17 ` ahesford
2020-08-04 16:17 ` ahesford
2020-08-04 16:58 ` ericonr
2020-08-04 16:58 ` [PR PATCH] [Updated] " ericonr
2020-08-04 17:17 ` ericonr
2020-08-04 17:35 ` ericonr
2020-08-04 17:50 ` ericonr
2020-08-04 17:51 ` ericonr
2020-08-04 19:33 ` ericonr
2020-08-04 20:17 ` ericonr
2020-08-04 20:23 ` ericonr
2020-08-04 20:36 ` [PR PATCH] [Updated] " ericonr
2020-08-04 21:05 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200728133931.PxB1BUteSEjcS87tbkpfNg6LPnG46M-w-pWb_8Q83NI@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).