summaryrefslogtreecommitdiff
path: root/gui-wm
diff options
context:
space:
mode:
Diffstat (limited to 'gui-wm')
-rw-r--r--gui-wm/Manifest.gzbin1208 -> 1210 bytes
-rw-r--r--gui-wm/gamescope/Manifest5
-rw-r--r--gui-wm/gamescope/gamescope-3.14.14.ebuild (renamed from gui-wm/gamescope/gamescope-3.14.2-r1.ebuild)34
-rw-r--r--gui-wm/hyprland/Manifest9
-rw-r--r--gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch23
-rw-r--r--gui-wm/hyprland/hyprland-0.39.1-r2.ebuild (renamed from gui-wm/hyprland/hyprland-0.39.1-r1.ebuild)3
-rw-r--r--gui-wm/hyprland/hyprland-0.40.0.ebuild (renamed from gui-wm/hyprland/hyprland-0.38.1.ebuild)20
-rw-r--r--gui-wm/hyprland/hyprland-9999.ebuild10
-rw-r--r--gui-wm/sway/Manifest2
-rw-r--r--gui-wm/sway/sway-9999.ebuild6
-rw-r--r--gui-wm/wayfire/Manifest7
-rw-r--r--gui-wm/wayfire/files/wayfire-session-226
-rw-r--r--gui-wm/wayfire/files/wayfire.env2
-rw-r--r--gui-wm/wayfire/metadata.xml35
-rw-r--r--gui-wm/wayfire/wayfire-0.8.1-r2.ebuild102
-rw-r--r--gui-wm/wayfire/wayfire-9999.ebuild23
16 files changed, 249 insertions, 58 deletions
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 27c7b31b4fad..ea0b9aea46a2 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
Binary files differ
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index ea1d2db85259..be404b5942a6 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,5 +1,6 @@
AUX gamescope-deprecated-stb.patch 634 BLAKE2B 33bd10dc41f9fdbbec12ea0bdec1cf8af8fc9bc499324f5f2f329c72273109fd82495a0f3d3ffb2954ee91eb106f7e36479716af6e8d2cfd76ef58c9074003d3 SHA512 56aceec2552868749a21c9ca06ac6b41da3bd901692b376e5691155c58861f941dbd5359f1e22bbe54fd14e061cd586fe06d0109a8a45a0ecf6049ea3a79663b
-DIST gamescope-3.14.2.tar.gz 486053 BLAKE2B 21433465da95e6b03b87d76c2fcb36f7f93bb9294903c6728c4b0e87916c61559a9328976eb4bfdb5bcb52dfa13265b748e924fd2e8b4701a37c63ce7a36a263 SHA512 bbdf403da8665b0dc3df6cddb6b5acf96f2af9ff8febda1a3d2c4ca5a6cd75b8580063fc6fe8d94c5cf96c9c560ead7b0870558ebefaaea87dc5b2a19d3fcc24
+DIST gamescope-3.14.14.tar.gz 512146 BLAKE2B 908c8e02a55c454d4442c135769b59287568121c60e4e7a95266e09b42cdd78db5676dd691d0c58a2430d046de93947d2ef8b54ed93ea6820240ab7a21599ac4 SHA512 dfafa32ac736c50bf146bffbbe8288827047ae87a6f0d55038f5bd6705096133f384d940dfa5adf2bdd70991bd6469f4a083eb88273df447d253676cb3f2726c
DIST reshade-9fdbea6892f9959fdc18095d035976c574b268b7.tar.gz 1543894 BLAKE2B 5e2b643ffbbda3ad078deb075a6fada1d0a560c6d865b7febee6a8eaade83ec90db3c5a8f4130d27b6dfaa8ee7b899edd214c23c947678eed28fb8e7165d9bd2 SHA512 4565d094e1c2d53d5073b4976874665d38dcf7ca86e982e569cc76923eaa9187fa32a4385fc577a3a867d2917596e6377e5a023a34bc2d389ff899d5b69764fb
-EBUILD gamescope-3.14.2-r1.ebuild 2791 BLAKE2B 9d5eada20df1053169456b7b993cd616d2717ee2c1446472666cf836a8e4e96587d9421f9f82b754ee78275969642ea8c8d589351b57709c053725d22162d296 SHA512 102a4aefb0e12e18f5e01f8f8006933ccd8fda5a3d90ebcee3d7fa5b4b99d86ddbccacac12e71ee17e43550e4ef30ab1c8a1e273708fabfec0e8b5485506c667
+DIST wlroots-a5c9826e6d7d8b504b07d1c02425e6f62b020791.tar.gz 620424 BLAKE2B 83630b77983009a36fa4f168bbe2eceb73f634f9dd149cc5e6b18fbf647245a32a5d31dc3fbd0d1bed1d0dafc4cbb2fcea3ee4b4f5660a35ca37eff4679b80a2 SHA512 6857ded750fda91d55e53edfc270eb4e7bf44d7330d17c8fcd13c248c71abba685f34260d1e6d20cdb302a8d4f9158fb43421943cca74630fd780a4048aed07b
+EBUILD gamescope-3.14.14.ebuild 3608 BLAKE2B e304f67f0f6c9f168dea8cf8d8dad679c46362ec5c60b48dcdf0cdfedf4d385048f09efe8b5e21f4ce4a97759d4dc8fb680745f56106faa64b4b5bdc5a5ef4c4 SHA512 9f2d53abffd25a92ab85bce7615352e363a72632045d69b659bf7111148dd6185af643a5d79f052183a8a83289acdd180353074b982bbb73bc75be4e9b757d6d
MISC metadata.xml 489 BLAKE2B 6930da0ca2827741a902e064b3bca71266ac5c2e61d7cf6d566c37e971efd04b2fcd2381659e1d5babe6fd05dd4d06979c0d82b3ac5e2702bb5d3311ef30df79 SHA512 419f4a3f3dc7a940d0f157323b9afd116b4a4d2efc718eb5979d84677b770a606c532d0777dbed1b6598afa393894e5dc9982dbaf7e31c90a9e0b433938d4e55
diff --git a/gui-wm/gamescope/gamescope-3.14.2-r1.ebuild b/gui-wm/gamescope/gamescope-3.14.14.ebuild
index ad468106e2c1..dd27cbde375a 100644
--- a/gui-wm/gamescope/gamescope-3.14.2-r1.ebuild
+++ b/gui-wm/gamescope/gamescope-3.14.14.ebuild
@@ -6,6 +6,7 @@ EAPI=8
inherit fcaps meson
RESHADE_COMMIT="9fdbea6892f9959fdc18095d035976c574b268b7"
+WLROOTS_COMMIT="a5c9826e6d7d8b504b07d1c02425e6f62b020791"
MY_PV=$(ver_rs 3 -)
MY_PV="${MY_PV//_/-}"
@@ -21,6 +22,7 @@ else
SRC_URI="
https://github.com/ValveSoftware/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz
https://github.com/Joshua-Ashton/reshade/archive/${RESHADE_COMMIT}.tar.gz -> reshade-${RESHADE_COMMIT}.tar.gz
+ https://github.com/Joshua-Ashton/wlroots/archive/${WLROOTS_COMMIT}.tar.gz -> wlroots-${WLROOTS_COMMIT}.tar.gz
"
KEYWORDS="~amd64"
fi
@@ -31,10 +33,13 @@ LICENSE="BSD-2"
SLOT="0"
IUSE="pipewire +wsi-layer"
+# For when wlroots 0.18 is released.
+# =gui-libs/wlroots-0.18*[X,libinput(+)]
+
RDEPEND="
=dev-libs/libliftoff-0.4*
>=dev-libs/wayland-1.21
- =gui-libs/wlroots-0.17*[X,libinput(+)]
+ gui-libs/libdecor
>=media-libs/libavif-1.0.0:=
>=media-libs/libdisplay-info-0.1.1
media-libs/libsdl2[video,vulkan]
@@ -57,6 +62,16 @@ RDEPEND="
x11-libs/libXxf86vm
pipewire? ( >=media-video/pipewire-0.3:= )
wsi-layer? ( x11-libs/libxcb )
+
+ >=dev-libs/libinput-1.14.0:=
+ media-libs/libglvnd
+ media-libs/mesa[egl(+),gles2(+)]
+ sys-auth/seatd:=
+ virtual/libudev
+ x11-base/xwayland
+ x11-libs/libxcb:=
+ >=x11-libs/pixman-0.42.0
+ x11-libs/xcb-util-wm
"
DEPEND="
${RDEPEND}
@@ -65,7 +80,7 @@ DEPEND="
dev-util/vulkan-headers
media-libs/glm
dev-util/spirv-headers
- wsi-layer? ( >=media-libs/vkroots-0_p20231108 )
+ wsi-layer? ( >=media-libs/vkroots-0_p20240430 )
"
BDEPEND="
dev-util/glslang
@@ -97,6 +112,10 @@ src_prepare() {
# For 9999, this submodule is not included.
mkdir -p thirdparty/SPIRV-Headers/include || die
ln -snf "${ESYSROOT}"/usr/include/spirv thirdparty/SPIRV-Headers/include/ || die
+
+ # Until wlroots 0.18 is released.
+ rmdir subprojects/wlroots || die
+ ln -snfT ../../wlroots-${WLROOTS_COMMIT} subprojects/wlroots || die
}
src_configure() {
@@ -106,6 +125,17 @@ src_configure() {
-Denable_openvr_support=false
$(meson_feature pipewire)
$(meson_use wsi-layer enable_gamescope_wsi_layer)
+
+ -Dwlroots:xcb-errors=disabled
+ -Dwlroots:examples=false
+ -Dwlroots:renderers=gles2,vulkan
+ -Dwlroots:xwayland=enabled
+ -Dwlroots:backends=drm,libinput
+ -Dwlroots:session=enabled
)
meson_src_configure
}
+
+src_install() {
+ meson_src_install --skip-subprojects
+}
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index ec05a8762e1f..7d3f59c19826 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,9 +1,10 @@
AUX bash-completion-fix-0.39.1.patch 1428 BLAKE2B 5fac61964fc255357e73f7d3cc7120818336849a049b83a7b728b5775995ce4b90b3496620962a596ca74f45a7933950568300e193e2e8d13f130bbdf06c756d SHA512 4101bb40509eec8a1649315d8fdb54d683347a576564f80b5a9e2d958fe75cc7e5ff3b669ed24cf8d897929e1eba4ab3c92b7287cc6ac9a90f2b7c01c93ab1f6
+AUX wlroots-hyprland-apply-0.40.0.patch 669 BLAKE2B be2bd47edc1eb640dd8a8e0be24cb9f9dea5c9a722dffde5d0fb6a11b2deb6a52f14b964a2043b9cbd08e32b769fee8597e9965ca76095c4c5453d356bdea673 SHA512 ba34e30f2f88afbb2758eee9479a523bcfa70596663faa825116a95a6b646bdb6333fa1a400d60b93ac65499c19809e8b181983b8dce3bcaa3b1aab00274c11e
DIST hyprland-0.37.1.gh.tar.gz 54651435 BLAKE2B 92bd78168909510ffb21b46f7d66e139e7b86f7655c7a8126eaf90b6ef6d7d5affaf0bc55ca1647a2f80b6d767afc00e1efe5f2241b2bc88d20357acee611b92 SHA512 f09316e210805b833a27524894222edc7a048b77f9f5d9cc8faa5b4e37040485ad3b9638f60a346da8d4d4aff24bbd6382b7fde64d07528990e9a521b2f46454
-DIST hyprland-0.38.1.gh.tar.gz 54701702 BLAKE2B 56f16d938099856be9aea0a089154e58a1d2226f42fc2a81a560e3f3883caed6eb76faa674340a3a4a1632df5a8c1a28d084c64c6749c3452c23ca192bef967b SHA512 addd4cea3f83e17907180288021718a66973c247b261e306accb7b32bbbbd2f0b3f4fcf4c22189614f561c361bfb99ea0645f4698e7af9491379d424d1d1142b
DIST hyprland-0.39.1.gh.tar.gz 54681029 BLAKE2B 5a78c5e7cef3369fd72abc05941f88f0391fb87e79afaa13c128acd9f8d2aa79d6af4d0dc82a90c09689993fe914ac48bc5ba4a32173eed31ecc20204f5a4edc SHA512 da8ee577aa823c9fb7b45bfd07503656561c1cd4cac42a9bf8f582f653c93b20824b3bce7bbcbd47b7f7f8e83fb1b630d6d5c983fe345c971322369f193c2c8f
+DIST hyprland-0.40.0.gh.tar.gz 54734246 BLAKE2B 54d5b1bb062003e38156c67bfc0b796d0e4d855f35b0122fa191037caa47e5be2a25acfe588835c49ac747fc7430124480e4a7716782fd23d028289bee236e7f SHA512 948e7237fa811f104ee11764d7947d2fd8291e79cf6db00d3f3905204f5bb2df1e51e26b2600f086f5b22d910ef50c2941343dd05e7a5d2f4b6053b150800f21
EBUILD hyprland-0.37.1.ebuild 3715 BLAKE2B 9ad1db0bcb9e2c63fa3a23abe14c26c4a3fae60a46985731fbea497a9fa86165f1f7c942ad744cd84a5f8a7d2b711f93493ad04faf23317c89bee3adb631c499 SHA512 3de2a9ed87567edf2707e2997ebc2cef0ac3f914aed184ae4121515298f1c566075fcb3e4b1ca2dc19b333676dcc259dfea110b5deb177629ed6d46396938e35
-EBUILD hyprland-0.38.1.ebuild 3735 BLAKE2B 867a6609496a33ebb6863c7d0405136e83eea51b5967527a71027b61259a3887395f8c623bf81372db92845d0497e40ac987eec06c47ee57156f4145d5f09939 SHA512 8bd315cb5cecec8c3aab4c2d9c768cb4c18e07b286b1828072f5897ab567861b28a128f6adfd94606653610e551fc845c710c58bd5525a5ddb9cacd48985fd85
-EBUILD hyprland-0.39.1-r1.ebuild 3886 BLAKE2B 3271531c5d2606c7791323913557f5376d3e7afefbddde708f216601bada1cf2efcb209c6473c834054666dc4f12ac38a545059294325daa3bfa786a21d5a9bf SHA512 f371f7a82bea139d725a71028bce7a513ed0fca3239998469c2edd34e1444edac19eeaedd3e94297fb7dcba0d5df828b7c55f36b8254b98c6cdcfb062e6a8d2c
-EBUILD hyprland-9999.ebuild 3743 BLAKE2B edd4811dd90e6e7bcc687fad14d3347f9c8f1b331495dc16bbc2be9923d030a64ad4cebb3c1e6a854d4ae71bfb8cb0e9a0b33ff65db59ad239d6970cdb0b7503 SHA512 00e9734317157f11133d409f4911a61d70cb52227e40b57044b6576b8b5a4a6da124bd156baab1981dc955a24a367ffd7f544a9ff06e56f44d1f47080e2bf196
+EBUILD hyprland-0.39.1-r2.ebuild 3906 BLAKE2B 8341946d0afe3c75c6bc30cb72f275e0792dbd3576195da30649070cabcbdae95ec9827328253e3931edbee6e98b66dfacd82282825e5f1c70e49fc8bd8480a5 SHA512 2ed56e04300995827428c5dd50dc71221d3346dad0c205e3d45f6ae0f6df0bf133e9a63e7a3c02069c51734f7936bb22093b5874d70c3ac259d437ddda13eb2f
+EBUILD hyprland-0.40.0.ebuild 3995 BLAKE2B becf3268ebc3d5e12ddd9d62c00e4faec409f4d92b588028339d2fceed53a86fa9a719f57f1256c69b527c3a15f16d9f2170c9d5cb108e62c8fcb8d1d133d2f7 SHA512 8175d2dc1d08edd01c8b9b0545fb2f583ada10adb39bd0e021b3ca8b31b162f97f56d1bf1479e21786f36f43d5af032bfa1e31eb219f88456053c640d1416f06
+EBUILD hyprland-9999.ebuild 3812 BLAKE2B c74f955cbb1d0a5e24e42dcc924c34ccee4f7adc5b0a7a4192a94313ccd76585e6e724f98d17d88e3267521e8c90baf3b7af9985b752cc82d3dbfdbeb10e5544 SHA512 2fbe82d774bbaaa77742fd07b268a067c6548ec09bcc78b777ba8ed374856d1f308c51d4d67d6abe8b68f8a2aa173036401cb5c46d449270cea0b1b2b6ac8d99
MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98
diff --git a/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch b/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch
new file mode 100644
index 000000000000..65148b64137f
--- /dev/null
+++ b/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch
@@ -0,0 +1,23 @@
+diff --git a/patches/apply.sh b/patches/apply.sh
+index d5492b1b..87d84848 100755
+--- a/subprojects/wlroots-hyprland/patches/apply.sh
++++ b/subprojects/wlroots-hyprland/patches/apply.sh
+@@ -4,15 +4,15 @@
+ PATCHES=$(find patches/ -type f -name '*.patch')
+
+ apply () {
+- git apply $PATCH
++ patch -p1 -r /dev/null -N -s < $PATCH >/dev/null 2>&1 && echo NEW: \'$PATCH\'
+ }
+
+ check_applied () {
+- git apply --check --reverse -q $PATCH
++ patch -p1 -r /dev/null --dry-run -R -s < $PATCH >/dev/null 2>&1 && echo OK: \'$PATCH\'
+ }
+
+ fail () {
+- echo =======\> \'$PATCH\' was not applied && exit 1
++ echo FAILED: \'$PATCH\' NOT APPLICABLE && exit 1
+ }
+
+ if [ -n "$PATCHES" ];
diff --git a/gui-wm/hyprland/hyprland-0.39.1-r1.ebuild b/gui-wm/hyprland/hyprland-0.39.1-r2.ebuild
index 6b1a6eff78b2..ace618c16dda 100644
--- a/gui-wm/hyprland/hyprland-0.39.1-r1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.39.1-r2.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/${PN}-source"
- KEYWORDS="~amd64 ~riscv"
+ KEYWORDS="amd64 ~riscv"
fi
LICENSE="BSD"
@@ -28,6 +28,7 @@ HYPRPM_RDEPEND="
app-alternatives/ninja
dev-build/cmake
dev-build/meson
+ dev-libs/libliftoff
dev-vcs/git
virtual/pkgconfig
"
diff --git a/gui-wm/hyprland/hyprland-0.38.1.ebuild b/gui-wm/hyprland/hyprland-0.40.0.ebuild
index a2006ea15983..0893dbca86c0 100644
--- a/gui-wm/hyprland/hyprland-0.38.1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.40.0.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/${PN}-source"
- KEYWORDS="~amd64 ~riscv"
+ KEYWORDS="~amd64"
fi
LICENSE="BSD"
@@ -28,6 +28,7 @@ HYPRPM_RDEPEND="
app-alternatives/ninja
dev-build/cmake
dev-build/meson
+ dev-libs/libliftoff
dev-vcs/git
virtual/pkgconfig
"
@@ -37,7 +38,8 @@ HYPRPM_RDEPEND="
WLROOTS_DEPEND="
>=dev-libs/wayland-1.22
media-libs/libglvnd
- media-libs/mesa[egl(+),gles2]
+ || ( <media-libs/mesa-24.1[egl(+),gles2]
+ >=media-libs/mesa-24.1[egl(+)] )
>=x11-libs/libdrm-2.4.114
x11-libs/libxkbcommon
>=x11-libs/pixman-0.42.0
@@ -58,7 +60,7 @@ WLROOTS_RDEPEND="
"
WLROOTS_BDEPEND="
>=dev-libs/wayland-protocols-1.32
- dev-util/wayland-scanner
+ dev-util/hyprwayland-scanner
virtual/pkgconfig
"
RDEPEND="
@@ -68,7 +70,7 @@ RDEPEND="
dev-libs/glib:2
dev-libs/libinput
>=dev-libs/wayland-1.20.0
- gui-libs/hyprcursor
+ >=gui-libs/hyprcursor-0.1.7
media-libs/libglvnd
x11-libs/cairo
x11-libs/libdrm
@@ -84,17 +86,23 @@ DEPEND="
${WLROOTS_DEPEND}
>=dev-libs/hyprland-protocols-0.2
>=dev-libs/hyprlang-0.3.2
- >=dev-libs/wayland-protocols-1.32
+ >=dev-libs/wayland-protocols-1.34
"
BDEPEND="
${WLROOTS_BDEPEND}
|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
app-misc/jq
dev-build/cmake
- dev-util/wayland-scanner
+ ~dev-util/hyprwayland-scanner-0.3.4
virtual/pkgconfig
"
+PATCHES=(
+ # apply.sh script is broken in the targetted commit of 0.40.0
+ # they fixed it since; the fix being this patch
+ "${FILESDIR}"/wlroots-hyprland-apply-0.40.0.patch
+)
+
pkg_setup() {
[[ ${MERGE_TYPE} == binary ]] && return
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index 65a0a8843541..932052e219d2 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -15,7 +15,7 @@ else
SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
S="${WORKDIR}/${PN}-source"
- KEYWORDS="~amd64 ~riscv"
+ KEYWORDS="~amd64"
fi
LICENSE="BSD"
@@ -28,6 +28,7 @@ HYPRPM_RDEPEND="
app-alternatives/ninja
dev-build/cmake
dev-build/meson
+ dev-libs/libliftoff
dev-vcs/git
virtual/pkgconfig
"
@@ -37,7 +38,8 @@ HYPRPM_RDEPEND="
WLROOTS_DEPEND="
>=dev-libs/wayland-1.22
media-libs/libglvnd
- media-libs/mesa[egl(+),gles2]
+ || ( <media-libs/mesa-24.1[egl(+),gles2]
+ >=media-libs/mesa-24.1[egl(+)] )
>=x11-libs/libdrm-2.4.114
x11-libs/libxkbcommon
>=x11-libs/pixman-0.42.0
@@ -68,7 +70,7 @@ RDEPEND="
dev-libs/glib:2
dev-libs/libinput
>=dev-libs/wayland-1.20.0
- gui-libs/hyprcursor
+ >=gui-libs/hyprcursor-0.1.7
media-libs/libglvnd
x11-libs/cairo
x11-libs/libdrm
@@ -84,7 +86,7 @@ DEPEND="
${WLROOTS_DEPEND}
>=dev-libs/hyprland-protocols-0.2
>=dev-libs/hyprlang-0.3.2
- >=dev-libs/wayland-protocols-1.32
+ >=dev-libs/wayland-protocols-1.34
"
BDEPEND="
${WLROOTS_BDEPEND}
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index af8106b339bf..76d4017be40b 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,5 +1,5 @@
AUX sway-portals.conf 216 BLAKE2B d30b62bb142802e5067c2829d69faba87b07c8a36661f43473b0a107fd57d020b3dcc5e7a1967a1fca13b7a5e9140063b7285c44b766f67002213521d676b1ab SHA512 790741df028822bf4d83170dea57e1c63f7d7938cf31969e4cd347b0fc07330322b603c9ec0091b7a3f425132bed9dee6f261074cc273555120858beaaaf5da1
DIST sway-1.9.tar.gz 5581281 BLAKE2B 11d90866e3d12a76880f41e006be5ae7f3a3b1e6cbeb2412d30b673be91be7f60523dcce2892579e1da76de1d0498e0669138aa953bf1f595b97123720812e06 SHA512 7ec0a29078eb7e0fb1b6af97613c263adec78ddb03a63cb75fb5e44c7241ed144687fd094ee2eb70f4397832ca9bdffc88bc32dee7683bf0e515417c7a05d4c4
EBUILD sway-1.9.ebuild 2690 BLAKE2B 525da24f7b6a2cef34e8e9fdc88bf0d659a8cbe81938f57923fd830f42165e3f77db6f5ce01f4b40e59925cf71455ace91b544cdd00af6f0adb986c871a9c59b SHA512 504a560698dcdbb7402624bb9478d86f4082b16d72ab7d8c6093985129b16477078981a97aab2162462a35262d6f03cc005d419594afaa2490529417c2b44e0f
-EBUILD sway-9999.ebuild 2693 BLAKE2B 9f8bb9be70b0e00432fb1d36a2d281c780658c34f8775191860798091ad89fe088301b16c59b06fbfd8789658f967cc2e26cde7cd8681b001287f676cb62c4df SHA512 f0555473ae327b5694b9fd6b6da8eb7b2841d6eee824d63d54c4620937f6b914485d0d3dc685dda3537cd54dd9318d736f9d37437b45c976771ab959202e86ba
+EBUILD sway-9999.ebuild 2604 BLAKE2B 30b11f23111326ec38b54bb67b222b712cd9929b4a7fbb3b83ab69751358b21f89e38de0f49e4cee4cc2c6cecfeb05f2e19978cf34f35efa84d6034f5c79445b SHA512 458f99b52201846dfe23173066a85bf1f165861b63a888b42c4e2fb8e6cddf7b14e8b96f04b411f66a04a03ddb8875f7f6ac21afc3b5105c304e459596bcaf8b
MISC metadata.xml 1721 BLAKE2B 39795f8d7c4a736141417e267e2c4645f4f963107c47516747c7fbc1643ed2e9787812c5571369b795e3648d4801dff32c062bf2db6d80ce79735d1be65b8ac8 SHA512 458d2adb61ecb91cc9d589409c69bffa7dee51328a557567e66c21eeff7e23eadaf36a04ca9fae32aa9d6edf1e28fa1bcba62f3e185699a8c08785f84977bb88
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index 905df0af237e..a23327214abb 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -64,12 +64,8 @@ BDEPEND="
>=dev-libs/wayland-protocols-1.24
>=dev-build/meson-0.60.0
virtual/pkgconfig
+ man? ( >=app-text/scdoc-1.11.3 )
"
-if [[ ${PV} == 9999 ]]; then
- BDEPEND+="man? ( ~app-text/scdoc-9999 )"
-else
- BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
-fi
FILECAPS=(
cap_sys_nice usr/bin/${PN} # bug 919298
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 4d8b12700a6d..403e745e54d8 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,11 +1,14 @@
AUX wayfire-0.8.0-dont-use-installed-config-h.patch 1999 BLAKE2B 6f87e25841dfcd266a7507d72d5c6602fd11a24b8a5e7f90c51e8b93592355f2971ee2eb0c9088a17921f5cf6dd690ebd0d54ea03f6fe026794d5d7c2eafaeb0 SHA512 0cbdf8bcf54491969ad5d0da9d2736775112ea168bbeb03bc252961cbe011b16bcf193ed3bef9effeeaac870405141819d1cb2dc2cb3cab20fc97dcb33639fdd
AUX wayfire-0.8.0-fix-duplicate-manpage.patch 755 BLAKE2B c4e3fec4c5861eadd58480d098f92ae5d24b798d29e2e5898eda80132df53705e440516b6af67de4eadd7d788c106b72693e315467f3397be12ab6d03da5082c SHA512 77930c892938d3f27e12e9a2f1ac31f9552c91869e011b933d2bb1f6b986abda75f71d1bb008f71665d3edf9a2fb0e650ad1fc397f4dc0c9bcb77f94d7f8ea24
AUX wayfire-session 540 BLAKE2B 02970ebece43c8643ab68f0108d2166f7946d54cea7c6143c9badf0e9852bed4af14bb0c4dd3101a179958b06904889204915e965c46f64073fb8f05800553e3 SHA512 616bbf244a358fb7fbeb1230a3ba862a7ca373fdf3b181819a05ca63da82c78fcd80d0f7167d50488c38820559f007702d2c86ac861f214775c3a6271351bb1d
+AUX wayfire-session-2 871 BLAKE2B cb2db6d1a2944d0ce60e67328e9353d3e4c69b5d5f9e4fee4351e51d78dc9deb3f8ddd338bbbd7b047cd029360b66d02ec9791f049f59eed8155992c89062e11 SHA512 380708daacc92cf8c94c9fee9c1e374dddb90f83438277c360d904dd34cf30634f90caf9e53ca3511b679f499f0044e35f80516bea1f1bbe8057fae85cad9963
AUX wayfire-session.desktop 204 BLAKE2B a8e01f911881c651ec67b5945b91dca6151866599c0a7d0ef5b17c2b88ff6178c6f6d42506f1d6f6cbce8f9231388fa63e2a870116a45c677bd9faee94eabfac SHA512 0c7fd2f04c5b2c413bda02f2c43090dc8c64503d372e8eb19df8a4d7190f6ba703db672753bfa0629a2f627b505886c33f874a933cc6cf7f876caf60a4e70039
+AUX wayfire.env 80 BLAKE2B ff44da0d760ab3ba5e68009e4eea3112d4882331fd678b286f741bb87e2319c87e48d689318fe99a79bb6af3127ec97a99de8994f5c18d96086cc7f3d1e68160 SHA512 2118195fb4ceb6a994043a4bd5608ee9bb104dd769cf3ffba449b053fa05a6e7464ab9c3f812bd0f9bf4ed73eb7f5e2afa1ee48373765b8429317efa11089cd6
DIST wayfire-0.8.0.tar.xz 828576 BLAKE2B 4d80a0d43061a4564d45f7c077fd97737b426c4036c12f004815dbad120f51b38b2fac9a010e2df27a6a96205cd0dcceb81864bdccbd6e337d81f6c37926e019 SHA512 fab55f6112c462312edf43d41b29f476d493449eca8f0c5cfee8f3aae73dcb98be46c589fc23d10d961f738bdf6d1fe78286b4c96e1d4444fdc8b1b898d998a9
DIST wayfire-0.8.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb386666fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254
EBUILD wayfire-0.8.0-r1.ebuild 3710 BLAKE2B 5f64dbdb42209d9b05a0eaa30f47fdbf0d3622e242cf5eb31598efdc615201a53c733d4ba0a4d5710d0131e91bcc3bd242e524493d37652e0a8110ba3c8bc1d7 SHA512 968704fbb1d2145064e98da1f0aad422eac38ecd2aac4009663a97efe5f11f9d1420e2a251815255b47afcd326646119a94769e0f4b569fb4c83326e08f1e56c
EBUILD wayfire-0.8.0-r2.ebuild 3776 BLAKE2B b848744075d055977581665f1b4cccaf5608e0ad0516730c11970a56bde7394b28201f43850a154ea3094e7333e8903576bbb3d32f9415835232aa9617f3b970 SHA512 2ece76e1779c0259a14be3599961cbd7ddd2cb7c2481a1e60009074669b4f1e265a93886999223d8894c96f115ee0b6fe642204323babb53bf2b534bfc5aea27
EBUILD wayfire-0.8.1-r1.ebuild 2471 BLAKE2B 49d1238ea8136959b2acd3504a2a72a81b340660de7ba28c8935833e984a1b95272db93793bdc685aa9f9de7ef2c8500b3eccae143199f94a5f5dfa5a6dd3c19 SHA512 a8ac07b6ea9c6397345b5913dda1910a89976d36d37414f8debaca2c225c7ce545dc472b92aafec66f611fd91097dfbfdc7706d33e4abfb98aa14c70e164a947
-EBUILD wayfire-9999.ebuild 2396 BLAKE2B 2b03a83746372fc3bb0c67809831136890b5b493f6240db4624b0a9a8ba8f0a02cd5b1cd1b5c92b90286ab61d6ee9cb19ffeeb32616c868d9cbaa1e01c92214e SHA512 aaf374d7a6b4688e010763e760fc5718570f629194553aa259f69a00ec203a7087e589a658f8ee28b85896fa528ed9a4bb9ab93ba9af2158a5e8fda62975f84d
-MISC metadata.xml 1165 BLAKE2B 1c0dbff3530ca68ac4999298a136ccbb12c7901aa089a74360b9576cb68ba7d0f9a7491f959b23c3e6b3fcc9b64455482863dbb1a9586c5debb23e7b2a34cd3c SHA512 b422127c711314f118afe73f6697b0a566458c1f36bf5dd92cecdc7be82c9bd4406188ff0a02be30317abd7a835bff3b4e5d2614598233aa2e79a200276af42c
+EBUILD wayfire-0.8.1-r2.ebuild 2280 BLAKE2B 147c76241aa0465a6e48a423fb33f63358d5b64f187b180c5f5baec38b9b361da191e87d16215699b9bdb36cdedf48eec483de13130e6a0dd415c7db50ae4619 SHA512 96e0ef86dd0b8b298c11389a6929b07e1182eccd8375b156838e7b03377411171967787af61a5e6daea232f9ce3b00f485f08ee370bf4ecadbba87222021d7a0
+EBUILD wayfire-9999.ebuild 2204 BLAKE2B f99a53028c1b2cac6922f71a9e250857767c45692bc2d252fc58c9a6c855a2966ccbf78c364d9c9bcdf5e9c21c4048307e6a2ccb15bb44c9e4b575615acea2d3 SHA512 65f8095127deaa1433c0625e059322bb0ce73ef485677c5e848191330eee0df0682cbed29610b177b2257a5b6e204d9bf7cba689cc8fe5852a109966487dacc0
+MISC metadata.xml 1171 BLAKE2B 9517f1c85eb2f85a578d512d163a3f104ed8d621ce19ac42450897b499c033eff8bd121dd472946154c49b75151a01f282f39af5c3967e3192ec029db38b2d0a SHA512 9481f8f77574f9224b6e5ee3f4feabf2960b21b8331e16c4031b7d1f0068564a1567319d0e4246c5c918d4294d5dd7cca94fe015ca0327944c6047aa2c1b5f12
diff --git a/gui-wm/wayfire/files/wayfire-session-2 b/gui-wm/wayfire/files/wayfire-session-2
new file mode 100644
index 000000000000..0713ca0bbb93
--- /dev/null
+++ b/gui-wm/wayfire/files/wayfire-session-2
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# output to syslog and stderr
+# with PID and syslog identity 'wayfire'
+exec 1> >(logger --id=$$ --stderr --tag wayfire) 2>&1
+
+# if undefined, or empty, set to freedesktop specification defaults
+[ -z "$XDG_DATA_DIRS" ] && export XDG_DATA_DIRS="/usr/local/share:/usr/share"
+
+# freedesktop specifications mandate that the definition
+# of XDG_SESSION_TYPE should be respected
+export XDG_SESSION_TYPE=wayland
+export GDK_BACKEND=wayland
+export QT_QPA_PLATFORM=wayland
+export MOZ_ENABLE_WAYLAND=1
+
+# copy wayfire.ini to $HOME/.config/ if not already there
+configdir="${XDG_CONFIG_HOME:=${HOME}/.config}"
+if [[ ! -f ${configdir}/wayfire.ini ]]; then
+ cp /usr/share/wayfire/wayfire.ini "${configdir}"
+fi
+
+# override or add environment variables
+[[ -f @EPREFIX@/etc/wayfire.env ]] && . @EPREFIX@/etc/wayfire.env
+
+exec @DBUS_RUN_SESSION@ @EPREFIX@/usr/bin/wayfire "$@"
diff --git a/gui-wm/wayfire/files/wayfire.env b/gui-wm/wayfire/files/wayfire.env
new file mode 100644
index 000000000000..47ce61e3183c
--- /dev/null
+++ b/gui-wm/wayfire/files/wayfire.env
@@ -0,0 +1,2 @@
+# Uncomment if the mouse cursor is invisible:
+#export WLR_NO_HARDWARE_CURSORS=1
diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml
index fb1df8affac5..ed72465ca08f 100644
--- a/gui-wm/wayfire/metadata.xml
+++ b/gui-wm/wayfire/metadata.xml
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
- <longdescription>
- compiz like eye-candy 3D wayland, with low memory footprint.
- Aims to bring desktop features such as 3D cube, fire burn,
- fisheye, wrot and all other desktop effects to wayland.
- </longdescription>
- <use>
- <flag name="gles">use libglvnd to do animations more efficiently</flag>
- <flag name="gles3">Enable OpenGL ES 3.x Features.</flag>
- <flag name="system-wfconfig">Use the system-wide <pkg>gui-libs/wf-config</pkg> instead of building as a submodule. It will block system-wide <pkg>gui-libs/wf-config</pkg> from being installed.</flag>
- <flag name="system-wlroots">Use the system-wide <pkg>gui-libs/wlroots</pkg> instead of building as a submodule. It will block system-wide <pkg>gui-libs/wlroots</pkg> from being installed.</flag>
- <flag name="X">Enable support for X11 applications (XWayland).</flag>
- </use>
- <upstream>
- <remote-id type="github">WayfireWM/wayfire</remote-id>
- </upstream>
+ <maintainer type="person">
+ <email>ceamac@gentoo.org</email>
+ <name>Viorel Munteanu</name>
+ </maintainer>
+ <longdescription>
+ compiz like eye-candy 3D wayland, with low memory footprint.
+ Aims to bring desktop features such as 3D cube, fire burn,
+ fisheye, wrot and all other desktop effects to wayland.
+ </longdescription>
+ <use>
+ <flag name="gles">use libglvnd to do animations more efficiently</flag>
+ <flag name="gles3">Enable OpenGL ES 3.x Features.</flag>
+ <flag name="system-wfconfig">Use the system-wide <pkg>gui-libs/wf-config</pkg> instead of building as a submodule. It will block system-wide <pkg>gui-libs/wf-config</pkg> from being installed.</flag>
+ <flag name="system-wlroots">Use the system-wide <pkg>gui-libs/wlroots</pkg> instead of building as a submodule. It will block system-wide <pkg>gui-libs/wlroots</pkg> from being installed.</flag>
+ <flag name="X">Enable support for X11 applications (XWayland).</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">WayfireWM/wayfire</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
new file mode 100644
index 000000000000..ff1a84e65576
--- /dev/null
+++ b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 2019-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+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/0.8"
+else
+ SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm64 ~riscv"
+ SLOT="0/$(ver_cut 1-2)"
+fi
+
+LICENSE="MIT"
+IUSE="+dbus +gles3 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
+CDEPEND="
+ dev-cpp/nlohmann_json
+ dev-libs/glib:2
+ dev-libs/libevdev
+ >=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:=
+ x11-libs/cairo
+ x11-libs/libxkbcommon
+ x11-libs/pango
+ x11-libs/pixman
+ dbus? ( sys-apps/dbus )
+ X? ( x11-libs/libxcb:= )
+"
+
+RDEPEND="
+ ${CDEPEND}
+ x11-misc/xkeyboard-config
+"
+DEPEND="
+ ${CDEPEND}
+ test? ( dev-cpp/doctest )
+"
+BDEPEND="
+ dev-util/wayland-scanner
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}/wayfire-0.8.0-dont-use-installed-config-h.patch"
+)
+
+src_prepare() {
+ default
+
+ local dbusrunsession=$(usev dbus dbus-run-session)
+ sed -e "s:@EPREFIX@:${EPREFIX}:g" -e "s:@DBUS_RUN_SESSION@:${dbusrunsession}:" \
+ "${FILESDIR}"/wayfire-session-2 > "${T}"/wayfire-session || die
+ sed -e "s:@EPREFIX@:${EPREFIX}:" \
+ "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature test tests)
+ $(meson_feature X xwayland)
+ $(meson_use gles3 enable_gles32)
+ -Duse_system_wfconfig=enabled
+ -Duse_system_wlroots=enabled
+ )
+
+ 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
+
+ insinto "/etc"
+ doins "${FILESDIR}"/wayfire.env
+}
diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild
index 6a2f5696709d..bce466406ffd 100644
--- a/gui-wm/wayfire/wayfire-9999.ebuild
+++ b/gui-wm/wayfire/wayfire-9999.ebuild
@@ -19,7 +19,7 @@ else
fi
LICENSE="MIT"
-IUSE="+gles3 test X"
+IUSE="+dbus +gles3 test X"
RESTRICT="!test? ( test )"
# bundled wlroots has the following dependency string according to included headers.
@@ -42,9 +42,8 @@ CDEPEND="
x11-libs/libxkbcommon
x11-libs/pango
x11-libs/pixman
- X? (
- x11-libs/libxcb:=
- )
+ dbus? ( sys-apps/dbus )
+ X? ( x11-libs/libxcb:= )
"
RDEPEND="
@@ -63,8 +62,9 @@ BDEPEND="
src_prepare() {
default
- sed -e "s:@EPREFIX@:${EPREFIX}:" \
- "${FILESDIR}"/wayfire-session > "${T}"/wayfire-session || die
+ local dbusrunsession=$(usev dbus dbus-run-session)
+ sed -e "s:@EPREFIX@:${EPREFIX}:g" -e "s:@DBUS_RUN_SESSION@:${dbusrunsession}:" \
+ "${FILESDIR}"/wayfire-session-2 > "${T}"/wayfire-session || die
sed -e "s:@EPREFIX@:${EPREFIX}:" \
"${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
}
@@ -92,14 +92,7 @@ src_install() {
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
+ insinto "/etc"
+ doins "${FILESDIR}"/wayfire.env
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 20:55:23 +0000