From: "Arthur Zamarin" <arthurzam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/
Date: Sat, 16 Mar 2024 19:24:44 +0000 (UTC) [thread overview]
Message-ID: <1710616689.49e20c85ca4aada2f761df4c74cc7b2087d49b45.arthurzam@gentoo> (raw)
commit: 49e20c85ca4aada2f761df4c74cc7b2087d49b45
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Thu Mar 14 11:37:48 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 19:18:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e20c85
gui-wm/wayfire: update live ebuild
* Remove system-wfconfig and system-wlroots use flags, the default will
be to use system wf-config and system wlroots. Now that upstream is more
active and targets specific wlroots major releases the point of
system-wlroots has gone. wf-config has the same upstream so using a
bundled version doesn't have much rationale.
* Remove dependency on wlroots-9999 and instead require a specific major
release of wlroots that could be updated as seen fit.
Closes: https://bugs.gentoo.org/916431
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
gui-wm/wayfire/wayfire-9999.ebuild | 79 ++++++++------------------------------
1 file changed, 15 insertions(+), 64 deletions(-)
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index d1cadbe72df8..0666f1cd607d 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -11,120 +11,71 @@ HOMEPAGE="https://github.com/WayfireWM/wayfire"
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/WayfireWM/${PN}.git"
- SLOT="0/9999"
+ SLOT="0/0.9"
else
SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+ KEYWORDS="~amd64 ~arm64 ~riscv"
SLOT="0/$(ver_cut 1-2)"
fi
LICENSE="MIT"
-IUSE="+gles +system-wfconfig +system-wlroots test X"
+IUSE="+gles test X"
RESTRICT="!test? ( test )"
# bundled wlroots has the following dependency string according to included headers.
# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
# enable x11-backend with X and vice versa
-WLROOTS_CDEPEND="
- >=dev-libs/libinput-1.14.0:=
- >=dev-libs/wayland-1.22
- media-libs/libdisplay-info
- media-libs/libglvnd
- media-libs/mesa[egl(+),gles2]
- sys-apps/hwdata:=
- sys-auth/seatd:=
- >=x11-libs/libdrm-2.4.114:=
- x11-libs/libxkbcommon
- >=x11-libs/pixman-0.42.0
- virtual/libudev
- X? (
- x11-base/xwayland
- x11-libs/libxcb:0=
- x11-libs/xcb-util-image
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
-"
-WLROOTS_DEPEND="
- >=dev-libs/wayland-protocols-1.32
-"
-WLROOTS_BDEPEND="
- dev-util/glslang
- dev-util/wayland-scanner
-"
-
CDEPEND="
dev-cpp/nlohmann_json
+ dev-libs/glib:2
dev-libs/libevdev
- >=dev-libs/libinput-1.7.0
+ >=dev-libs/libinput-1.7.0:=
dev-libs/wayland
>=dev-libs/wayland-protocols-1.12
+ gui-libs/wf-config:${SLOT}
+ gui-libs/wlroots:0/17[drm(+),libinput(+),x11-backend,X?]
media-libs/glm
media-libs/libglvnd
- media-libs/libjpeg-turbo
- media-libs/libpng
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
x11-libs/cairo
- x11-libs/libdrm
x11-libs/libxkbcommon
x11-libs/pango
x11-libs/pixman
- system-wfconfig? ( gui-libs/wf-config:${SLOT} )
- !system-wfconfig? ( dev-libs/libxml2 )
- !system-wlroots? ( ${WLROOTS_CDEPEND} )
+ X? (
+ x11-libs/libxcb:=
+ )
"
-if [[ ${PV} == 9999 ]] ; then
- CDEPEND+="
- system-wlroots? ( gui-libs/wlroots:0/9999[drm(+),libinput(+),x11-backend,X?] )
- "
-else
- CDEPEND+="
- system-wlroots? ( gui-libs/wlroots:0/16[drm(+),libinput(+),x11-backend,X?] )
- "
-fi
-
RDEPEND="
${CDEPEND}
x11-misc/xkeyboard-config
- !system-wfconfig? ( !gui-libs/wf-config )
- !system-wlroots? ( !gui-libs/wlroots )
"
DEPEND="
${CDEPEND}
- !system-wlroots? ( ${WLROOTS_DEPEND} )
test? ( dev-cpp/doctest )
"
BDEPEND="
dev-util/wayland-scanner
virtual/pkgconfig
- !system-wlroots? ( ${WLROOTS_BDEPEND} )
"
src_prepare() {
- eapply_user
+ default
sed -e "s:@EPREFIX@:${EPREFIX}:" \
"${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
sed -e "s:@EPREFIX@:${EPREFIX}:" \
"${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
-
- if [[ "${PV}" != 9999 ]]; then
- # Don't run git if git is installed and its not a git dir
- sed -i \
- -e "/git = find_program/ifs = import\('fs'\)" \
- -e "s/if git.found()/if git.found() and fs.is_dir('.git')/" \
- meson.build || die
- fi
-
}
src_configure() {
local emesonargs=(
- $(meson_feature system-wfconfig use_system_wfconfig)
- $(meson_feature system-wlroots use_system_wlroots)
$(meson_feature test tests)
$(meson_feature X xwayland)
$(meson_use gles enable_gles32)
+ -Duse_system_wfconfig=enabled
+ -Duse_system_wlroots=enabled
)
meson_src_configure
next reply other threads:[~2024-03-16 19:24 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-16 19:24 Arthur Zamarin [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-02 8:28 [gentoo-commits] repo/gentoo:master commit in: gui-wm/wayfire/ Viorel Munteanu
2025-09-29 21:49 Sam James
2025-09-29 16:25 Arthur Zamarin
2025-08-31 10:23 Viorel Munteanu
2025-08-28 8:55 Viorel Munteanu
2025-08-28 8:55 Viorel Munteanu
2025-08-11 8:47 Sam James
2025-08-11 8:47 Sam James
2025-07-10 10:35 Viorel Munteanu
2025-05-05 18:04 Viorel Munteanu
2024-10-24 10:23 Sam James
2024-09-23 15:18 Viorel Munteanu
2024-08-24 17:06 Viorel Munteanu
2024-08-24 17:06 Viorel Munteanu
2024-06-05 7:00 Arthur Zamarin
2024-06-05 4:47 Viorel Munteanu
2024-05-23 16:10 Matt Turner
2024-05-05 18:27 Viorel Munteanu
2024-05-05 18:27 Viorel Munteanu
2024-04-24 14:41 Sam James
2024-03-19 10:06 Sam James
2024-03-16 19:24 Arthur Zamarin
2024-03-14 16:55 Arthur Zamarin
2024-01-30 13:50 Sam James
2024-01-21 5:04 Sam James
2024-01-19 13:55 Ben Kohler
2023-12-17 19:55 Arthur Zamarin
2023-12-01 20:02 Arthur Zamarin
2023-08-07 2:55 Sam James
2023-02-13 0:39 Sam James
2023-02-13 0:39 Sam James
2022-12-18 19:28 Arthur Zamarin
2022-10-08 18:25 Sam James
2022-07-20 21:06 Sam James
2022-07-10 21:54 Sam James
2021-11-10 7:50 Joonas Niilola
2021-11-10 7:50 Joonas Niilola
2021-09-18 14:42 Yixun Lan
2021-09-13 7:28 Joonas Niilola
2021-09-13 7:28 Joonas Niilola
2021-09-13 7:28 Joonas Niilola
2021-09-06 22:23 Sam James
2021-09-06 21:08 Sam James
2021-06-18 6:27 Agostino Sarubbo
2021-02-10 13:36 Joonas Niilola
2020-11-18 16:25 Sam James
2020-11-09 16:35 Aaron Bauman
2020-08-17 1:36 Aaron Bauman
2020-06-21 18:40 Andreas Sturmlechner
2020-06-07 0:12 Aaron Bauman
2020-05-17 15:55 Aaron Bauman
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=1710616689.49e20c85ca4aada2f761df4c74cc7b2087d49b45.arthurzam@gentoo \
--to=arthurzam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.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