gentoo auto-resync : 25:04:2024 - 23:59:45

7 files changed, 32 insertions, 298 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index cc59693a6151..2c4f07cb7bd8 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,10 +1,8 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
+AUX weston-neatvnc-0.8.patch 782 BLAKE2B bf0c5734dec8b3b859d5c080945ed8664deda3665e8311493dedbf8060760c9d71322895ed247498659e2530275a5332c9cca03b1abd68a18fa14da45a094eb2 SHA512 22860eb9322ffe64c5aa05fbe92faeb1da9cc569417c97dac339512a88f251e4573e5c9349cb5a01faea7cafe3da7a73f6fca49b36cb0bb8ac73862ecb00600c
 DIST weston-11.0.1.tar.xz 1900796 BLAKE2B 33d7d5b3340e7074265885bd54ee039e8b5d448fa9f58f4bf9f823efd2557da9b916d903119565a806ab698382fe185165c8ede8614e983c872dfe15b474b616 SHA512 d451230fc260b45aaaadb5cf0aa360629e45e72e3b3676c6ec040d6c6549dbb57d05683effd962c3b2d61482b47a6c990d12cc736c896b501d982c8c4d34834c
-DIST weston-12.0.91.tar.xz 1986200 BLAKE2B 368fe795bd6121390f14995d8c5ddfcd585e620bcb54f0818b9e9131bb442e79048f82bcd90cfff563c7ad9968cdc9e4f1d859fdd318f4e9b08fec371c4a62e4 SHA512 8e1ceae599344c305e1b65294403d434c4a6ca740f76bdcc67a9f83afe9d352d75ab9cf8bb5091b889ddece43941adf9c4666767098c4c27cb732f8c7f8f738a
 DIST weston-13.0.0.tar.xz 1986520 BLAKE2B df0e73e451e39b329ed327c370f42bcae01eb5b8fad67711f069fa8f24900ac0c9a9e69b9a6445b67c76ab0ce441dcd2a5a1a8aa3ac0d89a647b9661d575a917 SHA512 8c656cdf24ec9429c76c64ebd2d58351991f5990a6d4b5900ac913243ad8e2c9c0fb1a748f018d177fbfd7e0a8836d0434d97acec287a8f977d47335ae30eacc
