gentoo auto-resync : 07:09:2024 - 12:29:07

5 files changed, 211 insertions, 17 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index d84d10884803..d0ab7fb8a799 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,9 +1,12 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
+AUX weston-kiosk-test.patch 1289 BLAKE2B 6099d17062dfcaf45f877f3d51632d66450734a450c0765ed098e5ce8439e4f3dd11e03a3bed8b1efb56af34d3da1d80970878b8c373ae8a82b3aa96e7261e67 SHA512 d4b267ccfa95ad59b0c49f1a6105f95246bc0334ee012c2137ff35c2712ba3d518ec7c6578c9f4e837128885d88d2a146daab056f4982d8e48b2a3d0c14d9fdb
 AUX weston-musl-basename.patch 2369 BLAKE2B 87b49e150f4f390bb9ce131f9cb85198d95a4916ea2ed3597ed521e0d09d747f961045cbbb1fb56356f39b71b76cda20c37a80f49f74137770f4b5a060c2ab09 SHA512 25c6abc04f9c2af541e8428d63c83c7e35eef5275839afb0fd347926b06e39064e835543d68e7bc4652eed946be2c4080b7e5ed593bae75214fd06f7e456a9e1
 AUX weston-neatvnc-0.8.patch 782 BLAKE2B bf0c5734dec8b3b859d5c080945ed8664deda3665e8311493dedbf8060760c9d71322895ed247498659e2530275a5332c9cca03b1abd68a18fa14da45a094eb2 SHA512 22860eb9322ffe64c5aa05fbe92faeb1da9cc569417c97dac339512a88f251e4573e5c9349cb5a01faea7cafe3da7a73f6fca49b36cb0bb8ac73862ecb00600c
 DIST weston-13.0.0.tar.xz 1986520 BLAKE2B df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917 SHA512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc
 DIST weston-13.0.3.tar.xz 1986952 BLAKE2B cc3e2be9f1fbcbfd45c9e75a9a34bbb7cd75256d851129e0d29cc0079cbaf4e35eb40b302f557ffe7b89edbc094b1823d667a54d44a9af765945e3ca541068fc SHA512 60e655b57cf418902ec6e4371883354165241d9a99a712aabe2165e11ac190dec22836fd885f5178def5416dc5f00e70042b022c96a8e0aa74827bbd4563f9cb
+DIST weston-14.0.0.tar.xz 2043020 BLAKE2B 1a92e3b04677f3ba1f2c02f15aba64511774dd08738c2a490135a1ca7200a846c1b5102349a36c76e2dd6a9e39bd041cd25c2552958741e96f8291fd3029046e SHA512 8bdeed91befd5cbb0bde0f1860ff7775c1835a5fa8c3bf26e99d2f0c16e81255fcf35bf338ae02d7826463d0efdf41ba3fe78e38e4c27787831dfa331acafc08
 EBUILD weston-13.0.0-r4.ebuild 3900 BLAKE2B e25a59fc19fc49062d60d3019e177a013b8ae6904217fc22d8d6ddc0d5ced4f3f275529400914478b0963ca5bf88398a3ae56cd1a4e23d3620a77e75f4c7b491 SHA512 10c7c387c7cfcb348d076bf60714b0c6d503a93526c7238c28a113dc92bd85bf53105718cf57c6430d5074ece581a66399db6841465a2e012c2b4fcb4de52ef5
