diff options
Diffstat (limited to 'gui-wm')
43 files changed, 796 insertions, 1045 deletions
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz Binary files differindex ea0b9aea46a2..e49781c77488 100644 --- a/gui-wm/Manifest.gz +++ b/gui-wm/Manifest.gz diff --git a/gui-wm/dwl/Manifest b/gui-wm/dwl/Manifest index 67cef888a453..c3786ce2aa63 100644 --- a/gui-wm/dwl/Manifest +++ b/gui-wm/dwl/Manifest @@ -1,5 +1,8 @@ DIST dwl-v0.5.tar.gz 57363 BLAKE2B 6dce89cbfa1aa1946983897bed5ac16619ac237e0f7092b588847315b849392b83643839dc5386c5bd73a36e5da55a281696a6ef13dcaec8345cb4e495c5e3b7 SHA512 7bd292559b0ecafc54bf1c1ba0c3b6b0417e8bd03bb0058f492b87295c92b50932e25621cc5f804c38ad06ffadad7bb8017872fade4a04bf617b1d4f1993aae8 -EBUILD dwl-0.5.ebuild 1465 BLAKE2B eca80af80978fe2d80de59f39daec8a923b6ec5d9bce6e19b08e453885e80c3852b3de3ab4f2612b8a8cd2d453adf4a312fb69a00c19414ff40690617d148f81 SHA512 efe1d7a11f10b4779aa87167f2422ef4c878c8546b1ed3557f0bc9ce61f0b1d6e56d784bbe6f646e6a885fdf85ddf7d959b4b37e7820e112af27f53f00211c89 -EBUILD dwl-9999-r1.ebuild 1451 BLAKE2B 7da77261c947a648319091376d23308d38887d502880a112766d34649e3788027eb548484ef7510b4511ceeef04a25733677bbe03fd39b26dff2ff3c79de6434 SHA512 a0737102d2484a1ed8cb8e83ddf450a47a3a4bbba379713d6ce5270c8fc08398022466f34323c3c9ec3a86862fc41a7f15ae240041f86cb86c1c654b62818f55 -EBUILD dwl-9999.ebuild 1451 BLAKE2B 90d98dbcbbfb432ab542a8ce130bd8646096a6a47454fd2b9eb281c0880754ab5afa6bd8034c5548ead7cb3b6fd7478e5bb75f3a41101ddc8b7f091acf615023 SHA512 d170795f1651f9fa4c8e5b4db6ab261203f44a0d510b5b71c4312bb3a5dcb605eb9933e8164041186aa53c6b0a3ba4803043c598d2b9b9adb41d04e0f2a6e5e2 -MISC metadata.xml 517 BLAKE2B 6705dda9af1df60cdfa76bd74ec7334354aaa56d701c86ab79e7fd21d2896f50498d71dd4d3349fa14874d2eb4e0a81e1b077db13a22e98791a55cd90b00cac7 SHA512 be8dad40e1c0441375b2c7233c3bb5db4e2bdb995eee13d116f437de1e646fd58185b4e36c783c02db79fd84e94a90b766802736187ac307c2e614c7b376eb04 +DIST dwl-v0.6.tar.gz 62677 BLAKE2B 01d010c7e5054c9a8ed0b2b03093e8eee8ff11555296819f2b42a54dd5f07507d9129e6eaf34521d5743bf172309472b52d9a0106b7badd545c75e922a115ef0 SHA512 5e5d7599438d4cdf632e7afaddb1d345c8131c9925e9e4d1b632ad52c4418b1db2c0ff6a2da4b5686607c79cf2598e26e8c7f4c8385be82b2c2355fa28c2e8fb +DIST dwl-v0.7.tar.gz 63510 BLAKE2B 643d09b805a7c14e486828acbe33f38c31bce2cc31455afb32351f685326016e8d0eddbcba15646d6ec3192c538ffe52dad97693a579ec8125d9537830b681b5 SHA512 d2ec9467bb7758ea52e0face555cb505624062eb66c8959b59e715b7d1c7bb74c649029f365c9bfd07d7b5806fdef018f555d7e64bd62e7e413ead45b5d73986 +EBUILD dwl-0.5-r1.ebuild 1588 BLAKE2B 500464dc26cca333d9e506363ba356d4e6772caec2001a29cb1eca59793258238e06aa682791395961e4c4a378504b6d99d1661c8724585a3b94910955c835b6 SHA512 e461e1bf39962269890465a3a4e2774b3d772613d559f7319357a91b2a891f5a82797483c1727f7f9877661af2accfc060659cd93dd72db54ad5d1175a2d2b7f +EBUILD dwl-0.6.ebuild 1468 BLAKE2B 9087b017a96ac34f437fc1abc7b3aeb7601e85afe715cc2b292d0f418ed560a9aee50159c699f493246c1c129180621e49466a516818a91b38178cd954199581 SHA512 292d747137180be2e598c6fbab1d1b3bfd9ce378c3302f6564a9c1b586de5b8bd6266d637b05e94b67722069bd919d07af39f605f317e0d2d86b2ad9bb156cd1 +EBUILD dwl-0.7.ebuild 1475 BLAKE2B 323ede1091cb06ca717a2770544bbea5da2098c3055033cc067bc37a24e829399437946ee1925a8c5d5ae7a0c3172858630a0ed85489e4ea85160a65c94bfa6b SHA512 eb312a24b339d19c12ebb54b549f0cb965337650aeb9954a2ab6b5868ed18581e2a96d0e04cc199b8e79fdaf9bf103dbb2535fbcd9709dbb747791d66fc3d7af +EBUILD dwl-9999.ebuild 1475 BLAKE2B 3a5444db4ae0ba53f6ca4f2bbc7bd4fa9b6088e40c6c4ee60f1d2b19b815e8ba7924828c990c9ad43c781bb91d25ec77f52ee9c2444e943e44d7fd7878aec261 SHA512 2be4d1959cf1db84d4301806d15ce931efccb902762bdf5cf47589c2c599fb4cc651715dc630c69d55679f92ae4c8d79ae539657a298f1576c0e676159a8eda4 +MISC metadata.xml 607 BLAKE2B 05185e10615acd19020f558e6d05305ea1df831ddb9703516bf8789108c2d5bc5d90ca75fd261674aa15f41be6518b49d45898866faa10848dafb0a28fada899 SHA512 c70b7a100380b1771385a7e398f256be391a2650df620499e43ead3acec46765c646c55671885a6bbfef7f3a87c488c135ec5f34c87bb4f2dfdb8f6c7a8f2ed8 diff --git a/gui-wm/dwl/dwl-0.5.ebuild b/gui-wm/dwl/dwl-0.5-r1.ebuild index d96014e0f6ec..f94a2aa83609 100644 --- a/gui-wm/dwl/dwl-0.5.ebuild +++ b/gui-wm/dwl/dwl-0.5-r1.ebuild @@ -6,7 +6,12 @@ EAPI=8 inherit savedconfig toolchain-funcs MY_P="${PN}-v${PV}" -WLROOTS_SLOT="0/17" + +WLROOTS_DEP=" + >=gui-libs/wlroots-0.17:=[libinput,session,X?] + <gui-libs/wlroots-0.18:= +" + if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git" inherit git-r3 @@ -19,7 +24,7 @@ if [[ ${PV} == *9999* ]]; then ;; 9999-r1) EGIT_BRANCH=wlroots-next - WLROOTS_SLOT="0/9999" + WLROOTS_DEP="~gui-libs/wlroots-9999:=[libinput,session,X?]" ;; esac else @@ -35,20 +40,25 @@ LICENSE="CC0-1.0 GPL-3+ MIT" SLOT="0" IUSE="X" -RDEPEND=" +CDEPEND=" + ${WLROOTS_DEP} dev-libs/libinput:= dev-libs/wayland - gui-libs/wlroots:${WLROOTS_SLOT}[libinput,session,X?] x11-libs/libxkbcommon X? ( x11-libs/libxcb:= x11-libs/xcb-util-wm ) " - +RDEPEND=" + ${CDEPEND} + X? ( + x11-base/xwayland + ) +" # uses <linux/input-event-codes.h> DEPEND=" - ${RDEPEND} + ${CDEPEND} sys-kernel/linux-headers " BDEPEND=" diff --git a/gui-wm/dwl/dwl-9999-r1.ebuild b/gui-wm/dwl/dwl-0.6.ebuild index 4c1020cf5d30..823944d46d13 100644 --- a/gui-wm/dwl/dwl-9999-r1.ebuild +++ b/gui-wm/dwl/dwl-0.6.ebuild @@ -1,31 +1,19 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit savedconfig toolchain-funcs -MY_P="${PN}-v${PV}" -WLROOTS_SLOT="0/18" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git" inherit git-r3 - - # 9999-r0: main (latest stable wlroots release) - # 9999-r1: wlroots-next (wlroots-9999) - case ${PVR} in - 9999) - EGIT_BRANCH=main - ;; - 9999-r1) - EGIT_BRANCH=wlroots-next - WLROOTS_SLOT="0/9999" - ;; - esac else - SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz" + MY_PV="${PV/_rc/-rc}" + MY_P="${PN}-v${MY_PV}" + SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi DESCRIPTION="dwm for Wayland" @@ -35,20 +23,32 @@ LICENSE="CC0-1.0 GPL-3+ MIT" SLOT="0" IUSE="X" -RDEPEND=" +if [[ ${PV} == 9999 ]]; then + COMMON_DEPEND="~gui-libs/wlroots-9999:=[libinput,session,X?]" +else + COMMON_DEPEND=" + >=gui-libs/wlroots-0.17:=[libinput,session,X?] + <gui-libs/wlroots-0.18:=" +fi + +COMMON_DEPEND+=" dev-libs/libinput:= dev-libs/wayland - gui-libs/wlroots:${WLROOTS_SLOT}[libinput,session,X?] x11-libs/libxkbcommon X? ( x11-libs/libxcb:= x11-libs/xcb-util-wm ) " - +RDEPEND=" + ${COMMON_DEPEND} + X? ( + x11-base/xwayland + ) +" # uses <linux/input-event-codes.h> DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} sys-kernel/linux-headers " BDEPEND=" diff --git a/gui-wm/dwl/dwl-0.7.ebuild b/gui-wm/dwl/dwl-0.7.ebuild new file mode 100644 index 000000000000..673657f8b653 --- /dev/null +++ b/gui-wm/dwl/dwl-0.7.ebuild @@ -0,0 +1,76 @@ +# Copyright 2022-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit savedconfig toolchain-funcs + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git" + inherit git-r3 +else + MY_PV="${PV/_rc/-rc}" + MY_P="${PN}-v${MY_PV}" + SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz" + S="${WORKDIR}/${MY_P}" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +fi + +DESCRIPTION="dwm for Wayland" +HOMEPAGE="https://codeberg.org/dwl/dwl" + +LICENSE="CC0-1.0 GPL-3+ MIT" +SLOT="0" +IUSE="X" + +if [[ ${PV} == 9999 ]]; then + COMMON_DEPEND="~gui-libs/wlroots-9999:=[libinput,session,X?]" +else + COMMON_DEPEND=" + >=gui-libs/wlroots-0.18:=[libinput,session,X?] + <gui-libs/wlroots-0.19:=" +fi + +COMMON_DEPEND+=" + dev-libs/libinput:= + dev-libs/wayland + x11-libs/libxkbcommon + X? ( + x11-libs/libxcb:= + x11-libs/xcb-util-wm + ) +" +RDEPEND=" + ${COMMON_DEPEND} + X? ( + x11-base/xwayland + ) +" +# uses <linux/input-event-codes.h> +DEPEND=" + ${COMMON_DEPEND} + sys-kernel/linux-headers +" +BDEPEND=" + >=dev-libs/wayland-protocols-1.32 + >=dev-util/wayland-scanner-1.23 + virtual/pkgconfig +" + +src_prepare() { + restore_config config.h + + default +} + +src_compile() { + emake PKG_CONFIG="$(tc-getPKG_CONFIG)" CC="$(tc-getCC)" \ + XWAYLAND="$(usev X -DXWAYLAND)" XLIBS="$(usev X "xcb xcb-icccm")" dwl +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install + dodoc CHANGELOG.md README.md + + save_config config.h +} diff --git a/gui-wm/dwl/dwl-9999.ebuild b/gui-wm/dwl/dwl-9999.ebuild index f54f72310522..55db23917d62 100644 --- a/gui-wm/dwl/dwl-9999.ebuild +++ b/gui-wm/dwl/dwl-9999.ebuild @@ -1,31 +1,19 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit savedconfig toolchain-funcs -MY_P="${PN}-v${PV}" -WLROOTS_SLOT="0/17" -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://codeberg.org/dwl/dwl.git" inherit git-r3 - - # 9999-r0: main (latest stable wlroots release) - # 9999-r1: wlroots-next (wlroots-9999) - case ${PVR} in - 9999) - EGIT_BRANCH=main - ;; - 9999-r1) - EGIT_BRANCH=wlroots-next - WLROOTS_SLOT="0/9999" - ;; - esac else - SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.gz" + MY_PV="${PV/_rc/-rc}" + MY_P="${PN}-v${MY_PV}" + SRC_URI="https://codeberg.org/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi DESCRIPTION="dwm for Wayland" @@ -35,25 +23,37 @@ LICENSE="CC0-1.0 GPL-3+ MIT" SLOT="0" IUSE="X" -RDEPEND=" +if [[ ${PV} == 9999 ]]; then + COMMON_DEPEND="~gui-libs/wlroots-9999:=[libinput,session,X?]" +else + COMMON_DEPEND=" + >=gui-libs/wlroots-0.19:=[libinput,session,X?] + <gui-libs/wlroots-0.20:=" +fi + +COMMON_DEPEND+=" dev-libs/libinput:= dev-libs/wayland - gui-libs/wlroots:${WLROOTS_SLOT}[libinput,session,X?] x11-libs/libxkbcommon X? ( x11-libs/libxcb:= x11-libs/xcb-util-wm ) " - +RDEPEND=" + ${COMMON_DEPEND} + X? ( + x11-base/xwayland + ) +" # uses <linux/input-event-codes.h> DEPEND=" - ${RDEPEND} + ${COMMON_DEPEND} sys-kernel/linux-headers " BDEPEND=" >=dev-libs/wayland-protocols-1.32 - dev-util/wayland-scanner + >=dev-util/wayland-scanner-1.23 virtual/pkgconfig " diff --git a/gui-wm/dwl/metadata.xml b/gui-wm/dwl/metadata.xml index 3d26f0e133bf..52a2184de8fb 100644 --- a/gui-wm/dwl/metadata.xml +++ b/gui-wm/dwl/metadata.xml @@ -7,7 +7,10 @@ <description>Additionally the upstream maintainer</description> </maintainer> <maintainer type="project" proxied="proxy"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> + <upstream> + <remote-id type="codeberg">dwl/dwl</remote-id> + </upstream> </pkgmetadata> diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest index be404b5942a6..bae12706e630 100644 --- a/gui-wm/gamescope/Manifest +++ b/gui-wm/gamescope/Manifest @@ -1,6 +1,8 @@ AUX gamescope-deprecated-stb.patch 634 BLAKE2B 33bd10dc41f9fdbbec12ea0bdec1cf8af8fc9bc499324f5f2f329c72273109fd82495a0f3d3ffb2954ee91eb106f7e36479716af6e8d2cfd76ef58c9074003d3 SHA512 56aceec2552868749a21c9ca06ac6b41da3bd901692b376e5691155c58861f941dbd5359f1e22bbe54fd14e061cd586fe06d0109a8a45a0ecf6049ea3a79663b -DIST gamescope-3.14.14.tar.gz 512146 BLAKE2B 908c8e02a55c454d4442c135769b59287568121c60e4e7a95266e09b42cdd78db5676dd691d0c58a2430d046de93947d2ef8b54ed93ea6820240ab7a21599ac4 SHA512 dfafa32ac736c50bf146bffbbe8288827047ae87a6f0d55038f5bd6705096133f384d940dfa5adf2bdd70991bd6469f4a083eb88273df447d253676cb3f2726c -DIST reshade-9fdbea6892f9959fdc18095d035976c574b268b7.tar.gz 1543894 BLAKE2B 5e2b643ffbbda3ad078deb075a6fada1d0a560c6d865b7febee6a8eaade83ec90db3c5a8f4130d27b6dfaa8ee7b899edd214c23c947678eed28fb8e7165d9bd2 SHA512 4565d094e1c2d53d5073b4976874665d38dcf7ca86e982e569cc76923eaa9187fa32a4385fc577a3a867d2917596e6377e5a023a34bc2d389ff899d5b69764fb -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 +DIST gamescope-3.15.5.tar.gz 570102 BLAKE2B 2c54af3e90b90cfffc158924d038a76914dc5a3fb51414f275d0478d6fdda4a898b822dba282e11285b0627b6449200acf7de57d238ebf681399abef82c0ca9b SHA512 bff5deaea7764d40e294b38ae210f58e3417faa097afd2b42c336a75914b91bfbeeec09d6af2ce24f2fe3071436c3ad81f8aadc735d7b6814083f990f5c6bcaa +DIST libliftoff-0.5.0.tar.gz 39076 BLAKE2B a5c35c734a5ba4049661ce336401bd88d393001d7c49786d486146998d39530c364f7752b53968f5ab48f5eb774fa9c4245087bdb016f459a729991377023f61 SHA512 ce808f6a087f1f629cfebef95bfc7e216a09fb409b96b3c9f6b84d9d986ce50c5d7bf5b45c68e8baa99566b3627d754c269855b6f4ec3be63ae7b9f5109d5f08 +DIST reshade-696b14cd6006ae9ca174e6164450619ace043283.tar.gz 1684777 BLAKE2B 3b2fcd1ed53dd6a8c459cf716697eec8a21f6fd9c25e4f6baa752e4226eaf35837e0f1595eef065a064bb0d76b1b067f643cd14ef896875448c99f57e10e6fb9 SHA512 7fe1fe07622efd90bd94e1755019ca47657acd07137669e00b97bf70017a58c1f699e3dec1c720caafd1296275c7a25fd2f4d6e478cebbdf48bd69f985a00cdf +DIST vkroots-5106d8a0df95de66cc58dc1ea37e69c99afc9540.tar.gz 352651 BLAKE2B bc6c7a4f5b4f810c4d87a6cef46e73adb292bc22ae9a40666a6c7c8ab0cbc1973af405b32a5c7a3d38623c92e5d41e8472dabb744fcf31cf29118b9684dcfc32 SHA512 726e65dd0bb322d537e985ba2e504c68ef1b474574f11a5b102edcb8a7b74a6d86dea132c3b11417399a00beff9163e7aad413a389cf6073ec44d5ce6175ffc5 +DIST wlroots-4bc5333a2cbba0b0b88559f281dbde04b849e6ef.tar.gz 629328 BLAKE2B c48ff80616a82529ea0b503204557a41be8f8ad8fb60d0f5ae155a237d97117f3551f7992957a03c08fec6374e2087483052712a173fd422c5236f619a16bc64 SHA512 60731f5ce90e061d674168d42c2d4e02766f85b8b1566611022fc930feb181d16906ac23e92f999c90fa6b48c769279520de12a9abeae20c5553b6ccdd31427e +EBUILD gamescope-3.15.5.ebuild 4194 BLAKE2B 277e26cb9e247c01a3ea7e2a169cfbce2cad4dab6f7f61bf1fb4247ea12520dad8e1c7bbdca61dedd0020b78fd21fb5fbc519dcd530523e3392bb838a5b7aad1 SHA512 264475c4a1e2808181128c16c672be0cb54de22629d2d8f6005e36e18281d197a42b6301545dd34b667f79b86df90f645ed4d4c3a4b218f9c93153249c907da3 +MISC metadata.xml 571 BLAKE2B 43906c35ed17ecb23361a342b4f935f39efa62db4ef2f4185bb49dca701304efa735e8785d6960cf9f0ce8ffd6a7b78f40cd7d7aaa843a914f220e988a122dec SHA512 ad4e74f9fdc00121e9c5fb5ed79d5cc3d271b4ff4c653f5791ebd26810a9c833a4e5d80e8a69cebb4c753caadc6284e1afa1ad826040e8fb3560985400c6b25f diff --git a/gui-wm/gamescope/gamescope-3.14.14.ebuild b/gui-wm/gamescope/gamescope-3.15.5.ebuild index dd27cbde375a..ea1b20937239 100644 --- a/gui-wm/gamescope/gamescope-3.14.14.ebuild +++ b/gui-wm/gamescope/gamescope-3.15.5.ebuild @@ -5,44 +5,40 @@ EAPI=8 inherit fcaps meson -RESHADE_COMMIT="9fdbea6892f9959fdc18095d035976c574b268b7" -WLROOTS_COMMIT="a5c9826e6d7d8b504b07d1c02425e6f62b020791" MY_PV=$(ver_rs 3 -) MY_PV="${MY_PV//_/-}" DESCRIPTION="Efficient micro-compositor for running games" HOMEPAGE="https://github.com/ValveSoftware/gamescope" +EGIT_SUBMODULES=( src/reshade subprojects/{libliftoff,vkroots,wlroots} ) + if [[ ${PV} == "9999" ]]; then EGIT_REPO_URI="https://github.com/ValveSoftware/${PN}.git" - # Prevent wlroots and other submodule from being pull - # Not messing with system packages - EGIT_SUBMODULES=( src/reshade ) inherit git-r3 else + RESHADE_COMMIT="696b14cd6006ae9ca174e6164450619ace043283" + LIBLIFTOFF_COMMIT="0.5.0" # Upstream points at this release. + VKROOTS_COMMIT="5106d8a0df95de66cc58dc1ea37e69c99afc9540" + WLROOTS_COMMIT="4bc5333a2cbba0b0b88559f281dbde04b849e6ef" SRC_URI=" https://github.com/ValveSoftware/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz + https://gitlab.freedesktop.org/emersion/libliftoff/-/releases/v${LIBLIFTOFF_COMMIT}/downloads/libliftoff-${LIBLIFTOFF_COMMIT}.tar.gz https://github.com/Joshua-Ashton/reshade/archive/${RESHADE_COMMIT}.tar.gz -> reshade-${RESHADE_COMMIT}.tar.gz + https://github.com/Joshua-Ashton/vkroots/archive/${VKROOTS_COMMIT}.tar.gz -> vkroots-${VKROOTS_COMMIT}.tar.gz https://github.com/Joshua-Ashton/wlroots/archive/${WLROOTS_COMMIT}.tar.gz -> wlroots-${WLROOTS_COMMIT}.tar.gz " KEYWORDS="~amd64" fi S="${WORKDIR}/${PN}-${MY_PV}" - LICENSE="BSD-2" SLOT="0" -IUSE="pipewire +wsi-layer" - -# For when wlroots 0.18 is released. -# =gui-libs/wlroots-0.18*[X,libinput(+)] +IUSE="avif libei pipewire +sdl +wsi-layer" RDEPEND=" - =dev-libs/libliftoff-0.4* - >=dev-libs/wayland-1.21 + >=dev-libs/wayland-1.23 gui-libs/libdecor - >=media-libs/libavif-1.0.0:= - >=media-libs/libdisplay-info-0.1.1 - media-libs/libsdl2[video,vulkan] + <media-libs/libdisplay-info-0.3:= media-libs/vulkan-loader sys-apps/hwdata sys-libs/libcap @@ -60,9 +56,14 @@ RDEPEND=" x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm + avif? ( >=media-libs/libavif-1.0.0:= ) + libei? ( dev-libs/libei ) pipewire? ( >=media-video/pipewire-0.3:= ) + sdl? ( media-libs/libsdl2[video,vulkan] ) wsi-layer? ( x11-libs/libxcb ) - +" +# For bundled wlroots. +RDEPEND+=" >=dev-libs/libinput-1.14.0:= media-libs/libglvnd media-libs/mesa[egl(+),gles2(+)] @@ -100,11 +101,17 @@ src_prepare() { default # ReShade is bundled as a git submodule, but it references an unofficial - # fork, so we cannot unbundle it. Symlink to its extracted sources. - # For 9999, use the bundled submodule. + # fork, so we cannot unbundle it. Upstream have requested that we do not + # unbundle libliftoff, vkroots, or wlroots. Symlink to the extracted sources + # when not using the git submodules in 9999. if [[ ${PV} != "9999" ]]; then - rmdir src/reshade || die - ln -snfT ../../reshade-${RESHADE_COMMIT} src/reshade || die + local dir name commit + for dir in "${EGIT_SUBMODULES[@]}"; do + rmdir "${dir}" || die + name=${dir##*/} + commit=${name^^}_COMMIT + ln -snfT "../../${name}-${!commit}" "${dir}" || die + done fi # SPIRV-Headers is required by ReShade. It is bundled as a git submodule but @@ -112,25 +119,26 @@ 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() { + # Disabling DRM backend is currently broken. + # https://github.com/ValveSoftware/gamescope/issues/1347 local emesonargs=( - --force-fallback-for= - -Dbenchmark=disabled - -Denable_openvr_support=false $(meson_feature pipewire) + -Ddrm_backend=enabled + $(meson_feature sdl sdl2_backend) + $(meson_feature avif avif_screenshots) + $(meson_feature libei input_emulation) $(meson_use wsi-layer enable_gamescope_wsi_layer) + -Denable_openvr_support=false + -Dbenchmark=disabled -Dwlroots:xcb-errors=disabled -Dwlroots:examples=false -Dwlroots:renderers=gles2,vulkan -Dwlroots:xwayland=enabled - -Dwlroots:backends=drm,libinput + -Dwlroots:backends=libinput -Dwlroots:session=enabled ) meson_src_configure diff --git a/gui-wm/gamescope/metadata.xml b/gui-wm/gamescope/metadata.xml index cc171105f9d8..1a847c302a36 100644 --- a/gui-wm/gamescope/metadata.xml +++ b/gui-wm/gamescope/metadata.xml @@ -9,6 +9,7 @@ <remote-id type="github">ValveSoftware/gamescope</remote-id> </upstream> <use> + <flag name="libei">Enable emulated input using <pkg>dev-libs/libei</pkg></flag> <flag name="pipewire">Enable screen capture via PipeWire</flag> <flag name="wsi-layer">Enable the WSI layer (required for HDR)</flag> </use> diff --git a/gui-wm/hikari/Manifest b/gui-wm/hikari/Manifest deleted file mode 100644 index 11da623bf669..000000000000 --- a/gui-wm/hikari/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST hikari-2.3.3.tar.gz 1022191 BLAKE2B 8b1d0f03460a170f2288c97790dc437a4bd4eafc6973e87c15ca44b1d032ab02ef1d75406fe15be6bb14f67c07945b16be47ec1e41d43b51961a1c69a4a67f9b SHA512 15b6244ef46b29ad069475e8fadbafb01a65c8f96d1f89dd315d36f79dfea9a542936a5472e42237000f506094c7e08be37961c92a7eeed31477f4ed548f39f3 -EBUILD hikari-2.3.3.ebuild 1422 BLAKE2B aaba09659364fe1a3a3633d7f973d98df4281832e183aa99393eb3ed32d58371072fe428e171e3f7b3c3f6f61fb1f6881cca1b4dbecf7c4b69d670460cb398f2 SHA512 a520800e4aaf52fc0c32f98ccc3b693e269a23dcbb485d562fe718e41a291e6562f656167f979b11f53b51f4bcc536447ea202f33ac1f4bd86bf9b1a75a449c7 -MISC metadata.xml 541 BLAKE2B 098ae61fbe9416820f64e69de7173d5b2f3141dd9a48447cf41f854faa1f0cfa83ee84850fc9e2fed380b1701adccfb1f2ad6cc794915e9c6042e10cbf796f9f SHA512 845ecfce2a6b0f8a0fb615939b1bb68eb0cd79f29a6e9ef3c84fe82ccc4bac4dc78ee3d9794a8d4f805f8cc5a0842535d82accac7dfee9743aa00f095a3e58bc diff --git a/gui-wm/hikari/hikari-2.3.3.ebuild b/gui-wm/hikari/hikari-2.3.3.ebuild deleted file mode 100644 index c48d402e9d2f..000000000000 --- a/gui-wm/hikari/hikari-2.3.3.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2019-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multiprocessing toolchain-funcs - -DESCRIPTION="Wayland compositor inspired by CWM" -HOMEPAGE="https://hikari.acmelabs.space/" -SRC_URI="https://hikari.acmelabs.space/releases/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X suid" - -COMMON_DEPEND=" - dev-libs/glib:2 - dev-libs/libinput:= - dev-libs/libucl - dev-libs/wayland - gui-libs/wlroots:0/15[X?] - sys-libs/pam - x11-libs/cairo - x11-libs/libxkbcommon - x11-libs/pango - x11-libs/pixman" -RDEPEND=" - ${COMMON_DEPEND} - x11-misc/xkeyboard-config" -DEPEND=" - ${COMMON_DEPEND} - dev-libs/wayland-protocols" -BDEPEND=" - dev-util/wayland-scanner - dev-build/bmake - virtual/pkgconfig" - -src_compile() { - tc-export CC PKG_CONFIG - - local bmake=( - bmake -j$(makeopts_jobs) - ETC_PREFIX="${EPREFIX}" - CFLAGS_EXTRA="${CFLAGS} ${CPPFLAGS}" - LDFLAGS_EXTRA="${LDFLAGS}" - VERSION=${PV} - -DWITH_GAMMACONTROL - -DWITH_LAYERSHELL - -DWITH_POSIX_C_SOURCE - -DWITH_SCREENCOPY - -DWITH_VIRTUAL_INPUT - $(usev X -DWITH_XWAYLAND) - ) - - # empty flags to avoid duplicates (some parts use only _EXTRA, others both) - echo "${bmake[*]}" - CFLAGS= LDFLAGS= "${bmake[@]}" || die -} - -src_install() { - local bmake=( - bmake install - DESTDIR="${D}" - PREFIX="${EPREFIX}"/usr - ETC_PREFIX="${EPREFIX}" - $(usev suid -DWITH_SUID) - ) - - echo "${bmake[*]}" - "${bmake[@]}" || die -} diff --git a/gui-wm/hikari/metadata.xml b/gui-wm/hikari/metadata.xml deleted file mode 100644 index ad8d6bb1c67c..000000000000 --- a/gui-wm/hikari/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription> - Hikari is a minimalistic wayland window manager - based on wlroots trying inspired by the simplicity - of CWM in the X days. It aims stay out of your way - and focus more on the task than the windows. - </longdescription> - <use> - <flag name="X">Enable support for X11 applications (XWayland)</flag> - </use> -</pkgmetadata> diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest index 7d3f59c19826..4eab4fd9314e 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.42.0.gh.tar.gz 54225438 BLAKE2B a947289c5568408d71383034a290f114b974f442ed1f56ac3ec30e49519ee886ac83e1f2611577a7240a555480a59bc01defb79b2aca2122ef0d81ea007f5486 SHA512 839916957abc867ad9a3a32b6f74830055060b99c4c1de314f71a85f8d55ef051c5adb7c79dd7a7e10f81d1130aa032458bb65ce2454198a79faa719021f66af +DIST hyprland-0.43.0.gh.tar.gz 54388932 BLAKE2B 610afadde6e56cb576d96c1d704327534d3ab50e69b091e9b44e9f901dbdfcd38f8a3c6a40f7fd3e843e5dda884ea1e93a24e085446861104019be9489a0a666 SHA512 521adcfb9ef55d5ad45192566856c20619942e8229f41400d2534531458dd3e54673b9dd3a0c3360280ccaaf35f5ac48393553a8549f147b701aa26522cec37b +DIST hyprland-0.44.1.gh.tar.gz 54398098 BLAKE2B ab5b52fa27591ad1f6db524663a85c2eb3f1137c8a55d6eaad9a41837fe057d6a92a75fb3bec930693a10311e3b82488ff94af86f4c2d58557879bffea02426f SHA512 2ffa16a180ec9f9e6b20481b0724e24524a499f7a224f72598426a6630c675632f2447a2f7dfd4609e8da9a86dda7919e40002a91dc917af2541e639fb4d542d +EBUILD hyprland-0.42.0-r1.ebuild 2356 BLAKE2B c2d0a4a9a15396bc685ce985f6371ac63625390ffd1b7c8fde772118e45763abe282e8ec21949202016b11eaf597b1ad2284417812ce38e3c0b03da217ad3324 SHA512 b9f14ea6b456f75c0b4bbefc9fb827c5a47bde06f6ec4d034c2325da8dabb488bbe369357f3b5a9e4e2a75279773cc70680d27cf1a8293d5c8d6fc4b082bae1b +EBUILD hyprland-0.43.0.ebuild 2336 BLAKE2B 7a14a81112b3a395f55a8ed231e808a344b28b844604a0392edb7cc9fbe798447196179f9d6a7b1549b269c19b716d161447e661c3a5d2dd0a8b2f92604ade51 SHA512 a036e20ec541a5722c2a1d5eaed8441c885e13f95384c1904b7175d128273bdb1f929caa8a257515aa86c1b9b42b799808ab60140ae4400a25f2e62cfb5ac078 +EBUILD hyprland-0.44.1.ebuild 2378 BLAKE2B 204ba37efcef9681c991416731ec4b3d6c113a71816dc19a57d1d27faba073fe08fcc0244861ad328574bb95bf747878ca31f654d5cbb02527c56b8de5314e0f SHA512 5f84e28ba96c95ad4f28c83caa9765f4df63b6b0a33a2b20d4524dedd2d5633aff5fe0422bda62857e1002078ca7a939433e9ab7a37ab3c1ad93354205c196e6 +EBUILD hyprland-9999.ebuild 2264 BLAKE2B f398446912ba64786f0854e1acac59e9f83e3ee507991e8185adb6c6bd16f922295ced97f322e00d60d3a98fb6d46941b72c886c2ecab6d7a33503c44ad1b7f8 SHA512 3c81f342cfb1fbbc3b6c680e73c91c57557b1bb0204fce9a776cc050f5b2e4a3b2d98cab3c167f98ea0b173b2b01d65900be38b05be013e7c222c42bf8c2b63b +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.39.1-r2.ebuild deleted file mode 100644 index ace618c16dda..000000000000 --- a/gui-wm/hyprland/hyprland-0.39.1-r2.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson toolchain-funcs - -DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks" -HOMEPAGE="https://github.com/hyprwm/Hyprland" - -if [[ "${PV}" = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git" -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" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="X legacy-renderer systemd" - -# hyprpm (hyprland plugin manager) requires the dependencies at runtime -# so that it can clone, compile and install plugins. -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_DEPEND=" - >=dev-libs/wayland-1.22 - media-libs/libglvnd - media-libs/mesa[egl(+),gles2] - >=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/wayland-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 - media-libs/libglvnd - x11-libs/cairo - x11-libs/libdrm - x11-libs/libxkbcommon - x11-libs/pango - x11-libs/pixman - X? ( - x11-libs/libxcb:0= - ) -" -DEPEND=" - ${RDEPEND} - ${WLROOTS_DEPEND} - >=dev-libs/hyprland-protocols-0.2 - >=dev-libs/hyprlang-0.3.2 - >=dev-libs/wayland-protocols-1.32 -" -BDEPEND=" - ${WLROOTS_BDEPEND} - || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* ) - app-misc/jq - dev-build/cmake - dev-util/wayland-scanner - 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 - - if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then - eerror "Hyprland requires >=sys-devel/gcc-13 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" - eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" - die "Clang version is too old to compile Hyprland!" - fi -} - -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-0.40.0.ebuild b/gui-wm/hyprland/hyprland-0.40.0.ebuild deleted file mode 100644 index 0893dbca86c0..000000000000 --- a/gui-wm/hyprland/hyprland-0.40.0.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson toolchain-funcs - -DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks" -HOMEPAGE="https://github.com/hyprwm/Hyprland" - -if [[ "${PV}" = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git" -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" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="X legacy-renderer systemd" - -# hyprpm (hyprland plugin manager) requires the dependencies at runtime -# so that it can clone, compile and install plugins. -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_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 - media-libs/libglvnd - x11-libs/cairo - x11-libs/libdrm - x11-libs/libxkbcommon - x11-libs/pango - x11-libs/pixman - X? ( - x11-libs/libxcb:0= - ) -" -DEPEND=" - ${RDEPEND} - ${WLROOTS_DEPEND} - >=dev-libs/hyprland-protocols-0.2 - >=dev-libs/hyprlang-0.3.2 - >=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/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 - - if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then - eerror "Hyprland requires >=sys-devel/gcc-13 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" - eerror "Please upgrade Clang: emerge -v1 sys-devel/clang" - die "Clang version is too old to compile Hyprland!" - fi -} - -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-0.37.1.ebuild b/gui-wm/hyprland/hyprland-0.42.0-r1.ebuild index e4a269ccec3e..5d99847819ad 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-0.43.0.ebuild b/gui-wm/hyprland/hyprland-0.43.0.ebuild new file mode 100644 index 000000000000..dbc6bd85587e --- /dev/null +++ b/gui-wm/hyprland/hyprland-0.43.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson toolchain-funcs + +DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks" +HOMEPAGE="https://github.com/hyprwm/Hyprland" + +if [[ "${PV}" = *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git" +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" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="X legacy-renderer systemd" + +# hyprpm (hyprland plugin manager) requires the dependencies at runtime +# so that it can clone, compile and install plugins. +HYPRPM_RDEPEND=" + app-alternatives/ninja + dev-build/cmake + dev-build/meson + dev-vcs/git + virtual/pkgconfig +" +RDEPEND=" + ${HYPRPM_RDEPEND} + dev-cpp/tomlplusplus + dev-libs/glib:2 + dev-libs/libinput + >=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} + >=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=" + || ( >=sys-devel/gcc-14:* >=sys-devel/clang-18:* ) + app-misc/jq + dev-build/cmake + >=dev-util/hyprwayland-scanner-0.3.8 + virtual/pkgconfig +" + +pkg_setup() { + [[ ${MERGE_TYPE} == binary ]] && return + + 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 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 +} + +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_src_configure +} diff --git a/gui-wm/hyprland/hyprland-0.44.1.ebuild b/gui-wm/hyprland/hyprland-0.44.1.ebuild new file mode 100644 index 000000000000..cab0caee888f --- /dev/null +++ b/gui-wm/hyprland/hyprland-0.44.1.ebuild @@ -0,0 +1,100 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson toolchain-funcs + +DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks" +HOMEPAGE="https://github.com/hyprwm/Hyprland" + +if [[ "${PV}" = *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git" +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" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="X legacy-renderer systemd" + +# hyprpm (hyprland plugin manager) requires the dependencies at runtime +# so that it can clone, compile and install plugins. +HYPRPM_RDEPEND=" + app-alternatives/ninja + >=dev-build/cmake-3.30 + dev-build/meson + dev-vcs/git + virtual/pkgconfig +" +RDEPEND=" + ${HYPRPM_RDEPEND} + dev-cpp/tomlplusplus + dev-libs/glib:2 + dev-libs/libinput + >=dev-libs/udis86-1.7.2 + >=dev-libs/wayland-1.22.90 + >=gui-libs/aquamarine-0.4.2 + >=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} + >=dev-libs/hyprland-protocols-0.4 + >=dev-libs/hyprlang-0.3.2 + >=dev-libs/wayland-protocols-1.36 + >=gui-libs/hyprutils-0.2.3 +" +BDEPEND=" + || ( >=sys-devel/gcc-14:* >=sys-devel/clang-18:* ) + app-misc/jq + dev-build/cmake + >=dev-util/hyprwayland-scanner-0.3.10 + virtual/pkgconfig +" + +pkg_setup() { + [[ ${MERGE_TYPE} == binary ]] && return + + 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 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 +} + +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_src_configure +} diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild index 932052e219d2..81ad1724da92 100644 --- a/gui-wm/hyprland/hyprland-9999.ebuild +++ b/gui-wm/hyprland/hyprland-9999.ebuild @@ -26,86 +26,58 @@ IUSE="X legacy-renderer systemd" # so that it can clone, compile and install plugins. HYPRPM_RDEPEND=" app-alternatives/ninja - dev-build/cmake + >=dev-build/cmake-3.30 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_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 + >=dev-libs/udis86-1.7.2 + >=dev-libs/wayland-1.22.90 + >=gui-libs/aquamarine-0.4.2 + >=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.4 >=dev-libs/hyprlang-0.3.2 - >=dev-libs/wayland-protocols-1.34 + >=dev-libs/wayland-protocols-1.36 + >=gui-libs/hyprutils-0.2.3 " 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.10 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> diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest index 76d4017be40b..66d5f7ac8d74 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 2604 BLAKE2B 30b11f23111326ec38b54bb67b222b712cd9929b4a7fbb3b83ab69751358b21f89e38de0f49e4cee4cc2c6cecfeb05f2e19978cf34f35efa84d6034f5c79445b SHA512 458f99b52201846dfe23173066a85bf1f165861b63a888b42c4e2fb8e6cddf7b14e8b96f04b411f66a04a03ddb8875f7f6ac21afc3b5105c304e459596bcaf8b +EBUILD sway-1.9-r1.ebuild 2675 BLAKE2B 24bebac0e03fb711ca35ef9f1573cbc6e93e328b44ecdc4c820d8eb1547f20ea282b7d47e80bbba1ac880ad4f47da30303aa8c9bca76e1ef40fdd0dcaccf13ff SHA512 2400edfa580ecce14f2fdc2e825557d682b21bbd5dadf609d10e0769b3dcb1007ba75aed3b6c311dc6ec8fada33ccd5720d84d2a640dafd3032b5a483fc85295 +EBUILD sway-9999.ebuild 2559 BLAKE2B 03f1fb476824cf29bfc7a4440c1a11bc4fe04f25288fd14a70f110e2fa14d030466d9044c067c889a2e13f4a00887b9fda52c95bbf2e76e8d4dc17c10368de6d SHA512 e50ec884d098e1e6e44ec836f62a11a500963c8498f07525d4ecac37e6d051377a49f755d30c046a377145e17b89031cdd48ce615271f2b8707bc51067e5e991 MISC metadata.xml 1721 BLAKE2B 39795f8d7c4a736141417e267e2c4645f4f963107c47516747c7fbc1643ed2e9787812c5571369b795e3648d4801dff32c062bf2db6d80ce79735d1be65b8ac8 SHA512 458d2adb61ecb91cc9d589409c69bffa7dee51328a557567e66c21eeff7e23eadaf36a04ca9fae32aa9d6edf1e28fa1bcba62f3e185699a8c08785f84977bb88 diff --git a/gui-wm/sway/sway-1.9.ebuild b/gui-wm/sway/sway-1.9-r1.ebuild index 85c49a9b40ca..d9a62c2120ec 100644 --- a/gui-wm/sway/sway-1.9.ebuild +++ b/gui-wm/sway/sway-1.9-r1.ebuild @@ -34,7 +34,7 @@ DEPEND=" >=x11-libs/libxkbcommon-1.5.0:0= x11-libs/pango x11-libs/pixman - media-libs/mesa[gles2,libglvnd(+)] + media-libs/libglvnd swaybar? ( x11-libs/gdk-pixbuf:2 ) tray? ( || ( sys-apps/systemd diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild index a23327214abb..44eee21b7432 100644 --- a/gui-wm/sway/sway-9999.ebuild +++ b/gui-wm/sway/sway-9999.ebuild @@ -34,7 +34,7 @@ DEPEND=" >=x11-libs/libxkbcommon-1.5.0:0= x11-libs/pango x11-libs/pixman - media-libs/mesa[gles2,libglvnd(+)] + media-libs/libglvnd swaybar? ( x11-libs/gdk-pixbuf:2 ) tray? ( || ( sys-apps/systemd @@ -75,7 +75,6 @@ src_configure() { local emesonargs=( $(meson_feature man man-pages) $(meson_feature tray) - $(meson_feature X xwayland) $(meson_feature swaybar gdk-pixbuf) $(meson_use swaynag) $(meson_use swaybar) diff --git a/gui-wm/tinywl/Manifest b/gui-wm/tinywl/Manifest new file mode 100644 index 000000000000..f6388724cadd --- /dev/null +++ b/gui-wm/tinywl/Manifest @@ -0,0 +1,9 @@ +AUX tinywl-0.17.4-improve-makefile.patch 3033 BLAKE2B 8a269dfc866a72d57d028dc42296228c244d9388c20f3c20ca3e7f3f13bdfe1ed212a342fa5418954c3763f7233a1fca7ec5614571d03a15b579635e451fa104 SHA512 18a3aca714781615355acf97f2bbcd0d223a7facee2c4444b785c16dd185010f899dde7a3763c8d9e55f2dc1ab6d0b949523c05f7fe18b7e349c61f64cf3be52 +DIST wlroots-0.17.4.tar.gz 609179 BLAKE2B dc5a7749533ab54631d4a26be554b86e5b08b2472cf8f22ccebddb319d571cbd98a5c56e64e7bc762a5918d4272eb6b4261050288f3053c18c824c6a9c32b96b SHA512 35803df9fe68cadb0b9b5e522863535407ba2354ed1ca8f824a9c40b64698a97c579fec0afeb444b05d429adc1e3dfc45b20c3a1b7a2004e4f5a10d2305c9116 +DIST wlroots-0.18.0.tar.gz 628190 BLAKE2B b1d725e0397365b69afce24baf5376057a40d225f7cb06ccd5abde3b3da8d5401a6eb5d57ab65154a6faf7961473039833e558e3b25da1210891d34667da5bf9 SHA512 2cf848aa67f41089b60cc7d01c3a344ebaf7f5bbced459675fef885cd4b3e6b99d9a49d6b127518314d0ae38e52e9aff7991611592b2add4cba96f15aa0bf1c6 +DIST wlroots-0.18.1.tar.gz 628648 BLAKE2B 051909ef4cac4c523bb43b42396abe8c18e3835a7a29bde30787829040271720f06579dadf3f03d9569bcc1e25492c6bd383f314aaa10b63c597f08735d30537 SHA512 c4d83ae75aec4f7f4e8aefbff27594d0962c56c4a3a3ef2d7ccd432f92eb56df7edb995cc0fa1f62d9290e988f20e7525d007717f36ce4824dfc41061a697fbb +EBUILD tinywl-0.17.4.ebuild 1126 BLAKE2B 89f55f5cb9febeda4f768b36c8ce89bf9ef4a27c57c61c99655a7f5049c7b288f0c3575ad1d87bd7d78b8e7a4c3f7211f397c58405bf73ed3dc50d737f06659c SHA512 7effcd5ce1168c129ed64f64422cf063abc6852c8df2864cbddbc113c2a7ddf93753ec2bed2a1db243dc436186bc877c0097e6997d44b50224f33c7daba6d959 +EBUILD tinywl-0.18.0.ebuild 1008 BLAKE2B 52bda1696bed42827bba93ee59fea3ebc313fad6d579705009a973134a7cce29f7a7a85b865367c4d3c144c0539a10ed51ad390afadb59152cccaa61d81522ca SHA512 d7707b6a8a935972186797122886652ce9b18ab3db7a06c95d240cab02eb92f4e954c0f748e6a6b444f5b664550db652c6f1b9ba1634844a088c6b01c7cc6caf +EBUILD tinywl-0.18.1.ebuild 1011 BLAKE2B 286aa7111615bd9af8e9f6f03ef830cfedfe223f71720080998074b7d3736cd1eb880b8c35638f5dbd9600a1974c1e34303a862a02d809cd2b035e4173a85ddd SHA512 016b92d65d57ca8854c8c987cdf5b46f75bc1f693902a3417d4f894cfce37c453df874f36bc3e777f590aad59156f8ee548a5619ff189f0932f319673ca1fdb0 +EBUILD tinywl-9999.ebuild 1011 BLAKE2B 286aa7111615bd9af8e9f6f03ef830cfedfe223f71720080998074b7d3736cd1eb880b8c35638f5dbd9600a1974c1e34303a862a02d809cd2b035e4173a85ddd SHA512 016b92d65d57ca8854c8c987cdf5b46f75bc1f693902a3417d4f894cfce37c453df874f36bc3e777f590aad59156f8ee548a5619ff189f0932f319673ca1fdb0 +MISC metadata.xml 505 BLAKE2B dceb764d020ca749f5f5c82b310b2357ec234b93afe377b1b8bcff210c9cc85300bcae834d0a7b772a76378f28edae24d6b5c12eaaa00795ff0ffb4c486ae2e4 SHA512 c142b3f1637209f1f43fcb4123435cf10e643fabff9473f98aa754bca3fe6dc8cec66851d2086658e56191919455eae3ed7d5ef3fa0d85391d1c7b82045b2787 diff --git a/gui-wm/tinywl/files/tinywl-0.17.4-improve-makefile.patch b/gui-wm/tinywl/files/tinywl-0.17.4-improve-makefile.patch new file mode 100644 index 000000000000..2537955f7b12 --- /dev/null +++ b/gui-wm/tinywl/files/tinywl-0.17.4-improve-makefile.patch @@ -0,0 +1,84 @@ +https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4710 +From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= + <leohdz172@proton.me> +Date: Wed, 12 Jun 2024 10:01:52 -0600 +Subject: [PATCH 1/2] tinywl: split compilation into two steps +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +While we are at it also respect LDFLAGS and optimize pkg-config usage + +Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me> +--- a/tinywl/Makefile ++++ b/tinywl/Makefile +@@ -1,9 +1,9 @@ + WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols) + WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner) +-LIBS=\ +- $(shell pkg-config --cflags --libs "wlroots >= 0.17.0") \ +- $(shell pkg-config --cflags --libs wayland-server) \ +- $(shell pkg-config --cflags --libs xkbcommon) ++ ++PKGS="wlroots" wayland-server xkbcommon ++CFLAGS+=$(shell pkg-config --cflags $(PKGS)) ++LIBS=$(shell pkg-config --libs $(PKGS)) + + # wayland-scanner is a tool which generates C headers and rigging for Wayland + # protocols, which are specified in XML. wlroots requires you to rig these up +@@ -12,15 +12,13 @@ xdg-shell-protocol.h: + $(WAYLAND_SCANNER) server-header \ + $(WAYLAND_PROTOCOLS)/stable/xdg-shell/xdg-shell.xml $@ + +-tinywl: tinywl.c xdg-shell-protocol.h +- $(CC) $(CFLAGS) \ +- -g -Werror -I. \ +- -DWLR_USE_UNSTABLE \ +- -o $@ $< \ +- $(LIBS) ++tinywl.o: tinywl.c xdg-shell-protocol.h ++ $(CC) -g -Werror $(CFLAGS) -I. -DWLR_USE_UNSTABLE -o $@ -c $< ++tinywl: tinywl.o ++ $(CC) $< -g -Werror $(CFLAGS) $(LDFLAGS) $(LIBS) -o $@ + + clean: +- rm -f tinywl xdg-shell-protocol.h xdg-shell-protocol.c ++ rm -f tinywl tinywl.o xdg-shell-protocol.h + + .DEFAULT_GOAL=tinywl + .PHONY: clean +-- +2.45.2 + + +From 29451c3dd28ffd52eb3dcf20e47399a26ecafb3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= + <leohdz172@proton.me> +Date: Wed, 12 Jun 2024 17:58:54 -0600 +Subject: [PATCH 2/2] tinywl: allow specify pkg-config binary +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me> +--- a/tinywl/Makefile ++++ b/tinywl/Makefile +@@ -1,9 +1,10 @@ +-WAYLAND_PROTOCOLS=$(shell pkg-config --variable=pkgdatadir wayland-protocols) +-WAYLAND_SCANNER=$(shell pkg-config --variable=wayland_scanner wayland-scanner) ++PKG_CONFIG?=pkg-config ++WAYLAND_PROTOCOLS=$(shell $(PKG_CONFIG) --variable=pkgdatadir wayland-protocols) ++WAYLAND_SCANNER=$(shell $(PKG_CONFIG) --variable=wayland_scanner wayland-scanner) + +-PKGS="wlroots" wayland-server xkbcommon +-CFLAGS+=$(shell pkg-config --cflags $(PKGS)) +-LIBS=$(shell pkg-config --libs $(PKGS)) ++PKGS=wlroots wayland-server xkbcommon ++CFLAGS+=$(shell $(PKG_CONFIG) --cflags $(PKGS)) ++LIBS=$(shell $(PKG_CONFIG) --libs $(PKGS)) + + # wayland-scanner is a tool which generates C headers and rigging for Wayland + # protocols, which are specified in XML. wlroots requires you to rig these up +-- +2.45.2 + diff --git a/gui-wm/tinywl/metadata.xml b/gui-wm/tinywl/metadata.xml new file mode 100644 index 000000000000..c478e8b9eaf9 --- /dev/null +++ b/gui-wm/tinywl/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>leohdz172@proton.me</email> + <name>Leonardo Hernández Hernández</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <upstream> + <remote-id type="freedesktop-gitlab">wlroots/wlroots</remote-id> + </upstream> +</pkgmetadata> diff --git a/gui-wm/tinywl/tinywl-0.17.4.ebuild b/gui-wm/tinywl/tinywl-0.17.4.ebuild new file mode 100644 index 000000000000..85a3a9dd1b37 --- /dev/null +++ b/gui-wm/tinywl/tinywl-0.17.4.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="\"minimum viable product\" Wayland compositor based on wlroots" +HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/wlroots/wlroots.git" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${PV}/downloads/wlroots-${PV}.tar.gz" + KEYWORDS="amd64 arm64 ppc64 ~riscv ~x86" + S="${WORKDIR}/wlroots-${PV}" +fi + +LICENSE="CC0-1.0" +SLOT="0" +DEPEND=" + dev-libs/wayland + x11-libs/libxkbcommon + =gui-libs/wlroots-$(ver_cut 1-2)*:= +" +RDEPEND=" + ${DEPEND} + !gui-libs/wlroots[tinywl(-)] +" +BDEPEND=" + dev-libs/wayland-protocols + dev-util/wayland-scanner + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}/${P}"-improve-makefile.patch ) + +src_prepare() { + default + sed -i -e "s/-Werror //" tinywl/Makefile || die +} + +src_compile() { + local -x CFLAGS="${CFLAGS} ${CPPFLAGS}" + tc-export CC PKG_CONFIG + emake -C tinywl +} + +src_install() { + dodoc tinywl/README.md + dobin tinywl/tinywl +} diff --git a/gui-wm/tinywl/tinywl-0.18.0.ebuild b/gui-wm/tinywl/tinywl-0.18.0.ebuild new file mode 100644 index 000000000000..706d1f95c099 --- /dev/null +++ b/gui-wm/tinywl/tinywl-0.18.0.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="\"minimum viable product\" Wayland compositor based on wlroots" +HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots/-/tree/master/tinywl" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/wlroots/wlroots.git" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${PV}/downloads/wlroots-${PV}.tar.gz" + KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~x86" + S="${WORKDIR}/wlroots-${PV}" +fi + +LICENSE="CC0-1.0" +SLOT="0" +DEPEND=" + dev-libs/wayland + x11-libs/libxkbcommon + =gui-libs/wlroots-$(ver_cut 1-2)*:= +" +RDEPEND=" + ${DEPEND} + !gui-libs/wlroots[tinywl(-)] +" +BDEPEND=" + dev-libs/wayland-protocols + dev-util/wayland-scanner + virtual/pkgconfig +" + +src_prepare() { + sed -i -e "s/-Werror //" tinywl/Makefile || die + default +} + +src_compile() { + emake -C tinywl +} + +src_install() { + dodoc tinywl/README.md + dobin tinywl/tinywl +} diff --git a/gui-wm/tinywl/tinywl-0.18.1.ebuild b/gui-wm/tinywl/tinywl-0.18.1.ebuild new file mode 100644 index 000000000000..a08f405dff3d --- /dev/null +++ b/gui-wm/tinywl/tinywl-0.18.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="\"minimum viable product\" Wayland compositor based on wlroots" +HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots/-/tree/master/tinywl" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/wlroots/wlroots.git" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${PV}/downloads/wlroots-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" + S="${WORKDIR}/wlroots-${PV}" +fi + +LICENSE="CC0-1.0" +SLOT="0" +DEPEND=" + dev-libs/wayland + x11-libs/libxkbcommon + =gui-libs/wlroots-$(ver_cut 1-2)*:= +" +RDEPEND=" + ${DEPEND} + !gui-libs/wlroots[tinywl(-)] +" +BDEPEND=" + dev-libs/wayland-protocols + dev-util/wayland-scanner + virtual/pkgconfig +" + +src_prepare() { + sed -i -e "s/-Werror //" tinywl/Makefile || die + default +} + +src_compile() { + emake -C tinywl +} + +src_install() { + dodoc tinywl/README.md + dobin tinywl/tinywl +} diff --git a/gui-wm/tinywl/tinywl-9999.ebuild b/gui-wm/tinywl/tinywl-9999.ebuild new file mode 100644 index 000000000000..a08f405dff3d --- /dev/null +++ b/gui-wm/tinywl/tinywl-9999.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="\"minimum viable product\" Wayland compositor based on wlroots" +HOMEPAGE="https://gitlab.freedesktop.org/wlroots/wlroots/-/tree/master/tinywl" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/wlroots/wlroots.git" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/wlroots/wlroots/-/releases/${PV}/downloads/wlroots-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" + S="${WORKDIR}/wlroots-${PV}" +fi + +LICENSE="CC0-1.0" +SLOT="0" +DEPEND=" + dev-libs/wayland + x11-libs/libxkbcommon + =gui-libs/wlroots-$(ver_cut 1-2)*:= +" +RDEPEND=" + ${DEPEND} + !gui-libs/wlroots[tinywl(-)] +" +BDEPEND=" + dev-libs/wayland-protocols + dev-util/wayland-scanner + virtual/pkgconfig +" + +src_prepare() { + sed -i -e "s/-Werror //" tinywl/Makefile || die + default +} + +src_compile() { + emake -C tinywl +} + +src_install() { + dodoc tinywl/README.md + dobin tinywl/tinywl +} diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest index 403e745e54d8..021ce4ddf8a5 100644 --- a/gui-wm/wayfire/Manifest +++ b/gui-wm/wayfire/Manifest @@ -1,14 +1,11 @@ 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-0.8.1-fix-gcc-15.patch 286 BLAKE2B 43dc74d3cdec6102d6c89f70736066c4db122a900c7211496639b1612d8dbe6380fda30d373fe4d6b0a3e49c19695538e5607eb68683278f1094eaa7732c17e6 SHA512 a8d1d2775e0a1b664551f3bf861f360e079ccbc49fe1a4cd453c8a200d68f719bd6a5bf8df9e64b3612b537545d181f9deac9d0ad93b601937d116e87823609c 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-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 +DIST wayfire-0.9.0.tar.xz 875584 BLAKE2B d7f07d7ff8a54437dc5b69e27dcfadecbd3426993e88f68f4af376bbbde08c8ea76646a361d4228ae8ee21e03c3ebe5562b80ec9d3aecde03fb653135fec8645 SHA512 572bfbe1821490842eae33285a0a5607f70b96b0d5b994246ffe6f0bd74ef03d8d699f3f429bff4d376a0a9390312aa67332e8f614fefa2400e0b844b2d74ab9 +EBUILD wayfire-0.8.1-r2.ebuild 2316 BLAKE2B ec956dc6cf1cf0b6cfb9e52d66c339e3610573162b69fd430d99b22f5eba9e95693ee4ca78756e8912b4a2430ac07ae5f11bd906ad2a7862e3b894f769cd8e08 SHA512 e8d4de79a788acfa27939dba6be9310385c6e3176fe07ba870e83a12a97e5c8e3040f49b0468cb06ef010211e4d549ee2938a17203f438e06a27143e3f82fd8f +EBUILD wayfire-0.9.0.ebuild 2504 BLAKE2B be35a125adfcb3ce141e91b9a356a7f6526e34a69a40d053b4aa54fce858d6922f23fd2fc6369a5111c55f2368796279da5a7113a523e7e52597b442ae243629 SHA512 f0a85652ce7cd28a3ff901b53f94d77937624a49780596e5d176ecab9c0531393c11bcef46032463e717d4e3a459480785932418f2f936bbc8a54695328c6a12 +EBUILD wayfire-9999.ebuild 2197 BLAKE2B 2e95c2e8d743709c9cadf7c9ad3eed3e563f49a95b24daac0348a84b2a7a3937d7dcbca62a3ca384b95492ba2c296963a719b490dda914d6c1b8d44e80b06d78 SHA512 4d57a79f859e45cc56635e7458e09527900b4f9f1b0f2552112d3f8b73e19024e6a0a2b878e67de48d68614f0240b229e35fb9ddc1e898809f5e6b146966d4d2 +MISC metadata.xml 698 BLAKE2B 9d37ee94b17887e40ddb08276d35380699c763326bdfeb307aaca933131f0bbdb0e7bbc2b0e6e06324127c6d85dd926abaf7d266f07cd215946fcfade114a78c SHA512 03b6a16d957b86c822e042c599b310bd3ae1f0d1fe6e97afcec27d0d948e742e1545f605eb3905c4d443f5bdf7174ed838573e7bf50344cab2302e6c4618a7ed diff --git a/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch b/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch deleted file mode 100644 index 393de41d0ccb..000000000000 --- a/gui-wm/wayfire/files/wayfire-0.8.0-fix-duplicate-manpage.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.gentoo.org/922898 -https://github.com/WayfireWM/wayfire/issues/1942 -https://github.com/WayfireWM/wayfire/pull/1943 -https://github.com/WayfireWM/wayfire/commit/564b75a45d7c844b61b510e68fa527109fce4a75 - -From 564b75a45d7c844b61b510e68fa527109fce4a75 Mon Sep 17 00:00:00 2001 -From: alice <alice@ayaya.dev> -Date: Sat, 7 Oct 2023 22:51:35 +0200 -Subject: [PATCH] meson: fix duplicate installation of manpage (#1943) - -closes #1942 ---- a/man/meson.build -+++ b/man/meson.build -@@ -1,7 +1,5 @@ - configure_file(input: 'wayfire.1.in', - output: 'wayfire.1', -- install: true, -- install_dir: 'man', - configuration: conf_data) - - install_man(join_paths(meson.project_build_root(), 'man', 'wayfire.1')) diff --git a/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch b/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch new file mode 100644 index 000000000000..c769a4516c16 --- /dev/null +++ b/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/938288 +https://github.com/WayfireWM/wayfire/pull/2441 + +--- a/src/api/wayfire/object.hpp ++++ b/src/api/wayfire/object.hpp +@@ -4,6 +4,7 @@ + #include <typeinfo> + #include <memory> + #include <string> ++#include <cstdint> + + #include <wayfire/nonstd/observer_ptr.h> + diff --git a/gui-wm/wayfire/files/wayfire-session b/gui-wm/wayfire/files/wayfire-session deleted file mode 100644 index 8267ea0e11fc..000000000000 --- a/gui-wm/wayfire/files/wayfire-session +++ /dev/null @@ -1,17 +0,0 @@ -#!/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 - -exec @EPREFIX@/usr/bin/wayfire "$@" diff --git a/gui-wm/wayfire/metadata.xml b/gui-wm/wayfire/metadata.xml index ed72465ca08f..6a9c1dd0a5aa 100644 --- a/gui-wm/wayfire/metadata.xml +++ b/gui-wm/wayfire/metadata.xml @@ -11,10 +11,7 @@ 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> diff --git a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild deleted file mode 100644 index 4dd1a09a0f71..000000000000 --- a/gui-wm/wayfire/wayfire-0.8.0-r1.ebuild +++ /dev/null @@ -1,157 +0,0 @@ -# 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/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="+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} ) -" - -PATCHES=( - "${FILESDIR}/wayfire-0.8.0-fix-duplicate-manpage.patch" -) - -src_prepare() { - 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) - ) - - 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-0.8.0-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild deleted file mode 100644 index d2c8b090436a..000000000000 --- a/gui-wm/wayfire/wayfire-0.8.0-r2.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# 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/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="+gles3 +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} ) -" - -PATCHES=( - "${FILESDIR}/wayfire-0.8.0-fix-duplicate-manpage.patch" - "${FILESDIR}/wayfire-0.8.0-dont-use-installed-config-h.patch" -) - -src_prepare() { - 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 gles3 enable_gles32) - ) - - 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-0.8.1-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild index ff1a84e65576..8f2348141cc5 100644 --- a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild +++ b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then SLOT="0/0.8" else SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~riscv" + KEYWORDS="amd64 ~arm64 ~riscv" SLOT="0/$(ver_cut 1-2)" fi @@ -61,6 +61,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/wayfire-0.8.0-dont-use-installed-config-h.patch" + "${FILESDIR}"/${P}-fix-gcc-15.patch ) src_prepare() { diff --git a/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild b/gui-wm/wayfire/wayfire-0.9.0.ebuild index f3277a9f1614..31f8c59c9a35 100644 --- a/gui-wm/wayfire/wayfire-0.8.1-r1.ebuild +++ b/gui-wm/wayfire/wayfire-0.9.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit meson +inherit meson toolchain-funcs DESCRIPTION="compiz like 3D wayland compositor" HOMEPAGE="https://github.com/WayfireWM/wayfire" @@ -11,7 +11,7 @@ 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" + SLOT="0/0.10" else SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz" KEYWORDS="amd64 ~arm64 ~riscv" @@ -19,7 +19,7 @@ else fi LICENSE="MIT" -IUSE="+gles3 test X" +IUSE="X +dbus +gles3 openmp test" RESTRICT="!test? ( test )" # bundled wlroots has the following dependency string according to included headers. @@ -29,7 +29,7 @@ CDEPEND=" dev-cpp/nlohmann_json dev-libs/glib:2 dev-libs/libevdev - >=dev-libs/libinput-1.7.0:= + dev-libs/libinput:= dev-libs/wayland >=dev-libs/wayland-protocols-1.12 gui-libs/wf-config:${SLOT} @@ -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=" @@ -58,17 +57,28 @@ DEPEND=" BDEPEND=" dev-util/wayland-scanner virtual/pkgconfig + openmp? ( + || ( + sys-devel/gcc[openmp] + sys-devel/clang-runtime[openmp] + ) + ) " -PATCHES=( - "${FILESDIR}/wayfire-0.8.0-dont-use-installed-config-h.patch" -) +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} 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 } @@ -78,6 +88,7 @@ src_configure() { $(meson_feature test tests) $(meson_feature X xwayland) $(meson_use gles3 enable_gles32) + $(meson_use openmp enable_openmp) -Duse_system_wfconfig=enabled -Duse_system_wlroots=enabled ) @@ -96,14 +107,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 } diff --git a/gui-wm/wayfire/wayfire-9999.ebuild b/gui-wm/wayfire/wayfire-9999.ebuild index bce466406ffd..4d9595e505b1 100644 --- a/gui-wm/wayfire/wayfire-9999.ebuild +++ b/gui-wm/wayfire/wayfire-9999.ebuild @@ -11,7 +11,7 @@ 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.9" + SLOT="0/0.10" else SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz" KEYWORDS="~amd64 ~arm64 ~riscv" @@ -29,7 +29,7 @@ CDEPEND=" dev-cpp/nlohmann_json dev-libs/glib:2 dev-libs/libevdev - >=dev-libs/libinput-1.7.0:= + dev-libs/libinput:= dev-libs/wayland >=dev-libs/wayland-protocols-1.12 gui-libs/wf-config:${SLOT} |