-EBUILD weston-11.0.1-r1.ebuild 3670 BLAKE2B 68f602a9146246169076ade491844eb26ec365ba8adeb9d474ce67599b0e7d859b71eb6c1fb9690d1ae78f05b2d860ad2ff3727ef42ff07017dbbe36c8ef9f3a SHA512 b04bded6989a3f08961d801501cfe0682c06144f4826173c295ec0cd208a8926b13bdb22b3d6e0c81cc5a704196e86ec68ad49899dcf6c693fec4bfe9c4f2567
-EBUILD weston-11.0.1-r10.ebuild 3648 BLAKE2B b9b687c98f0147edb97b18f44c628aeb2a1e283311b728e0427242d21f1897a840c20cd9580044e43617a2dd797368d4ad7922600660fdb828ed1f4e6264b70f SHA512 a60c48a58e0cbc4df204087dd7d73829ca9cc1a2331d22f0fef537c19a489bb3217f66fce19811bbab4aa5049d9021836cb96584d95f62f2b9cd9acf48a3b035
-EBUILD weston-12.0.91-r1.ebuild 3813 BLAKE2B 005ff0fa5f978d48a24d1d0806341825c33125787bb375611fb61157e97e3ec8560ab5e410c126623f48d1c4afd45c2103f232773645488529043f0549f205a1 SHA512 6734c4a61923e5006c8603371ac368d767721d06ec9932b9275d52cf94aeba7bbfd2a46a08b8ba4eda279e16094d5f8cb2ec6fe98ddf5897b9196d47e6c51cf6
-EBUILD weston-13.0.0-r1.ebuild 3813 BLAKE2B 005ff0fa5f978d48a24d1d0806341825c33125787bb375611fb61157e97e3ec8560ab5e410c126623f48d1c4afd45c2103f232773645488529043f0549f205a1 SHA512 6734c4a61923e5006c8603371ac368d767721d06ec9932b9275d52cf94aeba7bbfd2a46a08b8ba4eda279e16094d5f8cb2ec6fe98ddf5897b9196d47e6c51cf6
-EBUILD weston-9999.ebuild 3813 BLAKE2B 005ff0fa5f978d48a24d1d0806341825c33125787bb375611fb61157e97e3ec8560ab5e410c126623f48d1c4afd45c2103f232773645488529043f0549f205a1 SHA512 6734c4a61923e5006c8603371ac368d767721d06ec9932b9275d52cf94aeba7bbfd2a46a08b8ba4eda279e16094d5f8cb2ec6fe98ddf5897b9196d47e6c51cf6
+EBUILD weston-11.0.1-r10.ebuild 3651 BLAKE2B ef0b90c3cdb7035d8dd0267813a01b6142d560ccdd90deba71e9e035da155ee9a61a018d7489b12792bfdc29d615bf5bbdf096b01f38c89f11ee5e23f188300e SHA512 800c7006c64faa698688c3d044e4ff7bd7d496abf295c5515994dacc7dc951f0d4e32a181f4f42d5a2305b851f980b1c2ff88f66281fe91fc66beaa87723af19
+EBUILD weston-13.0.0-r2.ebuild 3868 BLAKE2B 64b4ef79a82207ed7526253c1e48bc27a9a727c8357fcc5885d86de27f0760f412dc8f96f9981a66217528363d080583c24014fe06337e60dab98773f5223368 SHA512 fd07eaf7402fe45bc8d196663f0e26a4abac744080b3e268be35b893d3dac132ab8ddc654f5e21342323122e9a47a6ea7ae05c33d19395311ecde20970f033c6
+EBUILD weston-9999.ebuild 3868 BLAKE2B 64b4ef79a82207ed7526253c1e48bc27a9a727c8357fcc5885d86de27f0760f412dc8f96f9981a66217528363d080583c24014fe06337e60dab98773f5223368 SHA512 fd07eaf7402fe45bc8d196663f0e26a4abac744080b3e268be35b893d3dac132ab8ddc654f5e21342323122e9a47a6ea7ae05c33d19395311ecde20970f033c6
 MISC metadata.xml 1605 BLAKE2B d4379b28e83de554638a52a2938d3cc57d170ebc0d58a6b5e88cc21c64afc5421e8fa640e7c0e9aa9c8e28861d086a2aabe406b3b1209f3122670edecc3154bd SHA512 0e953c0dfc0174a8f15586d12b56f650bccdcca085c911dd85ae320ed7deb836daf51679a54fece6afdba55ba520074d10275b50f4ed310e55e9aa79eae4cf7a
