gentoo auto-resync : 12:06:2024 - 00:08:13

4 files changed, 60 insertions, 14 deletions

diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 7263cd3ed7fe..53e4d3cfe688 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,4 +1,5 @@
 AUX wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch 2877 BLAKE2B ff492af5cf7b5c866e49ce1bf78286c57e54eb4d3a6c60d4b1087a796b081618b6fe87afc4efd79aec5b4b3ecdb749027cfc74f09500211a086550a5db9d70d6 SHA512 52a6cf0bd22a514adf427d9f02768f5ecc24d1c83cecd51eda89938bdd79dee50e11103ae9fa2ededfcacb5a485415453308026c68fe1e3ffdb447503696535d
+AUX wlroots-0.17-fix-automagic-libliftoff.patch 1446 BLAKE2B 087afe7764251882c1e9f5a49a6c425261bb7cfe8a385d578067374312c3da8529cd273c81936e81ccf65f9932dfa2391e7d5c574458fd82b869793ec34320a5 SHA512 2b5dae202ef1991531b2751fe716a08f23c550136ab8ef3c7ea84b21e9bab89f53fce0e1b2eb2d8e30402519c086361361634733fa66f8553070218c1c2d7ff0
 DIST wlroots-0.15.1.tar.gz 565816 BLAKE2B 09b704a55d8b4a5ab19bb0fcdd041635fbbbb8eed94ff6d189ef47f9f86e90178efa8441c7db78839b1145ed79ed016d520d6599e256cdcf49130cda38bc307d SHA512 6228160f2f350a406c612f1048d7075cf2f78206cc84bc16f889d5d0acd614f9e98845fffed03d7067cfdbd7558b77fcc5d8cedc3868d866e476523126a63677
 DIST wlroots-0.16.2.gl.tar.gz 588432 BLAKE2B cad2a98b1413ed94270b53af62541d67de1c74d3350be32c2e67aaee1d36d4260738b517d6d41f2013f436276097509a5d2662c531be354f7b4edc1c0204eced SHA512 9d5fbee3b87738de75323a056b83446eb93b81ac3e8a4315918d5daad6ed2f50392d9641039f3f830ec1df94155473a2052689d3c029be7572d8ec9ecc62c0e9
 DIST wlroots-0.17.2.tar.gz 606822 BLAKE2B bbf6e8d0014f6613b39cbb6a0a8e5be395a858a5db8e432307298f20eb37c6622dbc6e078e21d9b8396dd836da1f9787b433549641cc664962eb96a122846edc SHA512 44a3ec673431c02fc08a5c33daa06148b5e85a3a7ea45b28978cd6be230dd4c5082e8a34985e2976c9e64f98b7567e334c191c3d20141e8e27ddc4a4659843cc
@@ -7,6 +8,6 @@ EBUILD wlroots-0.15.1-r2.ebuild 1962 BLAKE2B 90615bf555b7368bbb66f43749b438e5bbe
 EBUILD wlroots-0.16.2-r3.ebuild 2046 BLAKE2B 18719f44961b03b867bc8f17cfadbc23c0bdd16e22482f76c78eb6daccae21aa3f26e1d487555a5783094848e53c0595cc4e8317ad06e57bb5ec5801c0a25b21 SHA512 9713a3bb3e4f2c6706ead4c4adacb16670420c39c0c4e911c555d9f64a77bb70a2d528fc6e4a24053c6645d593d588af47e7b7e73f36d5275791a3996ad5d607
 EBUILD wlroots-0.17.2-r1.ebuild 2223 BLAKE2B 978951dcb04c75f4801139e1141f154afb5d0f38b23d723a15c131897b7b2c03a109f178717dd88c595934ad491fa56c0b7f8c56f2b5d607c795ba61ffbac8a5 SHA512 c2b05ceeabb336dd992e564df6375debdaeae9b2331a234ed92779b5a44114f7c7c26bad9188fb9de7cf25e401531c2285228848315b369a4e1cfcdf2711a89b
 EBUILD wlroots-0.17.3-r1.ebuild 2227 BLAKE2B 8791359f93d106db37b060c5b8e00ee6241ef0c3f5c2404664b6e1e8d9e0b63e39854fb6730e9dc8de1c24d4a8516a4d0f60528df4bc5cabcc7404289b4ad36d SHA512 0b9c86b4f08b415a1e244a5e135b18957003f180751e5acb0b95f70f79f41bcbd6b3ecad0fe9fd8288dfb966e9a5c280a64799e3f79f14d3961edf78d829d146