-EBUILD weston-13.0.3-r2.ebuild 3952 BLAKE2B 6488d110b01e811375261ac2987bb0371f07e5da0839a876b089e1590b7603fa0e7c5b4cb1e25ed0aff59e0afa1c4b9693a9e1c6d28a43033a96190588fb7bb8 SHA512 e72266d2ea2d9eb49e46cbcbe90e9b5b4fb68bc493f10c8834b3ffdbee25afc22c798d8be77b662ec8575ffc1ed2634ae1e8fb493a08b7ff58a79aae1b716bc0
-EBUILD weston-9999.ebuild 3852 BLAKE2B bbacd0bdc0a407968b27377dcc7613e3ab498aabaaeca77e93fc89c11c3fe7758d05386072d56a3f372f2ff69535dc4519773464a5febcf8f56627bcc2bfd780 SHA512 c8721ee7a517842ca3c254e4287663fbe560d70ed834872650bfa2b1394219b2e9d079697eca5e992e9165f51adc70b251604527bb49a9f82f4bdfe1d052c5aa
+EBUILD weston-13.0.3-r2.ebuild 3800 BLAKE2B d66550354c2bcaf7159ff5a27414c08f4805c1ca923074978a300de538a9cf571c6872f3e511bc9044ad51cd6d222f0d9a2c0777a1363603775e5805f5a582d2 SHA512 5ef291a76145a5a07caef034363959b05da4b54b5eb2880ba50b55fa01099f4d79bfd8af0f9717d478d67b6cdcf3f2fc221271fedb7861b26d0bab39f747c009
+EBUILD weston-14.0.0.ebuild 3773 BLAKE2B 6f98cfaa8a575bb9c59a821a72f2fe7d0c6d5d4dd9db6ce95530dfd568ab52664df2608a7bbe5e9a86ed1ea0cf5a2051cbdaa4519a85bc345349b6d8b8e4b0ee SHA512 d7b13e9d5ad4a5ed32d476ef2a45c68ce73dda20a1758de45b9d50d811d1cdd6ed4ee426a89cf778636b475da6f905232aeb6c870f69374bb6f8d628984988c3
+EBUILD weston-9999.ebuild 3722 BLAKE2B 6fb8f45f7535f65e2345ee7a6f8687e4362ef53f7cc0f95ef8ef091b43efca0bceac43d2a7df8eb72e5ececb92ebd20e4865927582dcd4c794599a6aa43e9b1b SHA512 36ff766083c63f8d0da654fccddc3bd67ed07c5f06d143654b1fbcfd12d3b3c1f31fa7d5b2d328829a372e4c919ba8e38e18d99c27829c19e187f44b4e808f0c
 MISC metadata.xml 1512 BLAKE2B 9601dd1e3a3f977f92597a498a03eb819ea19b7a8434b3a0b27c138a5f9a6aa6f0642d82c1817797a57ff576e4058f7d54cf62e3ac5b5069a844f017fb47f5a7 SHA512 fc88d3a27063106d9c554253dceb65b9e6aa6207a502b4c6cb865c9529685b738e88b7fb84258201193248d0e6060cc84bc8a29661fdb71194fe499dbb0cae57
