gentoo resync : 28.07.2021

3 files changed, 153 insertions, 2 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 41015ea147b8..c48230913e2e 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,6 +1,7 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 AUX weston-pipewire-0.3.patch 11856 BLAKE2B aebe0f4859a0ac3144d8f631fd8b5e35c02f62217ad94106c138aa6095430a2aff7aedf88d67f95991d32e9c728b6704746fedc9858e41e5d99900722b6617ec SHA512 f3e028df4967672c58e1cac66fc8b7781252f15094439dca399d820d945156a15f1e420a8ed062584dcdd7c9577849127aa52974639877796ce91231123bf50d
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90
+EBUILD weston-9.0.0-r1.ebuild 3747 BLAKE2B ce56d896e4df389c4e86106ac8b871e6fd9689c51634afae45893dfb81f62b9f5d28be49ab5eb6562bcd084a2f905e9dc2ecf52aa68298cc4ce852f2568d9ba6 SHA512 c011e7be8553c89dfd9a00c86662ea13d0a248bbb249f4ffc8d7192044ebaefcce1f2dc0fb0933278ebdaca82aee48aa106fc49772aacfc2effcceee6bd4bb8f
 EBUILD weston-9.0.0.ebuild 3755 BLAKE2B de02e57433e44ccc95ef31d8102cc5b7b324046f55cb429d71f0daf34ad2545c8a6692cf0b9051c34333bc7fb4a90c4063fdcc15ab78a3a40195a1f2a9ba5da4 SHA512 f1d838f5f916d5475d8a0335ddbd1185148e9aebd7882915f6acc7697a0582d16645b9f979a365125d6a8947f19b852aad5f5e4f8ab614ea80d47965ef219cfd
-EBUILD weston-9999.ebuild 3765 BLAKE2B 226d86686fad93bbf4f190693d3c886c2711c22f69fc4836b6af8d07d3635b943b9c7cc265468f7486ad441312ca7c73782e3f9d124b858e2b0ef656fa7e223a SHA512 c03b3e2cc8e85a17ba6ffde820129bb28d15606c4acb1dbe5ec1cac9445ffadf2b83f426c0b2a89db521b57cfa0fd90ad6217343c40c822cde82bcb2afaa1617
+EBUILD weston-9999.ebuild 3753 BLAKE2B b81df5b4510d1968b7804b6d1eac4f766e3dade595169ee913716602b325d75c595dff3ac108c3494a62a69c83662d304a3d4f4b9715a445ea51f25206a60108 SHA512 7c9bd4fc88c9a8c4f06300cfb9da70c8e7c52dc3cdfc75fbf61b0cdde899c484ed576663b4fbe6b8e9388f9dcad82dea62ec16daffbe69e1c4c719490de93ad1
 MISC metadata.xml 1577 BLAKE2B fd7b5b207ef50215ea220e27557a99700c6115bdae6b74f9176430fc26cd57acd2e52903cea6105ca1425a0c9cd3b0afe2fcb1a56df385480481dbc937d9bcf8 SHA512 b0dc8edf543a5d620e40333fe6abbbc607d317588ca4cbaf336446364208301e842efdfed8532d35e29339be10e6af6e449e9f6d84e301241333b7e81ea7d59a
diff --git a/dev-libs/weston/weston-9.0.0-r1.ebuild b/dev-libs/weston/weston-9.0.0-r1.ebuild
new file mode 100644
index 000000000000..9cccdc2f48f7
--- /dev/null
+++ b/dev-libs/weston/weston-9.0.0-r1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit meson 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://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg kiosk +launch lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test wayland-compositor webp +X xwayland"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	colord? ( lcms )
+	drm? ( gles2 )
+	pipewire? ( drm )
+	screen-sharing? ( rdp )
+	test? ( desktop headless xwayland )
+	wayland-compositor? ( gles2 )
+	|| ( drm fbdev headless rdp wayland-compositor X )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-0.8.0
+	>=dev-libs/wayland-1.17.0
+	>=dev-libs/wayland-protocols-1.18
+	lcms? ( media-libs/lcms:2 )
+	media-libs/libpng:0=
+	webp? ( media-libs/libwebp:0= )
+	jpeg? ( virtual/jpeg:0= )
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.68
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	fbdev? (
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	colord? ( >=x11-misc/colord-0.1.27 )
+	drm? (
+		>=media-libs/mesa-17.1[gbm]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	gles2? (
+		media-libs/mesa[gles2,wayland]
+	)
+	pipewire? ( >=media-video/pipewire-0.2:= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	systemd? (
+		sys-auth/pambase[systemd]
+		>=sys-apps/dbus-1.6
+		>=sys-apps/systemd-209[pam]
+	)
+	launch? ( sys-auth/pambase )
+	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}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-pipewire-0.3.patch
+)
+
+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)
+		$(meson_use fbdev backend-fbdev)
+		-Dbackend-default=auto
+		$(meson_use gles2 renderer-gl)
+		$(meson_use launch weston-launch)
+		$(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 colord color-management-colord)
+		$(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
+		-Dtest-gl-renderer=false
+		"${myconf[@]}"
+	)
+	meson_src_configure
+}
+
+src_test() {
+	xdg_environment_reset
+
+	# devices test usually fails.
+	cd "${BUILD_DIR}" || die
+	meson test $(meson test --list | grep -Fxv devices) || die
+}
+
+src_install() {
+	meson_src_install
+	if use launch && use suid; then
+		chmod u+s "${ED}"/usr/bin/weston-launch || die
+	fi
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 5bc288e98744..8d0a5358b774 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -82,7 +82,7 @@ RDEPEND="
 		x11-libs/libX11
 	)
 	xwayland? (
-		x11-base/xorg-server[wayland]
+		x11-base/xwayland
 		x11-libs/cairo[X,xcb(+)]
 		>=x11-libs/libxcb-1.9
 		x11-libs/libXcursor