diff --git a/dev-libs/weston/files/weston-neatvnc-0.8.patch b/dev-libs/weston/files/weston-neatvnc-0.8.patch
new file mode 100644
index 000000000000..03ffab596c3a
--- /dev/null
+++ b/dev-libs/weston/files/weston-neatvnc-0.8.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/930424
+https://gitlab.freedesktop.org/wayland/weston/-/issues/890
+
+diff -Naur a/libweston/backend-vnc/meson.build b/libweston/backend-vnc/meson.build
+--- a/libweston/backend-vnc/meson.build	2023-11-27 18:01:53.000000000 +0000
++++ b/libweston/backend-vnc/meson.build	2024-04-24 23:55:22.262121014 +0100
+@@ -3,7 +3,7 @@
+ endif
+
+ config_h.set('BUILD_VNC_COMPOSITOR', '1')
+-dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.8.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
++dep_neatvnc = dependency('neatvnc', version: ['>= 0.7.0', '< 0.9.0'], required: false, fallback: ['neatvnc', 'neatvnc_dep'])
+ if not dep_neatvnc.found()
+ 	error('VNC backend requires neatvnc which was not found. Or, you can use \'-Dbackend-vnc=false\'.')
+ endif
diff --git a/dev-libs/weston/weston-11.0.1-r1.ebuild b/dev-libs/weston/weston-11.0.1-r1.ebuild
deleted file mode 100644
index d0775521a739..000000000000
--- a/dev-libs/weston/weston-11.0.1-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# 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_{9..11} )
-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}/uploads/f5648c818fba5432edc3ea63c4db4813/${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 +seatd +suid systemd test 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 wayland-compositor X )
-	|| ( seatd systemd )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.20.0
-	lcms? ( >=media-libs/lcms-2.9:2 )
-	media-libs/libpng:0=
-	webp? ( media-libs/libwebp:0= )
-	jpeg? ( media-libs/libjpeg-turbo:0= )
-	>=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]
-	)
-	pipewire? ( >=media-video/pipewire-0.3:= )
-	rdp? ( >=net-misc/freerdp-2.3.0:0=[server] <net-misc/freerdp-3:0 )
-	remoting? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	seatd? ( sys-auth/seatd:= )
-	systemd? (
-		sys-auth/pambase[systemd]
-		>=sys-apps/dbus-1.6
-		>=sys-apps/systemd-209[pam]
-	)
-	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
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/wayland-protocols-1.24
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use drm backend-drm)
-		-Dbackend-drm-screencast-vaapi=false
-		$(meson_use headless backend-headless)
-		$(meson_use rdp backend-rdp)
-		$(meson_use screen-sharing screenshare)
-		$(meson_use wayland-compositor backend-wayland)
-		$(meson_use X backend-x11)
-		-Dbackend-default=auto
-		$(meson_use gles2 renderer-gl)
-		$(meson_use xwayland)
-		$(meson_use seatd launcher-libseat)
-		$(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 systemd launcher-logind)
-		$(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-11.0.1-r10.ebuild b/dev-libs/weston/weston-11.0.1-r10.ebuild
index 74ee66abd7d2..2ed95404301f 100644
--- a/dev-libs/weston/weston-11.0.1-r10.ebuild
+++ b/dev-libs/weston/weston-11.0.1-r10.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 	editor? ( x11-libs/pango )
 	examples? ( x11-libs/pango )
 	gles2? (
-		media-libs/mesa[gles2,wayland]
+		media-libs/mesa[gles2(+),wayland]
 	)
 	pipewire? ( >=media-video/pipewire-0.3:= )
 	rdp? ( >=net-misc/freerdp-2.3.0:2=[server] )
diff --git a/dev-libs/weston/weston-13.0.0-r1.ebuild b/dev-libs/weston/weston-13.0.0-r1.ebuild
deleted file mode 100644
index 9b26690ae48b..000000000000
--- a/dev-libs/weston/weston-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# 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_{9..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 ~ia64 ~loong ~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/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.7*
-		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}]')
-"
-
-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-12.0.91-r1.ebuild b/dev-libs/weston/weston-13.0.0-r2.ebuild
index 9b26690ae48b..002b836d7566 100644
--- a/dev-libs/weston/weston-12.0.91-r1.ebuild
+++ b/dev-libs/weston/weston-13.0.0-r2.ebuild
@@ -55,7 +55,7 @@ RDEPEND="
 	)
 	editor? ( x11-libs/pango )
 	examples? ( x11-libs/pango )
-	gles2? ( media-libs/mesa[gles2,wayland] )
+	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:= )
@@ -67,7 +67,7 @@ RDEPEND="
 	systemd? ( sys-apps/systemd )
 	vnc? (
 		=dev-libs/aml-0.3*
-		=gui-libs/neatvnc-0.7*
+		=gui-libs/neatvnc-0.8*
 		sys-libs/pam
 	)
 	webp? ( media-libs/libwebp:0= )
@@ -93,6 +93,10 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
+)
+
 python_check_deps() {
 	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
 }
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 9b26690ae48b..002b836d7566 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -55,7 +55,7 @@ RDEPEND="
 	)
 	editor? ( x11-libs/pango )
 	examples? ( x11-libs/pango )
-	gles2? ( media-libs/mesa[gles2,wayland] )
+	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:= )
@@ -67,7 +67,7 @@ RDEPEND="
 	systemd? ( sys-apps/systemd )
 	vnc? (
 		=dev-libs/aml-0.3*
-		=gui-libs/neatvnc-0.7*
+		=gui-libs/neatvnc-0.8*
 		sys-libs/pam
 	)
 	webp? ( media-libs/libwebp:0= )
@@ -93,6 +93,10 @@ BDEPEND="
 	$(python_gen_any_dep 'dev-python/setuptools[${PYTHON_USEDEP}]')
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-neatvnc-0.8.patch
+)
+
 python_check_deps() {
 	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
 }