summaryrefslogtreecommitdiff
path: root/gui-wm/hyprland
diff options
context:
space:
mode:
Diffstat (limited to 'gui-wm/hyprland')
-rw-r--r--gui-wm/hyprland/Manifest18
-rw-r--r--gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch22
-rw-r--r--gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch23
-rw-r--r--gui-wm/hyprland/hyprland-0.41.1.ebuild (renamed from gui-wm/hyprland/hyprland-0.39.1-r2.ebuild)40
-rw-r--r--gui-wm/hyprland/hyprland-0.41.2.ebuild (renamed from gui-wm/hyprland/hyprland-0.40.0.ebuild)46
-rw-r--r--gui-wm/hyprland/hyprland-0.42.0-r1.ebuild (renamed from gui-wm/hyprland/hyprland-0.37.1.ebuild)79
-rw-r--r--gui-wm/hyprland/hyprland-9999.ebuild77
-rw-r--r--gui-wm/hyprland/metadata.xml4
8 files changed, 82 insertions, 227 deletions
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 7d3f59c19826..24cf0b8a5b9d 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,10 +1,8 @@
-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.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.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
+DIST hyprland-0.41.1.gh.tar.gz 54813832 BLAKE2B 1dd17e7e1f885da91fca596bf8ce9efc76b3110640a9bc11538fabf975eb55d76180c202527e0b0eac300f027adfed815d2a9a5396a48429097ef2a5ffcc4d9e SHA512 fa63e7c429e33535fa30ca70133f6ac8617f2386bdca1e8063628a2895677c9b80965548ee21f897aea2fe6bdcc10d74d8c46989a7563b36504f4a4f43c3eaad
+DIST hyprland-0.41.2.gh.tar.gz 54821598 BLAKE2B 026559e9319690e6b48863ffdc2e059c969ab45e7bfe75578b7e41f1d10b36e720ae0655f7003107a4ff4e94c1e95aba3e8a1af8ed01bae369c571e24d966aec SHA512 5a138d9ad6de2d45d8d0a5cde8c39ba3cd4c6bac61caf5b9f8520d0adcafe6ac1dfec4c529b8a6608133ffe9409935c1414a86d98d743be6766bdbc72641179d
+DIST hyprland-0.42.0.gh.tar.gz 54225438 BLAKE2B a947289c5568408d71383034a290f114b974f442ed1f56ac3ec30e49519ee886ac83e1f2611577a7240a555480a59bc01defb79b2aca2122ef0d81ea007f5486 SHA512 839916957abc867ad9a3a32b6f74830055060b99c4c1de314f71a85f8d55ef051c5adb7c79dd7a7e10f81d1130aa032458bb65ce2454198a79faa719021f66af
+EBUILD hyprland-0.41.1.ebuild 3450 BLAKE2B 9f7660c38c7a8440d311e9586592fbd83558ae295f6391c17b9c1793c8a2ecfd54fd4d54095a493b7d525317dc967064eb10fac2f1f5e80f01695c22a1b1ab66 SHA512 5ffd43609f6b752925dc636d2e675d732307160ca703c130edc7f5a4e79eb93c18dec170c0097a45907e7fb7767d5c354b908758542f8f4b48dfc884312eaccb
+EBUILD hyprland-0.41.2.ebuild 3227 BLAKE2B 4da40fbf06cb1d9c9dac0efe98d131475906eda860d4ec69bba231a55d6d93c3a89fc31f5d165de086f4cf30f84f51a24db63d8ab5466a33f556f7b9d86bbc51 SHA512 66da766d7d68071304b4eeda1a42c9490274c41035ea9f49d78a92d7d0aca12560e4ddeae2df6a4324cb00c2636cd74cce066087d236b81f6598c8a09e720d33
+EBUILD hyprland-0.42.0-r1.ebuild 2357 BLAKE2B ef3afe64de415058d6c7c7777afc87357c2e1c2e44291ba27ab4241f6eedf3935d1ab6ea300148431a4bc7bc3760b43aa5f9d580bba7cbf75a93c390605eadb5 SHA512 62b4502b0319cbcab715949119c5ab088bb1a6bd10c057794c0940ba543b6c2f12585567f486212bb4adf1c80a99faa3131cadab90dc7334df4f18a1fef427ae
+EBUILD hyprland-9999.ebuild 2243 BLAKE2B a9255e0b44eb9aab3a9b1b2433ae801d451267ddd2924dc20d8f3f8cf58f8d800114197894f59bfe0321658751b3f316296a4cfc02aede812f4058db6f8c3332 SHA512 0d6e0c1e4d5974d80e8145eb037f2c993d765dbd6a0a07350ca2221087f43e14f77aa91b17d1f7bc9de2987c546cd04447c81de1bd54f9bd8a264b4a107ab670
+MISC metadata.xml 842 BLAKE2B a18d149e43389e07733358e7295c2a9c1aca796292764a7598e9fb2902c3f7ec69b8c7226e245f2bb19df18ff55522c0e1025b43a48f9f44bfa54df6b5aad938 SHA512 1d236b3417f157c2d2604465fcfd1a36a118b96a5cc938b584cb65b1b930ed658497508912680ede27a54e2ea51d87a833f34fe925d0e619e75ce120d6273bde
diff --git a/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch b/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch
deleted file mode 100644
index fe48ce45dd3a..000000000000
--- a/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/hyprwm/Hyprland/pull/5653
-
---- a/hyprctl/meson.build
-+++ b/hyprctl/meson.build
-@@ -2,6 +2,6 @@ executable('hyprctl', 'main.cpp',
- install: true
- )
-
--install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion'), install_tag: 'runtime', rename: 'hyprctl')
-+install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), install_tag: 'runtime', rename: 'hyprctl')
- install_data('hyprctl.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime')
- install_data('hyprctl.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprctl')
---- a/hyprpm/src/meson.build
-+++ b/hyprpm/src/meson.build
-@@ -9,6 +9,6 @@ executable('hyprpm', src,
- install : true
- )
-
--install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion'), install_tag: 'runtime', rename: 'hyprpm')
-+install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), install_tag: 'runtime', rename: 'hyprpm')
- install_data('../hyprpm.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime')
- install_data('../hyprpm.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprpm')
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
deleted file mode 100644
index 65148b64137f..000000000000
--- a/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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-r2.ebuild b/gui-wm/hyprland/hyprland-0.41.1.ebuild
index ace618c16dda..ded707b47007 100644
--- a/gui-wm/hyprland/hyprland-0.39.1-r2.ebuild
+++ b/gui-wm/hyprland/hyprland-0.41.1.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"
@@ -38,7 +38,10 @@ HYPRPM_RDEPEND="
WLROOTS_DEPEND="
>=dev-libs/wayland-1.22
media-libs/libglvnd
- media-libs/mesa[egl(+),gles2]
+ || (
+ >=media-libs/mesa-24.1.0_rc1[opengl]
+ <media-libs/mesa-24.1.0_rc1[egl(+),gles2]
+ )
>=x11-libs/libdrm-2.4.114
x11-libs/libxkbcommon
>=x11-libs/pixman-0.42.0
@@ -59,7 +62,7 @@ WLROOTS_RDEPEND="
"
WLROOTS_BDEPEND="
>=dev-libs/wayland-protocols-1.32
- dev-util/wayland-scanner
+ dev-util/hyprwayland-scanner
virtual/pkgconfig
"
RDEPEND="
@@ -69,7 +72,7 @@ RDEPEND="
dev-libs/glib:2
dev-libs/libinput
>=dev-libs/wayland-1.20.0
- >=gui-libs/hyprcursor-0.1.7
+ ~gui-libs/hyprcursor-0.1.9
media-libs/libglvnd
x11-libs/cairo
x11-libs/libdrm
@@ -83,25 +86,21 @@ RDEPEND="
DEPEND="
${RDEPEND}
${WLROOTS_DEPEND}
- >=dev-libs/hyprland-protocols-0.2
+ >=dev-libs/hyprland-protocols-0.3
>=dev-libs/hyprlang-0.3.2
- >=dev-libs/wayland-protocols-1.32
+ >=dev-libs/wayland-protocols-1.36
+ >=gui-libs/hyprutils-0.1.2
+ x11-libs/xcb-util-errors
"
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.9
virtual/pkgconfig
"
-PATCHES=(
- # https://bugs.gentoo.org/930132
- # https://github.com/hyprwm/Hyprland/pull/5653
- "${FILESDIR}/bash-completion-fix-0.39.1.patch"
-)
-
pkg_setup() {
[[ ${MERGE_TYPE} == binary ]] && return
@@ -116,6 +115,12 @@ pkg_setup() {
fi
}
+src_prepare() {
+ # skip version.h
+ sed -i -e "s|scripts/generateVersion.sh|echo|g" meson.build || die
+ default
+}
+
src_configure() {
local emesonargs=(
$(meson_feature legacy-renderer legacy_renderer)
@@ -134,13 +139,4 @@ src_install() {
meson_src_install --skip-subprojects wlroots
# Then install development files (mainly wlroots) for bug #916760.
meson_src_install --tags devel
-
- # Wlroots headers are required by hyprland-plugins and the pkgconfig file expects
- # them to be in /usr/include/hyprland/wlroots, despite this they aren't installed there.
- # Ideally you could override includedir per subproject and the install tags would
- # be granular enough to only install headers. But its not requiring this.
- mkdir "${ED}"/usr/include/hyprland/wlroots || die
- mv "${ED}"/usr/include/wlr "${ED}"/usr/include/hyprland/wlroots || die
- # devel tag includes wlroots .pc and .a files still
- rm -rf "${ED}"/usr/$(get_libdir)/ || die
}
diff --git a/gui-wm/hyprland/hyprland-0.40.0.ebuild b/gui-wm/hyprland/hyprland-0.41.2.ebuild
index 0893dbca86c0..9c3bfc3cf5cb 100644
--- a/gui-wm/hyprland/hyprland-0.40.0.ebuild
+++ b/gui-wm/hyprland/hyprland-0.41.2.ebuild
@@ -38,18 +38,21 @@ HYPRPM_RDEPEND="
WLROOTS_DEPEND="
>=dev-libs/wayland-1.22
media-libs/libglvnd
- || ( <media-libs/mesa-24.1[egl(+),gles2]
- >=media-libs/mesa-24.1[egl(+)] )
+ || (
+ >=media-libs/mesa-24.1.0_rc1[opengl]
+ <media-libs/mesa-24.1.0_rc1[egl(+),gles2]
+ )
>=x11-libs/libdrm-2.4.114
x11-libs/libxkbcommon
>=x11-libs/pixman-0.42.0
- media-libs/libdisplay-info
+ media-libs/libdisplay-info:=
sys-apps/hwdata
>=dev-libs/libinput-1.14.0:=
sys-auth/seatd:=
virtual/libudev:=
X? (
x11-libs/libxcb:=
+ x11-libs/xcb-util-errors
x11-libs/xcb-util-renderutil
x11-libs/xcb-util-wm
x11-base/xwayland
@@ -70,7 +73,7 @@ RDEPEND="
dev-libs/glib:2
dev-libs/libinput
>=dev-libs/wayland-1.20.0
- >=gui-libs/hyprcursor-0.1.7
+ >=gui-libs/hyprcursor-0.1.9
media-libs/libglvnd
x11-libs/cairo
x11-libs/libdrm
@@ -84,25 +87,20 @@ RDEPEND="
DEPEND="
${RDEPEND}
${WLROOTS_DEPEND}
- >=dev-libs/hyprland-protocols-0.2
+ >=dev-libs/hyprland-protocols-0.3
>=dev-libs/hyprlang-0.3.2
- >=dev-libs/wayland-protocols-1.34
+ >=dev-libs/wayland-protocols-1.36
+ >=gui-libs/hyprutils-0.1.5
"
BDEPEND="
${WLROOTS_BDEPEND}
|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
app-misc/jq
dev-build/cmake
- ~dev-util/hyprwayland-scanner-0.3.4
+ >=dev-util/hyprwayland-scanner-0.3.8
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
@@ -117,6 +115,12 @@ pkg_setup() {
fi
}
+src_prepare() {
+ # skip version.h
+ sed -i -e "s|scripts/generateVersion.sh|echo|g" meson.build || die
+ default
+}
+
src_configure() {
local emesonargs=(
$(meson_feature legacy-renderer legacy_renderer)
@@ -129,19 +133,3 @@ src_configure() {
meson_src_configure
}
-
-src_install() {
- # First install everything except wlroots to avoid conflicts.
- meson_src_install --skip-subprojects wlroots
- # Then install development files (mainly wlroots) for bug #916760.
- meson_src_install --tags devel
-
- # Wlroots headers are required by hyprland-plugins and the pkgconfig file expects
- # them to be in /usr/include/hyprland/wlroots, despite this they aren't installed there.
- # Ideally you could override includedir per subproject and the install tags would
- # be granular enough to only install headers. But its not requiring this.
- mkdir "${ED}"/usr/include/hyprland/wlroots || die
- mv "${ED}"/usr/include/wlr "${ED}"/usr/include/hyprland/wlroots || die
- # devel tag includes wlroots .pc and .a files still
- rm -rf "${ED}"/usr/$(get_libdir)/ || die
-}
diff --git a/gui-wm/hyprland/hyprland-0.37.1.ebuild b/gui-wm/hyprland/hyprland-0.42.0-r1.ebuild
index e4a269ccec3e..0c9148aefe21 100644
--- a/gui-wm/hyprland/hyprland-0.37.1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.42.0-r1.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,70 +28,44 @@ HYPRPM_RDEPEND="
app-alternatives/ninja
dev-build/cmake
dev-build/meson
+ dev-libs/libliftoff
dev-vcs/git
virtual/pkgconfig
"
-# 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_RDEPEND="
- >=dev-libs/libinput-1.14.0:=
- dev-libs/libliftoff
- >=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.118
- x11-libs/libxkbcommon
- >=x11-libs/pixman-0.42.0
- virtual/libudev:=
- X? (
- x11-base/xwayland
- x11-libs/libxcb:0=
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
-"
-WLROOTS_DEPEND="
- >=dev-libs/wayland-protocols-1.33
-"
-WLROOTS_BDEPEND="
- dev-util/glslang
- dev-util/wayland-scanner
-"
RDEPEND="
${HYPRPM_RDEPEND}
- ${WLROOTS_RDEPEND}
dev-cpp/tomlplusplus
dev-libs/glib:2
dev-libs/libinput
- dev-libs/wayland
- gui-libs/hyprcursor
+ >=dev-libs/wayland-1.20.0
+ gui-libs/aquamarine
+ >=gui-libs/hyprcursor-0.1.9
media-libs/libglvnd
x11-libs/cairo
x11-libs/libdrm
x11-libs/libxkbcommon
x11-libs/pango
x11-libs/pixman
+ x11-libs/libXcursor
X? (
x11-libs/libxcb:0=
+ x11-base/xwayland
+ x11-libs/xcb-util-errors
+ x11-libs/xcb-util-wm
)
"
DEPEND="
${RDEPEND}
- ${WLROOTS_DEPEND}
- dev-libs/hyprland-protocols
- dev-libs/hyprlang
- >=dev-libs/wayland-protocols-1.25
+ >=dev-libs/hyprland-protocols-0.3
+ >=dev-libs/hyprlang-0.3.2
+ >=dev-libs/wayland-protocols-1.36
+ >=gui-libs/hyprutils-0.2.1
"
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.8
virtual/pkgconfig
"
@@ -109,31 +83,18 @@ pkg_setup() {
fi
}
+src_prepare() {
+ # skip version.h
+ sed -i -e "s|scripts/generateVersion.sh|echo|g" meson.build || die
+ default
+}
+
src_configure() {
local emesonargs=(
$(meson_feature legacy-renderer legacy_renderer)
$(meson_feature systemd)
$(meson_feature X xwayland)
- $(meson_feature X wlroots:xwayland)
- -Dwlroots:backends=drm,libinput$(usev X ',x11')
- -Dwlroots:xcb-errors=disabled
)
meson_src_configure
}
-
-src_install() {
- # First install everything except wlroots to avoid conflicts.
- meson_src_install --skip-subprojects wlroots
- # Then install development files (mainly wlroots) for bug #916760.
- meson_src_install --tags devel
-
- # Wlroots headers are required by hyprland-plugins and the pkgconfig file expects
- # them to be in /usr/include/hyprland/wlroots, despite this they aren't installed there.
- # Ideally you could override includedir per subproject and the install tags would
- # be granular enough to only install headers. But its not requiring this.
- mkdir "${ED}"/usr/include/hyprland/wlroots || die
- mv "${ED}"/usr/include/wlr "${ED}"/usr/include/hyprland/wlroots || die
- # devel tag includes wlroots .pc and .a files still
- rm -rf "${ED}"/usr/$(get_libdir)/ || die
-}
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index 932052e219d2..087e0987105b 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -32,80 +32,52 @@ HYPRPM_RDEPEND="
dev-vcs/git
virtual/pkgconfig
"
-# 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_DEPEND="
- >=dev-libs/wayland-1.22
- media-libs/libglvnd
- || ( <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
- media-libs/libdisplay-info
- sys-apps/hwdata
- >=dev-libs/libinput-1.14.0:=
- sys-auth/seatd:=
- virtual/libudev:=
- X? (
- x11-libs/libxcb:=
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- x11-base/xwayland
- )
-"
-WLROOTS_RDEPEND="
- ${WLROOTS_DEPEND}
-"
-WLROOTS_BDEPEND="
- >=dev-libs/wayland-protocols-1.32
- dev-util/hyprwayland-scanner
- virtual/pkgconfig
-"
RDEPEND="
${HYPRPM_RDEPEND}
- ${WLROOTS_RDEPEND}
dev-cpp/tomlplusplus
dev-libs/glib:2
dev-libs/libinput
>=dev-libs/wayland-1.20.0
- >=gui-libs/hyprcursor-0.1.7
+ gui-libs/aquamarine
+ >=gui-libs/hyprcursor-0.1.9
media-libs/libglvnd
x11-libs/cairo
x11-libs/libdrm
x11-libs/libxkbcommon
x11-libs/pango
x11-libs/pixman
+ x11-libs/libXcursor
X? (
x11-libs/libxcb:0=
+ x11-base/xwayland
+ x11-libs/xcb-util-errors
+ x11-libs/xcb-util-wm
)
"
DEPEND="
${RDEPEND}
- ${WLROOTS_DEPEND}
- >=dev-libs/hyprland-protocols-0.2
+ >=dev-libs/hyprland-protocols-0.3
>=dev-libs/hyprlang-0.3.2
- >=dev-libs/wayland-protocols-1.34
+ >=dev-libs/wayland-protocols-1.36
+ >=gui-libs/hyprutils-0.2.1
"
BDEPEND="
- ${WLROOTS_BDEPEND}
- || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
+ || ( >=sys-devel/gcc-14:* >=sys-devel/clang-18:* )
app-misc/jq
dev-build/cmake
- dev-util/hyprwayland-scanner
+ >=dev-util/hyprwayland-scanner-0.3.8
virtual/pkgconfig
"
pkg_setup() {
[[ ${MERGE_TYPE} == binary ]] && return
- if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
- eerror "Hyprland requires >=sys-devel/gcc-13 to build"
+ if tc-is-gcc && ver_test $(gcc-version) -lt 14 ; then
+ eerror "Hyprland requires >=sys-devel/gcc-14 to build"
eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
die "GCC version is too old to compile Hyprland!"
- elif tc-is-clang && ver_test $(clang-version) -lt 16 ; then
- eerror "Hyprland requires >=sys-devel/clang-16 to build"
+ elif tc-is-clang && ver_test $(clang-version) -lt 18 ; then
+ eerror "Hyprland requires >=sys-devel/clang-18 to build"
eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
die "Clang version is too old to compile Hyprland!"
fi
@@ -116,26 +88,7 @@ src_configure() {
$(meson_feature legacy-renderer legacy_renderer)
$(meson_feature systemd)
$(meson_feature X xwayland)
- $(meson_feature X wlroots:xwayland)
- -Dwlroots:backends=drm,libinput$(usev X ',x11')
- -Dwlroots:xcb-errors=disabled
)
meson_src_configure
}
-
-src_install() {
- # First install everything except wlroots to avoid conflicts.
- meson_src_install --skip-subprojects wlroots
- # Then install development files (mainly wlroots) for bug #916760.
- meson_src_install --tags devel
-
- # Wlroots headers are required by hyprland-plugins and the pkgconfig file expects
- # them to be in /usr/include/hyprland/wlroots, despite this they aren't installed there.
- # Ideally you could override includedir per subproject and the install tags would
- # be granular enough to only install headers. But its not requiring this.
- mkdir "${ED}"/usr/include/hyprland/wlroots || die
- mv "${ED}"/usr/include/wlr "${ED}"/usr/include/hyprland/wlroots || die
- # devel tag includes wlroots .pc and .a files still
- rm -rf "${ED}"/usr/$(get_libdir)/ || die
-}
diff --git a/gui-wm/hyprland/metadata.xml b/gui-wm/hyprland/metadata.xml
index e894da71d007..5bea9a35e357 100644
--- a/gui-wm/hyprland/metadata.xml
+++ b/gui-wm/hyprland/metadata.xml
@@ -5,6 +5,10 @@
<email>julien@jroy.ca</email>
<name>Julien Roy</name>
</maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>johnmh@johnmh.me</email>
+ <name>John M. Harris, Jr.</name>
+ </maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-30 07:01:14 +0000