summaryrefslogtreecommitdiff
path: root/gui-wm
diff options
context:
space:
mode:
Diffstat (limited to 'gui-wm')
-rw-r--r--gui-wm/Manifest.gzbin1211 -> 1213 bytes
-rw-r--r--gui-wm/gamescope/Manifest4
-rw-r--r--gui-wm/gamescope/gamescope-3.15.13.ebuild (renamed from gui-wm/gamescope/gamescope-3.15.5.ebuild)0
-rw-r--r--gui-wm/hyprland/Manifest4
-rw-r--r--gui-wm/hyprland/hyprland-0.44.1.ebuild100
-rw-r--r--gui-wm/hyprland/hyprland-9999.ebuild13
-rw-r--r--gui-wm/wayfire/Manifest6
-rw-r--r--gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch65
-rw-r--r--gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch13
-rw-r--r--gui-wm/wayfire/wayfire-0.8.1-r2.ebuild103
-rw-r--r--gui-wm/wayfire/wayfire-0.9.0.ebuild21
11 files changed, 131 insertions, 198 deletions
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 40e07b34ea86..00d794da738c 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
Binary files differ
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index bae12706e630..c3eaf2f5b1e3 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1,8 +1,8 @@
AUX gamescope-deprecated-stb.patch 634 BLAKE2B 33bd10dc41f9fdbbec12ea0bdec1cf8af8fc9bc499324f5f2f329c72273109fd82495a0f3d3ffb2954ee91eb106f7e36479716af6e8d2cfd76ef58c9074003d3 SHA512 56aceec2552868749a21c9ca06ac6b41da3bd901692b376e5691155c58861f941dbd5359f1e22bbe54fd14e061cd586fe06d0109a8a45a0ecf6049ea3a79663b
-DIST gamescope-3.15.5.tar.gz 570102 BLAKE2B 2c54af3e90b90cfffc158924d038a76914dc5a3fb51414f275d0478d6fdda4a898b822dba282e11285b0627b6449200acf7de57d238ebf681399abef82c0ca9b SHA512 bff5deaea7764d40e294b38ae210f58e3417faa097afd2b42c336a75914b91bfbeeec09d6af2ce24f2fe3071436c3ad81f8aadc735d7b6814083f990f5c6bcaa
+DIST gamescope-3.15.13.tar.gz 575288 BLAKE2B 295b510611495f96f31c8e350a2ff592ac45497e5e2393a44c375729e106f06ab006a58eea34f9cc748a3f7c082b618122570338c17614493e0cc6d90d26d25e SHA512 f85da5a4cc3893d2f7d9a0d817ead0f314b5c2852409954349955cc4e7c19c32946822b12ca0824696186c2e9789412c659027b2a20eeb1e0ab1a2b559db15c2
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
+EBUILD gamescope-3.15.13.ebuild 4194 BLAKE2B 277e26cb9e247c01a3ea7e2a169cfbce2cad4dab6f7f61bf1fb4247ea12520dad8e1c7bbdca61dedd0020b78fd21fb5fbc519dcd530523e3392bb838a5b7aad1 SHA512 264475c4a1e2808181128c16c672be0cb54de22629d2d8f6005e36e18281d197a42b6301545dd34b667f79b86df90f645ed4d4c3a4b218f9c93153249c907da3
MISC metadata.xml 571 BLAKE2B 43906c35ed17ecb23361a342b4f935f39efa62db4ef2f4185bb49dca701304efa735e8785d6960cf9f0ce8ffd6a7b78f40cd7d7aaa843a914f220e988a122dec SHA512 ad4e74f9fdc00121e9c5fb5ed79d5cc3d271b4ff4c653f5791ebd26810a9c833a4e5d80e8a69cebb4c753caadc6284e1afa1ad826040e8fb3560985400c6b25f
diff --git a/gui-wm/gamescope/gamescope-3.15.5.ebuild b/gui-wm/gamescope/gamescope-3.15.13.ebuild
index ea1b20937239..ea1b20937239 100644
--- a/gui-wm/gamescope/gamescope-3.15.5.ebuild
+++ b/gui-wm/gamescope/gamescope-3.15.13.ebuild
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index c1eb61e38b7c..4eab4fd9314e 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,6 +1,8 @@
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-9999.ebuild 2222 BLAKE2B c8d4973d60bfbbf5c45f1c0229f9e2c2d2ffcea1ef35d6895e4671e5d305d2a5218d8f0ef3852820412e1ee8a3a3629c0f6a8a7cd6bdb6a9bebaf286b0afcd59 SHA512 266aa50c934f0f129b450e5adb2e3e5a98d1dc9feb27ce32c2e689829a0b76c55ed8722e4a8b59cec40f75a0b2fc62df4814d4e48270aa2db6ba73e25763f766
+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/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 31664e318dd9..81ad1724da92 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -26,7 +26,7 @@ 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-vcs/git
virtual/pkgconfig
@@ -36,8 +36,9 @@ RDEPEND="
dev-cpp/tomlplusplus
dev-libs/glib:2
dev-libs/libinput
- >=dev-libs/wayland-1.20.0
- gui-libs/aquamarine
+ >=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
@@ -55,16 +56,16 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- >=dev-libs/hyprland-protocols-0.3
+ >=dev-libs/hyprland-protocols-0.4
>=dev-libs/hyprlang-0.3.2
>=dev-libs/wayland-protocols-1.36
- >=gui-libs/hyprutils-0.2.1
+ >=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.8
+ >=dev-util/hyprwayland-scanner-0.3.10
virtual/pkgconfig
"
diff --git a/gui-wm/wayfire/Manifest b/gui-wm/wayfire/Manifest
index 1770215774d9..a5180cf99546 100644
--- a/gui-wm/wayfire/Manifest
+++ b/gui-wm/wayfire/Manifest
@@ -1,11 +1,7 @@
-AUX wayfire-0.8.0-dont-use-installed-config-h.patch 1999 BLAKE2B 6f87e25841dfcd266a7507d72d5c6602fd11a24b8a5e7f90c51e8b93592355f2971ee2eb0c9088a17921f5cf6dd690ebd0d54ea03f6fe026794d5d7c2eafaeb0 SHA512 0cbdf8bcf54491969ad5d0da9d2736775112ea168bbeb03bc252961cbe011b16bcf193ed3bef9effeeaac870405141819d1cb2dc2cb3cab20fc97dcb33639fdd
-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.1.tar.xz 856364 BLAKE2B 1b596b28878789ca26eeb57c6c24e0b69508731de2144e1477f8071b41f17757b2125f2f4f99670ca8b7f85172a9f641b9be1f9190eeff5b261bcc2df1bec4ab SHA512 7bce5656b6a7a7fe53b37492465dee3e591eb386666fdd3d6876f4a589f059510fb2d0c0a326df260ca6a293edf4ba43bb55f813e85d4d2d38d6ef1319280254
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 2197 BLAKE2B 2e95c2e8d743709c9cadf7c9ad3eed3e563f49a95b24daac0348a84b2a7a3937d7dcbca62a3ca384b95492ba2c296963a719b490dda914d6c1b8d44e80b06d78 SHA512 4d57a79f859e45cc56635e7458e09527900b4f9f1b0f2552112d3f8b73e19024e6a0a2b878e67de48d68614f0240b229e35fb9ddc1e898809f5e6b146966d4d2
+EBUILD wayfire-0.9.0.ebuild 2503 BLAKE2B d7e47565d88bed8fbcd857541349088c31a9d885358c5f20c1e5e14ab390ad07c4ced1050849e2665f8ac26ce2174951fdb2d25ec4565e8ab13cef9f2c897346 SHA512 058ae5580ae2c29546b095a47a1641f99a1e749b94d2f47bf46c26d7e1e85bb17172020197537d1eea3d1985769d1baf5e041a0870e6ada4a5efaadf65ae1796
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-dont-use-installed-config-h.patch b/gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch
deleted file mode 100644
index 3938cd955ce2..000000000000
--- a/gui-wm/wayfire/files/wayfire-0.8.0-dont-use-installed-config-h.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-https://github.com/WayfireWM/wayfire/pull/2225
-
-From f7bcad19598cbff1324f7737022ffee8848b3555 Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Mon, 18 Mar 2024 16:32:06 +0200
-Subject: [PATCH] Copy config.h approach from wlroots-full.hpp to other public
- api headers (#2225)
-
-* Otherwise wayfire could use the config.h of an already installed
- wayfire installation and lead to confusing linking issues if the
- options differed (like installed wayfire has xwayland disabled and the
- new build has it enabled).
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/src/api/wayfire/debug.hpp
-+++ b/src/api/wayfire/debug.hpp
-@@ -1,8 +1,12 @@
- #ifndef DEBUG_HPP
- #define DEBUG_HPP
-
--#ifndef WAYFIRE_PLUGIN
-- #include "config.h"
-+// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins
-+// need to use <wayfire/config.h>
-+#ifdef WF_USE_CONFIG_H
-+ #include <config.h>
-+#else
-+ #include <wayfire/config.h>
- #endif
-
- #define nonull(x) ((x) ? (x) : ("nil"))
---- a/src/api/wayfire/unstable/wlr-view-events.hpp
-+++ b/src/api/wayfire/unstable/wlr-view-events.hpp
-@@ -1,9 +1,11 @@
- #pragma once
-
--#if __has_include(<wayfire/config.h>)
-- #include <wayfire/config.h>
-+// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins
-+// need to use <wayfire/config.h>
-+#ifdef WF_USE_CONFIG_H
-+ #include <config.h>
- #else
-- #include "config.h"
-+ #include <wayfire/config.h>
- #endif
-
- #include <wayfire/nonstd/wlroots-full.hpp>
---- a/src/api/wayfire/unstable/xwl-toplevel-base.hpp
-+++ b/src/api/wayfire/unstable/xwl-toplevel-base.hpp
-@@ -1,9 +1,11 @@
- #pragma once
-
--#if __has_include(<wayfire/config.h>)
-- #include <wayfire/config.h>
-+// WF_USE_CONFIG_H is set only when building Wayfire itself, external plugins
-+// need to use <wayfire/config.h>
-+#ifdef WF_USE_CONFIG_H
-+ #include <config.h>
- #else
-- #include "config.h"
-+ #include <wayfire/config.h>
- #endif
-
- #include <wayfire/nonstd/wlroots-full.hpp>
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
deleted file mode 100644
index c769a4516c16..000000000000
--- a/gui-wm/wayfire/files/wayfire-0.8.1-fix-gcc-15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/wayfire-0.8.1-r2.ebuild b/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
deleted file mode 100644
index 8f2348141cc5..000000000000
--- a/gui-wm/wayfire/wayfire-0.8.1-r2.ebuild
+++ /dev/null
@@ -1,103 +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/0.8"
-else
- SRC_URI="https://github.com/WayfireWM/${PN}/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="amd64 ~arm64 ~riscv"
- SLOT="0/$(ver_cut 1-2)"
-fi
-
-LICENSE="MIT"
-IUSE="+dbus +gles3 test X"
-RESTRICT="!test? ( test )"
-
-# bundled wlroots has the following dependency string according to included headers.
-# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
-# enable x11-backend with X and vice versa
-CDEPEND="
- dev-cpp/nlohmann_json
- dev-libs/glib:2
- dev-libs/libevdev
- >=dev-libs/libinput-1.7.0:=
- dev-libs/wayland
- >=dev-libs/wayland-protocols-1.12
- gui-libs/wf-config:${SLOT}
- gui-libs/wlroots:0/17[drm(+),libinput(+),x11-backend,X?]
- media-libs/glm
- media-libs/libglvnd
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- x11-libs/cairo
- x11-libs/libxkbcommon
- x11-libs/pango
- x11-libs/pixman
- dbus? ( sys-apps/dbus )
- X? ( x11-libs/libxcb:= )
-"
-
-RDEPEND="
- ${CDEPEND}
- x11-misc/xkeyboard-config
-"
-DEPEND="
- ${CDEPEND}
- test? ( dev-cpp/doctest )
-"
-BDEPEND="
- dev-util/wayland-scanner
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/wayfire-0.8.0-dont-use-installed-config-h.patch"
- "${FILESDIR}"/${P}-fix-gcc-15.patch
-)
-
-src_prepare() {
- default
-
- local dbusrunsession=$(usev dbus dbus-run-session)
- sed -e "s:@EPREFIX@:${EPREFIX}:g" -e "s:@DBUS_RUN_SESSION@:${dbusrunsession}:" \
- "${FILESDIR}"/wayfire-session-2 > "${T}"/wayfire-session || die
- sed -e "s:@EPREFIX@:${EPREFIX}:" \
- "${FILESDIR}"/wayfire-session.desktop > "${T}"/wayfire-session.desktop || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature test tests)
- $(meson_feature X xwayland)
- $(meson_use gles3 enable_gles32)
- -Duse_system_wfconfig=enabled
- -Duse_system_wlroots=enabled
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- dobin "${T}"/wayfire-session
-
- insinto "/usr/share/wayland-sessions/"
- insopts -m644
- doins wayfire.desktop
- doins "${T}"/wayfire-session.desktop
-
- insinto "/usr/share/wayfire/"
- doins wayfire.ini
-
- insinto "/etc"
- doins "${FILESDIR}"/wayfire.env
-}
diff --git a/gui-wm/wayfire/wayfire-0.9.0.ebuild b/gui-wm/wayfire/wayfire-0.9.0.ebuild
index 4d9595e505b1..95834648abca 100644
--- a/gui-wm/wayfire/wayfire-0.9.0.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"
@@ -14,12 +14,12 @@ if [[ ${PV} == 9999 ]]; then
SLOT="0/0.10"
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
LICENSE="MIT"
-IUSE="+dbus +gles3 test X"
+IUSE="X +dbus +gles3 openmp test"
RESTRICT="!test? ( test )"
# bundled wlroots has the following dependency string according to included headers.
@@ -57,8 +57,22 @@ DEPEND="
BDEPEND="
dev-util/wayland-scanner
virtual/pkgconfig
+ openmp? (
+ || (
+ sys-devel/gcc[openmp]
+ sys-devel/clang-runtime[openmp]
+ )
+ )
"
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
src_prepare() {
default
@@ -74,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
)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 13:47:53 +0000