gentoo auto-resync : 02:07:2024 - 08:01:06

4 files changed, 158 insertions, 3 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index e5b46fd1e7bc..68215029ee92 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -3,7 +3,8 @@ AUX weston-musl-basename.patch 2369 BLAKE2B 87b49e150f4f390bb9ce131f9cb85198d95a
 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
-EBUILD weston-13.0.0-r2.ebuild 3871 BLAKE2B 0a1c0f0705d443944a95f43d2f5fa0fc83e3a9eac6f59b659b4f1c3c08ac26c6d462775c88cedc2848bbc751ecfe5fe898fcc9640d60b21f3296619f1793cc87 SHA512 461fa28865a5b964855cf11856a68ceb542a81b95bbb6ab05bf8875a1c52c886df6490fa41d70cc72afce0f86950615c5e06b326dd4e3fa055daf07f687d6a27
+EBUILD weston-13.0.0-r3.ebuild 3901 BLAKE2B 50f7dbb9b15be8659a1fac247927304c1af5b588909ac7e0a9f6d9ba846d5e5725c38d3b63b0d55eb68e255924dfd0bf07a6a468aa40a07527e649e2cad5d4ac SHA512 e6572ab64d8f41d887e296328c7e70a8b0bd2b746bf0c43a15ecacdc2247725a4229b6f8a53577d90836847c962afb16f85c60b0f22d0927bfe956fcf8dab123
+EBUILD weston-13.0.3-r1.ebuild 3947 BLAKE2B 2a1efcafebf97a94491bd73cce0438215ee710a64d461e2a54885b5c114e0840d14d7fabf77983e3b3ae2cf4e5f9acc3194f85decf88b845e108c65128e29376 SHA512 00c2480f470d946fb785dc77bb5e2c5e09c37db6336cf6db54f293c63397d8e8cf08ec9e9658aa640d00f03335604e159ff8998bc1579e8d518ab52da535d2a3
 EBUILD weston-13.0.3.ebuild 3917 BLAKE2B 9703f094c1838d4f75df50e1a1af16e7349792a4ac8afe656e0015eac07db2e69b6a10342dc1ec98d5fa7a84da7a04381f37904ef41a5a95ada96620af2094a8 SHA512 0e6c46b791eb461192b9de7890d8596e1998203b6be51f01d2961f9d4e358df0ba6018971dbb5b460ff08647107aaf1ec9e505683272c6c3ba7b7d3d3aaeec4b
-EBUILD weston-9999.ebuild 3817 BLAKE2B 3478e85cb7eb78ece8cab0ba62a4e87241ae6324e5d7918e70eca10c10f0dc5d692ac3e74d22747f6130239915ec043fa9646203bb486912cce2f4eeb420dae4 SHA512 865cc75c5ea7a3ff6b880d989c186104f212ce43014d209f5a955c19b803a1759d567e2c4450b90253b5d64910db6ce9a23da0097e28d44a7b487f9298fcb823
+EBUILD weston-9999.ebuild 3853 BLAKE2B 8701609a596456457e638446794bf19ca4f255acb426c7175e883b2c65af392edfc666fe0e001f9186d21252f506883d46af92a1462d1cacc1b7c34bf0dbe2a2 SHA512 9b84ac9b14c3d5d2c9c88503d8a75bd90079cf88a079f1cb4861774c49be91f252aa4a831fef453332c78ee8996d7e4d6356dac9ac1873a7694b93405595dfea
 MISC metadata.xml 1512 BLAKE2B 9601dd1e3a3f977f92597a498a03eb819ea19b7a8434b3a0b27c138a5f9a6aa6f0642d82c1817797a57ff576e4058f7d54cf62e3ac5b5069a844f017fb47f5a7 SHA512 fc88d3a27063106d9c554253dceb65b9e6aa6207a502b4c6cb865c9529685b738e88b7fb84258201193248d0e6060cc84bc8a29661fdb71194fe499dbb0cae57
diff --git a/dev-libs/weston/weston-13.0.0-r2.ebuild b/dev-libs/weston/weston-13.0.0-r3.ebuild
index 1094abbbb6f3..2ab5833684f4 100644
--- a/dev-libs/weston/weston-13.0.0-r2.ebuild
+++ b/dev-libs/weston/weston-13.0.0-r3.ebuild
@@ -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 ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT CC-BY-SA-3.0"
@@ -41,6 +41,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libinput-1.2.0
 	>=dev-libs/wayland-1.22.0
+	=media-libs/libdisplay-info-0.1*:=
 	media-libs/libpng:0=
 	sys-auth/seatd:=
 	>=x11-libs/cairo-1.11.3
diff --git a/dev-libs/weston/weston-13.0.3-r1.ebuild b/dev-libs/weston/weston-13.0.3-r1.ebuild
new file mode 100644
index 000000000000..b03a284e1eac
--- /dev/null
+++ b/dev-libs/weston/weston-13.0.3-r1.ebuild
@@ -0,0 +1,152 @@
+# 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..12} )
+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 ~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/libdisplay-info-0.1*:=
+	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/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] )
+	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.24
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/wayland-scanner
+	virtual/pkgconfig
+	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
+	"${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)
+		-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)
+		-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 d88255844b74..84ea1f937e3b 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -41,6 +41,7 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libinput-1.2.0
 	>=dev-libs/wayland-1.22.0
+	=media-libs/libdisplay-info-0.1*:=
 	media-libs/libpng:0=
 	sys-auth/seatd:=
 	>=x11-libs/cairo-1.11.3