From 3a38a5d9da46eca9d656aa0ec448c8ba6034b044 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 17 Dec 2023 20:58:02 +0000
Subject: gentoo auto-resync : 17:12:2023 - 20:58:01
---
gui-wm/Manifest.gz | Bin 1213 -> 1214 bytes
gui-wm/wayfire/Manifest | 4 +-
gui-wm/wayfire/wayfire-0.8.0.ebuild | 158 ++++++++++++++++++++++++++++++++++++
gui-wm/wayfire/wayfire-9999.ebuild | 118 ++++++++++++++++++---------
4 files changed, 241 insertions(+), 39 deletions(-)
create mode 100644 gui-wm/wayfire/wayfire-0.8.0.ebuild
(limited to 'gui-wm')
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 397e1f926995..5a6beed3f28a 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index bcb0201dfd6a..53d7487a0ca0 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -3,8 +3,10 @@ AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143
AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
DIST wayfire-0.7.3.tar.xz 765524 BLAKE2B b82c66796d7fb3d07c7bd9078755b7c38df1bd5c93daa659fc98b1182679bc0a06a24b322c6ab492d06d30c898659e2ba849c1d5944260e8775a04fd8a5bd078 SHA512 7bb5b8492a632a9816e847ec72def74dc234bcc30da7c320a0cd3b1d60492f5521ad8ac76a12ef967d1b114bcde9be72eb8ffc618977aed8e198d4ace1e7056e
DIST wayfire-0.7.5.tar.xz 781952 BLAKE2B 10f4927d793ad2f8047ab5608db72bb5988fbb4df805dc65a87b011453729109ca0b3a92cf89e867266fae52268e1e2ac452bbd6efcc81e8f1a0c0640008adc1 SHA512 fce6d4c81fa3675df1e656f8bf504f7fc9d1b7104687bcc6d669950582f46bd0ad084c6a487434077df029438243cd91cf6ec60dc7d584b40bfd7a4c8d069f53
+DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1d4444fdc8b1b898d998a9
EBUILD wayfire-0.7.3-r3.ebuild 2553 BLAKE2B b7d8caa0ef5e425ba5f4ffeef1f7dec8c39fbc2f6ef5aff0989f1aeac93c404550ba8d19e48e288fdfb683e89e982018718afab3b5ca68e0bce45217bea714bf SHA512 988f82606f448bac536e0e6633a0a23dbc513351a84df1fb81e1deb8298b9f0738ef559c15997693c7a93699198eeaf1904feff570b8e73a4e1a7d008aa7ff3f
EBUILD wayfire-0.7.5-r1.ebuild 2929 BLAKE2B 5c68c962d70e318ca9595cc02a0599ce46af04b38a2117214748d5bb0ff05237cafe1bd02651d9bb1acdf7673ab3313ada4e64c9b312783bec8d8eb6da237979 SHA512 d79143cd9d9eefe9c10abcdb2c64dd33937c383695579474a256cdcf8f53692a79e9b7978d05263b815802416277c43aeb7667adcb72c076c7ea7b3942406fc1
EBUILD wayfire-0.7.5.ebuild 2867 BLAKE2B 81430a506b622bae32fea72f539f050d4a7a7115bb7d59917f33d48d69df65ef2d4e300d41b15f6cb42bbe5da5041c4fce400e6301df85d58e9642e4571fd6dc SHA512 c2a462229304f179b9edf240b2ffb47a009c8b0ae22062718b0cdb8c4a7cb7fb45e00118c6e64d7855e57b553aed4255dad0da05d7f86d59adb791d9a684349a
-EBUILD wayfire-9999.ebuild 2878 BLAKE2B d738a8395b21ba06afaaa29fa3878a82e8592665ff633b7931b27b3153bde4c7a12c2f879ad7e60a7b568c815d94292effa74fc974d3463b2cd54f147a3b644e SHA512 f1274c4816ff843d7b03a94a64e430c360061e7f3b631346f6ef75f8bfb85a3b816910e2ec00e5fcd7159553498b4ad4e5679cb83bcdd1643347a116a9ab7f76
+EBUILD wayfire-0.8.0.ebuild 3861 BLAKE2B e1f3129712054c4eda8b2c212405cedff674c611c674d98f32eaf08049b9fecc77a796f9102af00571f288c3722fe322af4c1647d536fc56eb77e34477d50979 SHA512 0327579ec991d525cfd224ba7feaa779d0560ce4c2a9adad2ab20c941bf34e742ea6a319976b5a28fb343bfa626b185999c28928fac8db34955d0f6076db6941
+EBUILD wayfire-9999.ebuild 3883 BLAKE2B 8907f853664522bbc0ebab3c789801444f6c35306ed2e04628fe45be5ecce049e5cce6da3942ff71b79896eca6b5aab4b4c96981f757f160736da3e9f0dc4d04 SHA512 cf6c71c477e4bb0163beae77cef53d4f5e5fcae4703a8ce8acca5ff626cbfbed680f57050fd6772610807b02bae4aaf10076ca8ea1c0be9467a830fcb85c349d
MISC metadata.xml 920 BLAKE2B 0b0ad723f8383bc65a87cbab8b7195d33a3dabd9ea73c8c2f91957151b9f324e63ea4b25c480d44eba391f595ffe3a9d0c39800eaa9bf4b81b47cb8e3262222f SHA512 c0eb23bcfc87b274bcb2c96b0e52cb91fb6dd3ffb51ef4285f34af3a9861122c0d30179c5989070de85ebcd0dff282906bb4c15c4983bfdce123c5c3b101561e
diff --git a/gui-wm/wayfire/wayfire-0.8.0.ebuild b/gui-wm/wayfire/wayfire-0.8.0.ebuild
new file mode 100644
index 000000000000..e732574d1134
--- /dev/null
+++ b/gui-wm/wayfire/wayfire-0.8.0.ebuild
@@ -0,0 +1,158 @@
+# Copyright 2019-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson toolchain-funcs
+
+DESCRIPTION="compiz like 3D wayland compositor"
+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"
+else
+ SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+ SLOT="0/$(ver_cut 1-2)"
+fi
+
+LICENSE="MIT"
+IUSE="debug +gles +system-wfconfig +system-wlroots 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.21
+ 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.28
+"
+WLROOTS_BDEPEND="
+ dev-util/glslang
+ dev-util/wayland-scanner
+"
+
+CDEPEND="
+ dev-cpp/nlohmann_json
+ dev-libs/libevdev
+ >=dev-libs/libinput-1.7.0
+ dev-libs/wayland
+ >=dev-libs/wayland-protocols-1.12
+ media-libs/glm
+ media-libs/libglvnd
+ 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} )
+"
+
+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
+
+ 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)
+ $(usex debug --buildtype=debug "")
+ $(usex debug -Db_sanitize=address,undefined "")
+ )
+
+ # Clang will fail to link without this
+ tc-is-clang && emesonargs+=( $(usex debug -Db_lundef=false "") )
+
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ dobin "${T}"/wayfire-session
+
+ insinto "/usr/share/wayland-sessions/"
+ insopts -m644
+ doins wayfire.desktop
+ doins "${T}"/wayfire-session.desktop
+
+ insinto "/usr/share/wayfire/"
+ doins wayfire.ini
+}
+
+pkg_postinst() {
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog "Wayfire has been installed but the session cannot be used"
+ elog "until you install a configuration file. The default config"
+ elog "file is installed at \"/usr/share/wayfire/wayfire.ini\""
+ elog "To install the file execute"
+ elog "\$ cp /usr/share/wayfire/wayfire.ini ~/.config/wayfire.ini"
+ fi
+}
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 9ff84a6351ce..98fb0ebc32f0 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -11,76 +11,118 @@ 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"
else
SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+ SLOT="0/$(ver_cut 1-2)"
fi
LICENSE="MIT"
-SLOT="0"
-IUSE="debug +gles +system-wfconfig +system-wlroots X"
+IUSE="debug +gles +system-wfconfig +system-wlroots 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
+"
-DEPEND="
- dev-libs/libinput:=
+CDEPEND="
+ dev-cpp/nlohmann_json
+ dev-libs/libevdev
+ >=dev-libs/libinput-1.7.0
dev-libs/wayland
- gui-libs/gtk-layer-shell
+ >=dev-libs/wayland-protocols-1.12
media-libs/glm
- media-libs/mesa:=[gles2,wayland,X?]
- media-libs/libglvnd[X?]
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/freetype:=[X?]
+ media-libs/libglvnd
+ media-libs/libjpeg-turbo
+ media-libs/libpng
+ x11-libs/cairo
x11-libs/libdrm
- x11-libs/gtk+:3=[wayland,X?]
- x11-libs/cairo[X?,svg(+)]
- x11-libs/libxkbcommon[X?]
+ x11-libs/libxkbcommon
x11-libs/pango
x11-libs/pixman
- X? (
- x11-base/xwayland
- x11-libs/libxcb
- )
+ system-wfconfig? ( gui-libs/wf-config:${SLOT} )
+ !system-wfconfig? ( dev-libs/libxml2 )
+ !system-wlroots? ( ${WLROOTS_CDEPEND} )
"
if [[ ${PV} == 9999 ]] ; then
- DEPEND+="
- system-wfconfig? ( ~gui-libs/wf-config-9999:= )
- !system-wfconfig? ( !gui-libs/wf-config )
- system-wlroots? ( ~gui-libs/wlroots-9999:=[drm(+),libinput(+),x11-backend,X?] )
- !system-wlroots? ( !gui-libs/wlroots )
+ CDEPEND+="
+ system-wlroots? ( gui-libs/wlroots:0/9999[drm(+),libinput(+),x11-backend,X?] )
"
else
- DEPEND+="
- system-wfconfig? (
- >=gui-libs/wf-config-0.7.1
- <gui-libs/wf-config-0.8.0
- )
- !system-wfconfig? ( !gui-libs/wf-config )
- system-wlroots? (
- >=gui-libs/wlroots-0.16.0:0/16[drm(+),libinput(+),x11-backend,X?]
- )
- !system-wlroots? ( !gui-libs/wlroots )
+ CDEPEND+="
+ system-wlroots? ( gui-libs/wlroots:0/16[drm(+),libinput(+),x11-backend,X?] )
"
fi
RDEPEND="
- ${DEPEND}
+ ${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-libs/wayland-protocols
+ dev-util/wayland-scanner
virtual/pkgconfig
+ !system-wlroots? ( ${WLROOTS_BDEPEND} )
"
-src_configure() {
+src_prepare() {
+ eapply_user
+
sed -e "s:@EPREFIX@:${EPREFIX}:" \
- "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+ "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
sed -e "s:@EPREFIX@:${EPREFIX}:" \
- "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
+ "${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)
$(usex debug --buildtype=debug "")
--
cgit v1.2.3