diff --git a/dev-libs/weston/files/weston-kiosk-test.patch b/dev-libs/weston/files/weston-kiosk-test.patch
new file mode 100644
index 000000000000..7fe340a75bb3
--- /dev/null
+++ b/dev-libs/weston/files/weston-kiosk-test.patch
@@ -0,0 +1,53 @@
+From 4d5224027c941224eb9a7aaa71c949558f2b4796 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 6 Sep 2024 23:15:05 +0100
+Subject: [PATCH] tests: Make the kiosk test dependent on the shell-kiosk
+ option
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ tests/meson.build | 21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 45b475c3..4b52cb29 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -180,14 +180,6 @@ tests = [
+ 			input_timestamps_unstable_v1_protocol_c,
+ 		],
+ 	},
+-	{
+-		'name': 'kiosk-shell',
+-		'sources': [
+-			'kiosk-shell-test.c',
+-			xdg_shell_client_protocol_h,
+-			xdg_shell_protocol_c,
+-		],
+-        },
+ 	{
+ 		'name': 'linux-explicit-synchronization',
+ 		'sources': [
+@@ -427,6 +419,19 @@ if get_option('shell-ivi')
+ 	]
+ endif
+ 
++if get_option('shell-kiosk')
++	tests += [
++		{
++			'name': 'kiosk-shell',
++			'sources': [
++				'kiosk-shell-test.c',
++				xdg_shell_client_protocol_h,
++				xdg_shell_protocol_c,
++			],
++		},
++	]
++endif
++
+ test_config_h = configuration_data()
+ test_config_h.set_quoted('WESTON_TEST_REFERENCE_PATH', meson.current_source_dir() + '/reference')
+ test_config_h.set_quoted('WESTON_MODULE_MAP', env_modmap)
+-- 
+2.46.0
+
diff --git a/dev-libs/weston/weston-13.0.3-r2.ebuild b/dev-libs/weston/weston-13.0.3-r2.ebuild
index abe7074e3de7..13dab3d0aebf 100644
--- a/dev-libs/weston/weston-13.0.3-r2.ebuild
+++ b/dev-libs/weston/weston-13.0.3-r2.ebuild
@@ -91,7 +91,6 @@ BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/wayland-scanner
 	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 "
 
 PATCHES=(
@@ -99,10 +98,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-musl-basename.patch
 )
 
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
 src_configure() {
 	local emesonargs=(
 		$(meson_use drm backend-drm)
diff --git a/dev-libs/weston/weston-14.0.0.ebuild b/dev-libs/weston/weston-14.0.0.ebuild
new file mode 100644
index 000000000000..8ec8a16498ea
--- /dev/null
+++ b/dev-libs/weston/weston-14.0.0.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston"
+
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	drm? ( gles2 )
+	pipewire? ( drm )
+	remoting? ( drm gles2 )
+	screen-sharing? ( rdp )
+	test? ( desktop headless lcms xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm headless rdp vnc wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-1.2.0
+	>=dev-libs/wayland-1.22.0
+	media-libs/libpng:0=
+	sys-auth/seatd:=
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.108
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	drm? (
+		<media-libs/libdisplay-info-0.3.0:=
+		>=media-libs/mesa-17.1[gbm(+)]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	examples? ( x11-libs/pango )
+	gles2? ( media-libs/libglvnd )
+	jpeg? ( media-libs/libjpeg-turbo:0= )
+	lcms? ( >=media-libs/lcms-2.9:2 )
+	pipewire? ( >=media-video/pipewire-0.3:= )
+	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? ( sys-apps/systemd )
+	vnc? (
+		=dev-libs/aml-0.3*
+		=gui-libs/neatvnc-0.8*
+		sys-libs/pam
+	)
+	webp? ( media-libs/libwebp:0= )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xwayland
+		x11-libs/cairo[X,xcb(+)]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+		>=x11-libs/xcb-util-cursor-0.1.4
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.33
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-kiosk-test.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use drm backend-drm)
+		-Dbackend-drm-screencast-vaapi=false
+		$(meson_use headless backend-headless)
+		$(meson_use pipewire backend-pipewire)
+		$(meson_use rdp backend-rdp)
+		$(meson_use screen-sharing screenshare)
+		$(meson_use vnc backend-vnc)
+		$(meson_use wayland-compositor backend-wayland)
+		$(meson_use X backend-x11)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use xwayland)
+		$(meson_use systemd)
+		$(meson_use remoting)
+		$(meson_use pipewire)
+		$(meson_use desktop shell-desktop)
+		$(meson_use fullscreen shell-fullscreen)
+		$(meson_use ivi shell-ivi)
+		$(meson_use kiosk shell-kiosk)
+		$(meson_use lcms color-management-lcms)
+		$(meson_use jpeg image-jpeg)
+		$(meson_use webp image-webp)
+		-Dtools=debug,info,terminal
+		$(meson_use examples demo-clients)
+		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
+		$(meson_use resize-optimization resize-pool)
+		$(meson_use test tests)
+		-Dtest-junit-xml=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+	addwrite /dev/dri/
+
+	# xwayland test can fail if X11 socket already exists.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Exv "xwayland") || die
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 3df7fd4b2e1c..d64755bcdb23 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS}
 
 DESCRIPTION="Wayland reference compositor"
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
@@ -49,14 +49,14 @@ RDEPEND="
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
 	drm? (
-		=media-libs/libdisplay-info-0.1*
+		<media-libs/libdisplay-info-0.3.0:=
 		>=media-libs/mesa-17.1[gbm(+)]
 		>=sys-libs/mtdev-1.1.0
 		>=virtual/udev-136
 	)
 	editor? ( x11-libs/pango )
 	examples? ( x11-libs/pango )
-	gles2? ( media-libs/mesa[gles2(+),wayland] )
+	gles2? ( media-libs/libglvnd )
 	jpeg? ( media-libs/libjpeg-turbo:0= )
 	lcms? ( >=media-libs/lcms-2.9:2 )
 	pipewire? ( >=media-video/pipewire-0.3:= )
@@ -85,19 +85,14 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.24
+	>=dev-libs/wayland-protocols-1.33
 "
 BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/wayland-scanner
 	virtual/pkgconfig
-	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 "
 
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
 src_configure() {
 	local emesonargs=(
 		$(meson_use drm backend-drm)
@@ -126,6 +121,7 @@ src_configure() {
 		$(meson_use examples demo-clients)
 		-Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "")
 		$(meson_use resize-optimization resize-pool)
+		$(meson_use test tests)
 		-Dtest-junit-xml=false
 		"${myconf[@]}"
 	)