-EBUILD wlroots-0.17.3-r2.ebuild 2292 BLAKE2B 77d67f15f50a5b5ee0b195ecf93454ac47e2507a6b150a34a776f4006ad1712dc462446143fb05d9ebef7005e88b6cfda1174cc1b3158aa80854d8233582d3d7 SHA512 842f7d205419958aef09bc29eaf01a9864181ab5792a78befd58feffe841646ca3bdf6b0e329c2130d766a3bf31cac5f6c6b7583d637a4254b3b64cb83157db0
-EBUILD wlroots-9999.ebuild 2225 BLAKE2B 434f6b6d19dca2fac42ea80aceaee5cdcb98111037b229eb4c780fb284b80d24dd6204985ca54d4df29d7e11ef8bb65bddf881d8d677f0b805db6d86a4fbd83f SHA512 65d52eba8909bb31cf8deb6980e15c32d7864b44ab659b0c09c87b1155a17135763243e87f2df8542f7fcb0d0ccfcf909b390736d8163d82d93f0096ee88a994
+EBUILD wlroots-0.17.3-r3.ebuild 2387 BLAKE2B 3d4c8828f43d536d3854ca14edfa15f72b9b53fa6a3dcaf504a0ab89b79b90fae2c9b2a86546888f8a4aafb07e9758754bfbc1645bd013a91f2e04e824c1fc3d SHA512 5c8c4cba99ea61b7f0cc3cf6ad498b1802df76c92c48836f2e1d387e6170bcc947e225a2799f49398737a4c0534327f4a2edb190915aebdf77a9212acbd1ac4c
+EBUILD wlroots-9999.ebuild 2274 BLAKE2B 13a08b96ee1aa0a68c3f1bd4d4c675513b36509b17d3107198b4a05ffec36355fc019c69274a541953e3fa0e3f533a93e93da27cbdb47329bfe4c6f8f255a64f SHA512 44dbe781b2b7523d943d53f4555690ce0aa4ac4b856883200fbba1d8c25e16aa7be66ac53c4649796171e6781517c5ae9b4296a08438ffc00c16dcd94e71bdab
 MISC metadata.xml 2145 BLAKE2B 75225f805364003c244a52d4a46c826e5a283ed01ef71d32b73fdcc03f6a1b46f0083a43be4c2079c6614c1b5db8a07a9a17ce2501c5eb65a53b83a7af13cdd0 SHA512 45faf9ad055a9b670ace556b1639f355b96da462447a33a655e36960fe99ef42c5c6c591ee39b4554ddd276e70c492c83c7ff4a844034ac1a1e25b39b465b5f3
diff --git a/gui-libs/wlroots/files/wlroots-0.17-fix-automagic-libliftoff.patch b/gui-libs/wlroots/files/wlroots-0.17-fix-automagic-libliftoff.patch
new file mode 100644
index 000000000000..86dd42521e43
--- /dev/null
+++ b/gui-libs/wlroots/files/wlroots-0.17-fix-automagic-libliftoff.patch
@@ -0,0 +1,43 @@
+https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/385c9ade5f7a8ce9e5c13f762d56e6bd1c8d1b0a
+From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
+ <leohdz172@proton.me>
+Date: Wed, 5 Jun 2024 22:33:05 -0600
+Subject: [PATCH] add an option to enable/disable libliftoff
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+instead of always using it if found
+
+Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
+--- a/backend/drm/meson.build
++++ b/backend/drm/meson.build
+@@ -16,7 +16,7 @@ libliftoff = dependency(
+ 	'libliftoff',
+ 	version: '>=0.4.0',
+ 	fallback: 'libliftoff',
+-	required: false,
++	required: get_option('libliftoff'),
+ )
+
+ if not (hwdata.found() and libdisplay_info.found() and features['session'])
+--- a/meson.build
++++ b/meson.build
+@@ -98,6 +98,7 @@ features = {
+ internal_features = {
+ 	'xcb-errors': false,
+ 	'egl': false,
++	'libliftoff': false,
+ }
+ internal_config = configuration_data()
+
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -7,3 +7,4 @@ option('backends', type: 'array', choices: ['auto', 'drm', 'libinput', 'x11'], v
+ option('allocators', type: 'array', choices: ['auto', 'gbm'], value: ['auto'],
+ 	description: 'Select built-in allocators')
+ option('session', type: 'feature', value: 'auto', description: 'Enable session support')
++option('libliftoff', type: 'feature', value: 'auto', description: 'Enable support for libliftoff')
+--
+2.45.2
+
diff --git a/gui-libs/wlroots/wlroots-0.17.3-r2.ebuild b/gui-libs/wlroots/wlroots-0.17.3-r3.ebuild
index 8dc3bc02f4a2..4002b88934c6 100644
--- a/gui-libs/wlroots/wlroots-0.17.3-r2.ebuild
+++ b/gui-libs/wlroots/wlroots-0.17.3-r3.ebuild
@@ -19,13 +19,16 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="liftoff +libinput +drm +session tinywl vulkan x11-backend xcb-errors X"
+IUSE="liftoff +libinput +drm +session vulkan x11-backend xcb-errors X"
 REQUIRED_USE="
 	drm? ( session )
 	libinput? ( session )
+	liftoff? ( drm )
 	xcb-errors? ( || ( x11-backend X ) )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-0.17-fix-automagic-libliftoff.patch" )
+
 RDEPEND="
 	>=dev-libs/wayland-1.22.0
 	media-libs/libglvnd
@@ -62,6 +65,8 @@ RDEPEND="
 		x11-base/xwayland
 	)
 "
+
+# TODO: 0.17.4 will add support for libliftoff-0.5
 DEPEND="
 	${RDEPEND}
 	liftoff? (
@@ -84,11 +89,12 @@ src_configure() {
 	local meson_backends=$(IFS=','; echo "${backends[*]}")
 	local emesonargs=(
 		$(meson_feature xcb-errors)
-		$(meson_use tinywl examples)
+		-Dexamples=false
 		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
 		$(meson_feature X xwayland)
 		-Dbackends=${meson_backends}
 		$(meson_feature session)
+		$(meson_feature liftoff libliftoff)
 	)
 
 	meson_src_configure
@@ -97,10 +103,6 @@ src_configure() {
 src_install() {
 	meson_src_install
 	dodoc docs/*
-
-	if use tinywl; then
-		dobin "${BUILD_DIR}"/tinywl/tinywl
-	fi
 }
 
 pkg_postinst() {
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 77c372411845..05772f2c09af 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -19,10 +19,11 @@ else
 fi
 
 LICENSE="MIT"
-IUSE="liftoff +libinput +drm +session tinywl vulkan x11-backend xcb-errors X"
+IUSE="liftoff +libinput +drm +session lcms vulkan x11-backend xcb-errors X"
 REQUIRED_USE="
 	drm? ( session )
 	libinput? ( session )
+	liftoff? ( drm )
 	xcb-errors? ( || ( x11-backend X ) )
 "
 
@@ -41,6 +42,7 @@ DEPEND="
 		sys-apps/hwdata
 		liftoff? ( >=dev-libs/libliftoff-0.4 )
 	)
+	lcms? ( media-libs/lcms:2 )
 	libinput? ( >=dev-libs/libinput-1.14.0:= )
 	session? (
 		sys-auth/seatd:=
@@ -80,11 +82,13 @@ src_configure() {
 	local meson_backends=$(IFS=','; echo "${backends[*]}")
 	local emesonargs=(
 		$(meson_feature xcb-errors)
-		$(meson_use tinywl examples)
+		-Dexamples=false
 		-Drenderers=$(usex vulkan 'gles2,vulkan' gles2)
 		$(meson_feature X xwayland)
 		-Dbackends=${meson_backends}
 		$(meson_feature session)
+		$(meson_feature lcms color-management)
+		$(meson_feature liftoff libliftoff)
 	)
 
 	meson_src_configure
@@ -93,10 +97,6 @@ src_configure() {
 src_install() {
 	meson_src_install
 	dodoc docs/*
-
-	if use tinywl; then
-		dobin "${BUILD_DIR}"/tinywl/tinywl
-	fi
 }
 
 pkg_postinst() {