[gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/files/, dev-libs/weston/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/files/, dev-libs/weston/
@ 2018-04-29 22:07 Andreas Hüttel
  0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2018-04-29 22:07 UTC (permalink / raw
  To: gentoo-commits

commit:     0a594acda7bfbae3c55c54c9d0c521f362c2843d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 29 22:06:51 2018 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 22:07:00 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a594acd

dev-libs/weston: Add build fix for glibc-2.26, bug 610652

Oh well, this one was really easy.

Closes: https://bugs.gentoo.org/610652
Package-Manager: Portage-2.3.31, Repoman-2.3.9

 dev-libs/weston/files/weston-1.11.0-sysmacros.patch | 11 +++++++++++
 dev-libs/weston/weston-1.11.0.ebuild                |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/dev-libs/weston/files/weston-1.11.0-sysmacros.patch b/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
new file mode 100644
index 00000000000..6f54bfc11cd
--- /dev/null
+++ b/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
@@ -0,0 +1,11 @@
+diff -ruN weston-1.11.0.orig/src/weston-launch.c weston-1.11.0/src/weston-launch.c
+--- weston-1.11.0.orig/src/weston-launch.c	2015-10-24 02:02:43.000000000 +0200
++++ weston-1.11.0/src/weston-launch.c	2018-04-30 00:02:42.528120347 +0200
+@@ -37,6 +37,7 @@
+ #include <getopt.h>
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>

diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.11.0.ebuild
index 9574ec16fc7..81098bc0289 100644
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ b/dev-libs/weston/weston-1.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ fi
 VIRTUALX_REQUIRED="test"
 RESTRICT="test"
 
-inherit autotools readme.gentoo-r1 toolchain-funcs virtualx $GIT_ECLASS
+inherit autotools readme.gentoo-r1 toolchain-funcs virtualx epatch $GIT_ECLASS
 
 DESCRIPTION="Wayland reference compositor"
 HOMEPAGE="https://wayland.freedesktop.org/"
@@ -95,6 +95,7 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-sysmacros.patch"
 	if [[ ${PV} = 9999* ]]; then
 		eautoreconf
 	fi


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/files/, dev-libs/weston/
@ 2018-06-06 23:38 Matt Turner
  0 siblings, 0 replies; 7+ messages in thread
From: Matt Turner @ 2018-06-06 23:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5f5f1648cf755419706eadaca7760f23f4bcc228
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  6 23:37:51 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun  6 23:38:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5f1648

dev-libs/weston: Drop old versions

 dev-libs/weston/Manifest                           |   2 -
 .../weston/files/weston-1.11.0-sysmacros.patch     |  11 --
 dev-libs/weston/metadata.xml                       |   1 -
 dev-libs/weston/weston-1.11.0.ebuild               | 157 ---------------------
 dev-libs/weston/weston-1.9.0.ebuild                | 143 -------------------
 5 files changed, 314 deletions(-)

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index c396e7e064b..e4a6d59c72c 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,3 +1 @@
-DIST weston-1.11.0.tar.xz 1242244 BLAKE2B 065d2ca010a73eaccf6ddb1d803ca2c2e9fe7725b8c802ad0ad8af668efa4f194e2dc46d98d6138909d49f2b6c435bad070ded036413632acc2f1731b1a392e0 SHA512 30c43058aeca2d90d8c57ee3beb824aa42474eb2d0fa942622949b49c7771eb5d8d9c452d496a13950baabffef3c343d7386821778ae931939039fab2f782ad5
-DIST weston-1.9.0.tar.xz 1238240 BLAKE2B a52e6868527f0487f972578c8953e0d35009ab90cd27f09f67044528df962b042f6344846c15b887f228e459d10700578c80367910f65dab1279581bb9bdadc2 SHA512 9bcbb5971b8a55d9e10aacf0aae868ff03750a98daee5233dcbff5698ed84e41c4b147fa1fdb1e2be916e3b1e13f259e0eec62354517d6e2a7e1d301a8522f66
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58

diff --git a/dev-libs/weston/files/weston-1.11.0-sysmacros.patch b/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
deleted file mode 100644
index 6f54bfc11cd..00000000000
--- a/dev-libs/weston/files/weston-1.11.0-sysmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN weston-1.11.0.orig/src/weston-launch.c weston-1.11.0/src/weston-launch.c
---- weston-1.11.0.orig/src/weston-launch.c	2015-10-24 02:02:43.000000000 +0200
-+++ weston-1.11.0/src/weston-launch.c	2018-04-30 00:02:42.528120347 +0200
-@@ -37,6 +37,7 @@
- #include <getopt.h>
- 
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
- #include <sys/wait.h>

diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 54c40413ede..661f699a5e5 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -16,7 +16,6 @@
 	<flag name="launch">Install weston-launch utility</flag>
 	<flag name="rdp">Enable Remote Desktop Protocol compositor support</flag>
 	<flag name="resize-optimization">Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
-	<flag name="rpi">Raspberry Pi GPU support</flag>
 	<flag name="screen-sharing">Enable screen-sharing through RDP</flag>
 	<flag name="unwind">Enable libunwind usage for backtraces</flag>
 	<flag name="wayland-compositor">Enable Wayland compositor support</flag>

diff --git a/dev-libs/weston/weston-1.11.0.ebuild b/dev-libs/weston/weston-1.11.0.ebuild
deleted file mode 100644
index 81098bc0289..00000000000
--- a/dev-libs/weston/weston-1.11.0.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-VIRTUALX_REQUIRED="test"
-RESTRICT="test"
-
-inherit autotools readme.gentoo-r1 toolchain-funcs virtualx epatch $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="amd64 arm x86"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86 ~arm-linux"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg lcms rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	screen-sharing? ( rdp )
-	systemd? ( dbus )
-	test? ( X )
-	wayland-compositor? ( gles2 )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.10.0
-	>=dev-libs/wayland-protocols-1.2
-	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.30
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	dbus? ( sys-apps/dbus )
-	drm? (
-		media-libs/mesa[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	rdp? (
-		>=net-misc/freerdp-1.1.0_beta1_p20130710
-		<net-misc/freerdp-2.0.0_pre20161219
-	)
-	rpi? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	systemd? (
-		sys-auth/pambase[systemd]
-		sys-apps/systemd[pam]
-	)
-	launch? ( sys-auth/pambase )
-	unwind? ( sys-libs/libunwind )
-	X? (
-		x11-libs/libxcb
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
-		x11-libs/libxcb
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-sysmacros.patch"
-	if [[ ${PV} = 9999* ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use examples || use test; then
-		myconf="--enable-simple-clients"
-	else
-		myconf="--disable-simple-clients"
-	fi
-
-	myconf+=" --with-cairo=image --disable-simple-egl-clients"
-
-	econf \
-		$(use_enable examples demo-clients-install) \
-		$(use_enable fbdev fbdev-compositor) \
-		$(use_enable dbus) \
-		$(use_enable drm drm-compositor) \
-		$(use_enable headless headless-compositor) \
-		$(use_enable ivi ivi-shell) \
-		$(use_enable lcms) \
-		$(use_enable rdp rdp-compositor) \
-		$(use_enable rpi rpi-compositor) \
-		$(use_enable wayland-compositor) \
-		$(use_enable X x11-compositor) \
-		$(use_enable launch weston-launch) \
-		$(use_enable colord) \
-		$(use_enable gles2 egl) \
-		$(use_enable unwind libunwind) \
-		$(use_enable resize-optimization) \
-		$(use_enable screen-sharing) \
-		$(use_enable suid setuid-install) \
-		$(use_enable systemd systemd-login) \
-		$(use_enable systemd systemd-notify) \
-		$(use_enable xwayland) \
-		$(use_enable xwayland xwayland-test) \
-		$(use_with jpeg) \
-		$(use_with webp) \
-		--disable-simple-dmabuf-intel-client \
-		--disable-simple-dmabuf-v4l-client \
-		${myconf}
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	cd "${BUILD_DIR}" || die
-	Xemake check
-}
-
-src_install() {
-	default
-
-	readme.gentoo_create_doc
-}

diff --git a/dev-libs/weston/weston-1.9.0.ebuild b/dev-libs/weston/weston-1.9.0.ebuild
deleted file mode 100644
index 9a3663c34e7..00000000000
--- a/dev-libs/weston/weston-1.9.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-fi
-VIRTUALX_REQUIRED="test"
-RESTRICT="test"
-
-inherit autotools readme.gentoo toolchain-funcs virtualx $GIT_ECLASS
-
-DESCRIPTION="Wayland reference compositor"
-HOMEPAGE="https://wayland.freedesktop.org/"
-
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-	KEYWORDS="arm"
-else
-	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm x86 ~arm-linux"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland"
-
-REQUIRED_USE="
-	drm? ( gles2 )
-	screen-sharing? ( rdp )
-	test? ( X )
-	wayland-compositor? ( gles2 )
-"
-
-RDEPEND="
-	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.9.0
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	media-libs/libwebp:0=
-	virtual/jpeg:0=
-	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.30
-	x11-libs/libxkbcommon
-	x11-libs/pixman
-	x11-misc/xkeyboard-config
-	fbdev? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	colord? ( >=x11-misc/colord-0.1.27 )
-	dbus? ( sys-apps/dbus )
-	drm? (
-		media-libs/mesa[gbm]
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	editor? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
-	rpi? (
-		>=sys-libs/mtdev-1.1.0
-		>=virtual/udev-136
-	)
-	systemd? (
-		sys-auth/pambase[systemd]
-		sys-apps/systemd[pam]
-	)
-	launch? ( sys-auth/pambase )
-	unwind? ( sys-libs/libunwind )
-	X? (
-		x11-libs/libxcb
-		x11-libs/libX11
-	)
-	xwayland? (
-		x11-base/xorg-server[wayland]
-		x11-libs/cairo[xcb]
-		x11-libs/libxcb
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myconf
-	if use examples || use test; then
-		myconf="--enable-simple-clients"
-	else
-		myconf="--disable-simple-clients"
-	fi
-
-	myconf+=" --with-cairo=image --disable-simple-egl-clients"
-
-	econf \
-		$(use_enable examples demo-clients-install) \
-		$(use_enable fbdev fbdev-compositor) \
-		$(use_enable dbus) \
-		$(use_enable drm drm-compositor) \
-		$(use_enable headless headless-compositor) \
-		$(use_enable ivi ivi-shell) \
-		$(use_enable rdp rdp-compositor) \
-		$(use_enable rpi rpi-compositor) \
-		$(use_enable wayland-compositor) \
-		$(use_enable X x11-compositor) \
-		$(use_enable launch weston-launch) \
-		$(use_enable colord) \
-		$(use_enable gles2 egl) \
-		$(use_enable unwind libunwind) \
-		$(use_enable resize-optimization) \
-		$(use_enable screen-sharing) \
-		$(use_enable suid setuid-install) \
-		$(use_enable xwayland) \
-		$(use_enable xwayland xwayland-test) \
-		${myconf}
-}
-
-src_test() {
-	export XDG_RUNTIME_DIR="${T}/runtime-dir"
-	mkdir "${XDG_RUNTIME_DIR}" || die
-	chmod 0700 "${XDG_RUNTIME_DIR}" || die
-
-	cd "${BUILD_DIR}" || die
-	Xemake check
-}
-
-src_install() {
-	default
-
-	readme.gentoo_src_install
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/files/, dev-libs/weston/
@ 2022-02-05 17:01 James Le Cuirot
  0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2022-02-05 17:01 UTC (permalink / raw
  To: gentoo-commits

commit:     68371873bacbcd8ec53dd382fe0b9b1fd8d3dcb5
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 16:41:26 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 17:00:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68371873

dev-libs/weston: Version bump to 10.0.0

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-libs/weston/Manifest                           |  1 +
 .../files/weston-10.0.0-backend-default.patch      | 27 ++++++++++++++++++++++
 .../{weston-9999.ebuild => weston-10.0.0.ebuild}   | 26 ++++++++++-----------
 dev-libs/weston/weston-9999.ebuild                 | 22 ++++++++----------
 4 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index a34e308ad4f7..1d2bf61666d9 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1 +1,2 @@
+DIST weston-10.0.0.tar.xz 1774600 BLAKE2B b2b8fa4f7542aba03970ca8abf504f340f8f8da9f9581c16ceac5c702eac355f5d4244778393a8804017f39dff490431e26a48580746033158bd2d2b721437f8 SHA512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4
 DIST weston-9.0.0.tar.xz 1555212 BLAKE2B 6c5feb3959ebe894861c6dc0817633b23e8518baf1c359c2967f111c071e9d4f166ef1421ad6465b036b3f1c485cab5f442476e7a44e3ec722cff576dea73852 SHA512 ccc263f8279b7b23e5c593b4a8a023de2c3dc178b1b8d6593599171770bcfe97608de9fcb77aa1cab39255451d289d323e51c317dae190c7641282e085b84f90

diff --git a/dev-libs/weston/files/weston-10.0.0-backend-default.patch b/dev-libs/weston/files/weston-10.0.0-backend-default.patch
new file mode 100644
index 000000000000..710639e7e9c5
--- /dev/null
+++ b/dev-libs/weston/files/weston-10.0.0-backend-default.patch
@@ -0,0 +1,27 @@
+From 35e3fb72ac28af628aa1d2b7ee804a3f81720c47 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 4 Feb 2022 23:43:50 +0000
+Subject: [PATCH] meson.build: Fix -Dbackend-default=auto following fbdev
+ deprecation
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 1c73e130..d761903e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -121,7 +121,7 @@ config_h.set10('TEST_GL_RENDERER', get_option('test-gl-renderer'))
+ 
+ backend_default = get_option('backend-default')
+ if backend_default == 'auto'
+-	foreach b : [ 'headless', 'fbdev', 'x11', 'wayland', 'drm' ]
++	foreach b : [ 'headless', 'x11', 'wayland', 'drm' ]
+ 		if get_option('backend-' + b)
+ 			backend_default = b
+ 		endif
+-- 
+2.34.1
+

diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-10.0.0.ebuild
similarity index 85%
copy from dev-libs/weston/weston-9999.ebuild
copy to dev-libs/weston/weston-10.0.0.ebuild
index 97a1005e1360..5ab9746b8514 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-10.0.0.ebuild
@@ -18,13 +18,13 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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 seatd +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +desktop +drm editor examples fbdev 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="
@@ -40,14 +40,14 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.17.0
-	>=dev-libs/wayland-protocols-1.18
+	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-protocols-1.24
 	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/libdrm-2.4.95
 	>=x11-libs/libxkbcommon-0.5.0
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
@@ -66,7 +66,7 @@ RDEPEND="
 	gles2? (
 		media-libs/mesa[gles2,wayland]
 	)
-	pipewire? ( >=media-video/pipewire-0.2:= )
+	pipewire? ( >=media-video/pipewire-0.3:= )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
 	remoting? (
 		media-libs/gstreamer:1.0
@@ -78,7 +78,6 @@ RDEPEND="
 		>=sys-apps/dbus-1.6
 		>=sys-apps/systemd-209[pam]
 	)
-	launch? ( sys-auth/pambase )
 	X? (
 		>=x11-libs/libxcb-1.9
 		x11-libs/libX11
@@ -95,6 +94,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0.0-backend-default.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use drm backend-drm)
@@ -104,10 +107,9 @@ src_configure() {
 		$(meson_use screen-sharing screenshare)
 		$(meson_use wayland-compositor backend-wayland)
 		$(meson_use X backend-x11)
-		$(meson_use fbdev backend-fbdev)
+		$(meson_use fbdev deprecated-backend-fbdev)
 		-Dbackend-default=auto
 		$(meson_use gles2 renderer-gl)
-		$(meson_use launch weston-launch)
 		$(meson_use xwayland)
 		$(meson_use seatd launcher-libseat)
 		$(meson_use systemd)
@@ -137,14 +139,12 @@ src_test() {
 	xdg_environment_reset
 
 	# devices test usually fails.
+	# xwayland test can fail if X11 socket already exists.
 	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Fxv devices) || die
+	meson test $(meson test --list | grep -Exv "devices|xwayland") || 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 97a1005e1360..478f60d2b893 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -18,13 +18,13 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI="${SRC_PATCHES}"
 else
 	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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 seatd +suid systemd test wayland-compositor webp +X xwayland"
+IUSE="colord +desktop +drm editor examples fbdev 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="
@@ -40,14 +40,14 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/libinput-0.8.0
-	>=dev-libs/wayland-1.17.0
-	>=dev-libs/wayland-protocols-1.18
+	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-protocols-1.24
 	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/libdrm-2.4.95
 	>=x11-libs/libxkbcommon-0.5.0
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
@@ -66,7 +66,7 @@ RDEPEND="
 	gles2? (
 		media-libs/mesa[gles2,wayland]
 	)
-	pipewire? ( >=media-video/pipewire-0.2:= )
+	pipewire? ( >=media-video/pipewire-0.3:= )
 	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
 	remoting? (
 		media-libs/gstreamer:1.0
@@ -78,7 +78,6 @@ RDEPEND="
 		>=sys-apps/dbus-1.6
 		>=sys-apps/systemd-209[pam]
 	)
-	launch? ( sys-auth/pambase )
 	X? (
 		>=x11-libs/libxcb-1.9
 		x11-libs/libX11
@@ -104,10 +103,9 @@ src_configure() {
 		$(meson_use screen-sharing screenshare)
 		$(meson_use wayland-compositor backend-wayland)
 		$(meson_use X backend-x11)
-		$(meson_use fbdev backend-fbdev)
+		$(meson_use fbdev deprecated-backend-fbdev)
 		-Dbackend-default=auto
 		$(meson_use gles2 renderer-gl)
-		$(meson_use launch weston-launch)
 		$(meson_use xwayland)
 		$(meson_use seatd launcher-libseat)
 		$(meson_use systemd)
@@ -137,14 +135,12 @@ src_test() {
 	xdg_environment_reset
 
 	# devices test usually fails.
+	# xwayland test can fail if X11 socket already exists.
 	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Fxv devices) || die
+	meson test $(meson test --list | grep -Exv "devices|xwayland") || 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
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/files/, dev-libs/weston/
@ 2022-02-08 23:00 James Le Cuirot
  0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2022-02-08 23:00 UTC (permalink / raw
  To: gentoo-commits

commit:     2487bf5db21890b5712ea7056f5a558a1af8e9bc
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  8 23:00:18 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Feb  8 23:00:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2487bf5d

dev-libs/weston: Use upstream patch to fix USE=-desktop on 10.0.0

Closes: https://bugs.gentoo.org/832950
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 .../weston/files/weston-10.0.0-test-deps.patch     | 34 ++++++++++++++++++++++
 dev-libs/weston/weston-10.0.0.ebuild               |  1 +
 2 files changed, 35 insertions(+)

diff --git a/dev-libs/weston/files/weston-10.0.0-test-deps.patch b/dev-libs/weston/files/weston-10.0.0-test-deps.patch
new file mode 100644
index 000000000000..cc6ad8c6e130
--- /dev/null
+++ b/dev-libs/weston/files/weston-10.0.0-test-deps.patch
@@ -0,0 +1,34 @@
+From 9516859b9fdb2899a37116b55200fb04f7726b45 Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniels@collabora.com>
+Date: Tue, 8 Feb 2022 22:39:42 +0000
+Subject: [PATCH] tests: Add dependency on screenshooter client protocol
+
+Given that the test-helper code relies on the screenshooter protocol,
+make sure it's available for us to build, and the dependency ensures we
+build in order.
+
+Fixes: #588
+
+Signed-off-by: Daniel Stone <daniels@collabora.com>
+---
+ tests/meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index d8e96e77d..955c4226c 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -29,8 +29,9 @@ lib_test_client = static_library(
+ 		'weston-test-client-helper.c',
+ 		'weston-test-fixture-compositor.c',
+ 		weston_test_client_protocol_h,
+-		weston_screenshooter_protocol_c,
+ 		weston_test_protocol_c,
++		weston_screenshooter_client_protocol_h,
++		weston_screenshooter_protocol_c,
+ 		viewporter_client_protocol_h,
+ 		viewporter_protocol_c,
+ 		'color_util.h',
+-- 
+GitLab
+

diff --git a/dev-libs/weston/weston-10.0.0.ebuild b/dev-libs/weston/weston-10.0.0.ebuild
index ef2891bf73bb..d488637fff57 100644
--- a/dev-libs/weston/weston-10.0.0.ebuild
+++ b/dev-libs/weston/weston-10.0.0.ebuild
@@ -98,6 +98,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-10.0.0-backend-default.patch
+	"${FILESDIR}"/${PN}-10.0.0-test-deps.patch
 )
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/files/, dev-libs/weston/
@ 2023-06-24 13:41 James Le Cuirot
  0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2023-06-24 13:41 UTC (permalink / raw
  To: gentoo-commits

commit:     6682d4c677229bc9c3d63488669c8c7d1b3d1a4a
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 13:18:22 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 13:41:11 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6682d4c6

dev-libs/weston: Drop old 10.0.0

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-libs/weston/Manifest                           |   1 -
 .../files/weston-10.0.0-backend-default.patch      |  27 ----
 .../weston/files/weston-10.0.0-test-deps.patch     |  34 -----
 dev-libs/weston/metadata.xml                       |   1 -
 dev-libs/weston/weston-10.0.0.ebuild               | 153 ---------------------
 5 files changed, 216 deletions(-)

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 13a8b5ea909a..a7a46a867df7 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,3 +1,2 @@
-DIST weston-10.0.0.tar.xz 1774600 BLAKE2B b2b8fa4f7542aba03970ca8abf504f340f8f8da9f9581c16ceac5c702eac355f5d4244778393a8804017f39dff490431e26a48580746033158bd2d2b721437f8 SHA512 77e05530751e4f743eebf015ab5b78a1fcc66b774713b5e296cfffc488be84e459f811c85ac4280b7b63eebf4ff5c958dd7306376ab343e6b80feae16c8c35a4
 DIST weston-11.0.1.tar.xz 1900796 BLAKE2B 33d7d5b3340e7074265885bd54ee039e8b5d448fa9f58f4bf9f823efd2557da9b916d903119565a806ab698382fe185165c8ede8614e983c872dfe15b474b616 SHA512 d451230fc260b45aaaadb5cf0aa360629e45e72e3b3676c6ec040d6c6549dbb57d05683effd962c3b2d61482b47a6c990d12cc736c896b501d982c8c4d34834c
 DIST weston-12.0.1.tar.xz 1969772 BLAKE2B d7a76ad6e11b76b73b91aeb9b3b49e823ecc8170bd1306f9a8ed90fa49d9bc7734e4c0595ca67f11421ecf5b4dbf04289cf803726c508e8c979a9850c0e94ccb SHA512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688

diff --git a/dev-libs/weston/files/weston-10.0.0-backend-default.patch b/dev-libs/weston/files/weston-10.0.0-backend-default.patch
deleted file mode 100644
index 710639e7e9c5..000000000000
--- a/dev-libs/weston/files/weston-10.0.0-backend-default.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 35e3fb72ac28af628aa1d2b7ee804a3f81720c47 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Fri, 4 Feb 2022 23:43:50 +0000
-Subject: [PATCH] meson.build: Fix -Dbackend-default=auto following fbdev
- deprecation
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 1c73e130..d761903e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -121,7 +121,7 @@ config_h.set10('TEST_GL_RENDERER', get_option('test-gl-renderer'))
- 
- backend_default = get_option('backend-default')
- if backend_default == 'auto'
--	foreach b : [ 'headless', 'fbdev', 'x11', 'wayland', 'drm' ]
-+	foreach b : [ 'headless', 'x11', 'wayland', 'drm' ]
- 		if get_option('backend-' + b)
- 			backend_default = b
- 		endif
--- 
-2.34.1
-

diff --git a/dev-libs/weston/files/weston-10.0.0-test-deps.patch b/dev-libs/weston/files/weston-10.0.0-test-deps.patch
deleted file mode 100644
index cc6ad8c6e130..000000000000
--- a/dev-libs/weston/files/weston-10.0.0-test-deps.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 9516859b9fdb2899a37116b55200fb04f7726b45 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniels@collabora.com>
-Date: Tue, 8 Feb 2022 22:39:42 +0000
-Subject: [PATCH] tests: Add dependency on screenshooter client protocol
-
-Given that the test-helper code relies on the screenshooter protocol,
-make sure it's available for us to build, and the dependency ensures we
-build in order.
-
-Fixes: #588
-
-Signed-off-by: Daniel Stone <daniels@collabora.com>
----
- tests/meson.build | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/meson.build b/tests/meson.build
-index d8e96e77d..955c4226c 100644
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -29,8 +29,9 @@ lib_test_client = static_library(
- 		'weston-test-client-helper.c',
- 		'weston-test-fixture-compositor.c',
- 		weston_test_client_protocol_h,
--		weston_screenshooter_protocol_c,
- 		weston_test_protocol_c,
-+		weston_screenshooter_client_protocol_h,
-+		weston_screenshooter_protocol_c,
- 		viewporter_client_protocol_h,
- 		viewporter_protocol_c,
- 		'color_util.h',
--- 
-GitLab
-

diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 8917f9795189..c135c4f506a8 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -12,7 +12,6 @@
 	<flag name="desktop">Enable the desktop shell</flag>
 	<flag name="drm">Enable drm compositor support</flag>
 	<flag name="editor">Install wayland-editor example application</flag>
-	<flag name="fbdev">Enable fbdev compositor support</flag>
 	<flag name="fullscreen">Enable fullscreen shell</flag>
 	<flag name="gles2">Use GLESv2 cairo instead of full GL</flag>
 	<flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag>

diff --git a/dev-libs/weston/weston-10.0.0.ebuild b/dev-libs/weston/weston-10.0.0.ebuild
deleted file mode 100644
index d5a772f0976e..000000000000
--- a/dev-libs/weston/weston-10.0.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2022 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
-
-PYTHON_COMPAT=( python3_{9..10} )
-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://wayland.freedesktop.org/releases/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-fi
-
-LICENSE="MIT CC-BY-SA-3.0"
-SLOT="0"
-
-IUSE="colord +desktop +drm editor examples fbdev 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="
-	colord? ( lcms )
-	drm? ( gles2 )
-	pipewire? ( drm )
-	remoting? ( drm gles2 )
-	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.18.0
-	>=dev-libs/wayland-protocols-1.24
-	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.95
-	>=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 )
-	examples? ( x11-libs/pango )
-	gles2? (
-		media-libs/mesa[gles2,wayland]
-	)
-	pipewire? ( >=media-video/pipewire-0.3:= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc2:= )
-	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}"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.0-backend-default.patch
-	"${FILESDIR}"/${PN}-10.0.0-test-deps.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 deprecated-backend-fbdev)
-		-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 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.
-	# xwayland test can fail if X11 socket already exists.
-	cd "${BUILD_DIR}" || die
-	meson test $(meson test --list | grep -Exv "devices|xwayland") || die
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/files/, dev-libs/weston/
@ 2023-10-17 21:34 James Le Cuirot
  0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2023-10-17 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     3676a080151157102af9a3a0067b8e76e8ff07ca
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 21:34:10 2023 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 21:34:10 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3676a080

dev-libs/weston: Drop old 12.0.1-r1

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-libs/weston/Manifest                           |   1 -
 dev-libs/weston/files/weston-12.0.1-issue757.patch | 183 ---------------------
 dev-libs/weston/weston-12.0.1-r1.ebuild            | 146 ----------------
 3 files changed, 330 deletions(-)

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index ebb411e42a9e..af7985426f41 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,4 +1,3 @@
 DIST weston-11.0.1.tar.xz 1900796 BLAKE2B 33d7d5b3340e7074265885bd54ee039e8b5d448fa9f58f4bf9f823efd2557da9b916d903119565a806ab698382fe185165c8ede8614e983c872dfe15b474b616 SHA512 d451230fc260b45aaaadb5cf0aa360629e45e72e3b3676c6ec040d6c6549dbb57d05683effd962c3b2d61482b47a6c990d12cc736c896b501d982c8c4d34834c
-DIST weston-12.0.1.tar.xz 1969772 BLAKE2B d7a76ad6e11b76b73b91aeb9b3b49e823ecc8170bd1306f9a8ed90fa49d9bc7734e4c0595ca67f11421ecf5b4dbf04289cf803726c508e8c979a9850c0e94ccb SHA512 3dcfa1a2a6b9a605d3ecd597bf7ac0f87b0fd1971845b6e5c44b5e34296943ac146dae6e1cfea9be14ad7a9a8b6d30dc765f9289ef80920d7c516ebba1ba4688
 DIST weston-12.0.2.tar.xz 1969720 BLAKE2B 2a6749ae183b32365c6f7a135a1e1f57aedefa7071ab95b820a788903771b98de18f5ffe991990751bfa11cee14c1cd42364f97583f63ca388caecb44d5b1b4e SHA512 4277cc71a2001768816d6c30df6c01f09ee24efd16651e7048d425afa63c78f92d6def0cca78150965b0f3fa946675b0325881ff9d2878925dedea216a968d59
 DIST weston-12.0.91.tar.xz 1986200 BLAKE2B 368fe795bd6121390f14995d8c5ddfcd585e620bcb54f0818b9e9131bb442e79048f82bcd90cfff563c7ad9968cdc9e4f1d859fdd318f4e9b08fec371c4a62e4 SHA512 8e1ceae599344c305e1b65294403d434c4a6ca740f76bdcc67a9f83afe9d352d75ab9cf8bb5091b889ddece43941adf9c4666767098c4c27cb732f8c7f8f738a

diff --git a/dev-libs/weston/files/weston-12.0.1-issue757.patch b/dev-libs/weston/files/weston-12.0.1-issue757.patch
deleted file mode 100644
index c36647e22446..000000000000
--- a/dev-libs/weston/files/weston-12.0.1-issue757.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-https://gitlab.freedesktop.org/wayland/weston/-/issues/757
-https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1257
-
-From 6d8e3c569cf7e9ad80569768871e1ed30bf4d2a8 Mon Sep 17 00:00:00 2001
-From: Leandro Ribeiro <leandro.ribeiro@collabora.com>
-Date: Thu, 1 Jun 2023 18:51:34 -0300
-Subject: [PATCH 1/3] drm: drop disable_planes being false as a condition to
- support writeback
-
-In 2d70bdfdcdb236ee3e466b1a24df494da43c8a68 "drm-backend: add support to
-output capture writeback source" we've ensured that disable_planes
-should be false in order to support writeback capture tasks.
-
-But this was wrong; disable_planes is transient (it is true when
-there's some sort of content recording happening), and we enable/disable
-that during compositor's lifetime.
-
-This is dangerous and may result in a crash. Imagine the following
-sequence:
-
-        1. screen recording starts, disable_planes is set to true.
-
-        2. for whatever reason the output size changes, and we end up
-        not updating capture info because we think that writeback is not
-        supported by the device.
-
-        3. screen recording stops, disable_planes is set to false.
-
-        4. user tries to take a writeback screenshot, and the
-        DRM-backend will pull a writeback capture task with
-        weston_output_pull_capture_task().
-
-        5. this function has an assert to ensure that the DRM-backend
-        did not forget to update the capture info, and we hit that
-        assert.
-
-With this patch we drop disable_planes being false as a condition to
-support writeback. So now we keep the capture info up-to-date even when
-screen recording is happening, and we gracefully fail writeback tasks.
-
-Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
----
- libweston/backend-drm/drm.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
-index 1078b89bf..a1e61df8c 100644
---- a/libweston/backend-drm/drm.c
-+++ b/libweston/backend-drm/drm.c
-@@ -561,6 +561,12 @@ drm_output_pick_writeback_capture_task(struct drm_output *output)
- 
- 	assert(output->device->atomic_modeset);
- 
-+	if (output->base.disable_planes > 0) {
-+		msg = "drm: KMS planes usage is disabled for now, so " \
-+		      "writeback capture tasks are rejected";
-+		goto err;
-+	}
-+
- 	wb = drm_output_find_compatible_writeback(output);
- 	if (!wb) {
- 		msg = "drm: could not find writeback connector for output";
-@@ -948,7 +954,7 @@ drm_output_apply_mode(struct drm_output *output)
- 		}
- 	}
- 
--	if (device->atomic_modeset && !output->base.disable_planes)
-+	if (device->atomic_modeset)
- 		weston_output_update_capture_info(&output->base,
- 						  WESTON_OUTPUT_CAPTURE_SOURCE_WRITEBACK,
- 						  output->base.current_mode->width,
-@@ -2138,7 +2144,7 @@ drm_output_enable(struct weston_output *base)
- 	output->base.switch_mode = drm_output_switch_mode;
- 	output->base.set_gamma = drm_output_set_gamma;
- 
--	if (device->atomic_modeset && !base->disable_planes)
-+	if (device->atomic_modeset)
- 		weston_output_update_capture_info(base, WESTON_OUTPUT_CAPTURE_SOURCE_WRITEBACK,
- 						  base->current_mode->width,
- 						  base->current_mode->height,
--- 
-GitLab
-
-
-From 3226417573ac12e7d41823335bcb3036bf442cbc Mon Sep 17 00:00:00 2001
-From: Leandro Ribeiro <leandro.ribeiro@collabora.com>
-Date: Fri, 2 Jun 2023 14:44:44 -0300
-Subject: [PATCH 2/3] drm: do not pull writeback task if KMS atomic API is not
- supported
-
-Since 2d70bdfdcdb236ee3e466b1a24df494da43c8a68 "drm-backend: add support
-to output capture writeback source", the DRM-backend was broken for KMS
-devices that do not support the atomic API. This fixes that.
-
-We don't support writeback screenshots without atomic modeset support.
-So for such devices, we never update the output capture info
-(weston_output_update_capture_info()) for the writeback source.
-
-The function that we use to pull writeback tasks
-(weston_output_pull_capture_task()) asserts that the capture providers
-(renderers, DRM-backend) did not forget to update the capture info
-(size/format) if something changed. But as we've never updated the
-capture info for such devices, it is zeroed, leading to an assert hit.
-
-With this patch we only pull the capture task for KMS devices that
-support the atomic API.
-
-Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
----
- libweston/backend-drm/drm.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/libweston/backend-drm/drm.c b/libweston/backend-drm/drm.c
-index a1e61df8c..b43791db5 100644
---- a/libweston/backend-drm/drm.c
-+++ b/libweston/backend-drm/drm.c
-@@ -553,14 +553,14 @@ drm_output_pick_writeback_capture_task(struct drm_output *output)
- 	int32_t height = output->base.current_mode->height;
- 	uint32_t format = output->format->format;
- 
-+	assert(output->device->atomic_modeset);
-+
- 	ct = weston_output_pull_capture_task(&output->base,
- 					     WESTON_OUTPUT_CAPTURE_SOURCE_WRITEBACK,
- 					     width, height, pixel_format_get_info(format));
- 	if (!ct)
- 		return;
- 
--	assert(output->device->atomic_modeset);
--
- 	if (output->base.disable_planes > 0) {
- 		msg = "drm: KMS planes usage is disabled for now, so " \
- 		      "writeback capture tasks are rejected";
-@@ -642,7 +642,8 @@ drm_output_repaint(struct weston_output *output_base, pixman_region32_t *damage)
- 	if (drm_output_ensure_hdr_output_metadata_blob(output) < 0)
- 		goto err;
- 
--	drm_output_pick_writeback_capture_task(output);
-+	if (device->atomic_modeset)
-+		drm_output_pick_writeback_capture_task(output);
- 
- 	drm_output_render(state, damage);
- 	scanout_state = drm_output_state_get_plane(state,
--- 
-GitLab
-
-
-From cf64fbe7847859ca11d4722f056d2ebfa8d10177 Mon Sep 17 00:00:00 2001
-From: Leandro Ribeiro <leandro.ribeiro@collabora.com>
-Date: Thu, 1 Jun 2023 17:04:56 -0300
-Subject: [PATCH 3/3] tests: assert that capture info was received before
- trying screenshot
-
-If the source is not supported, we won't receive the capture
-information. So the capture info (size/format) will be zeroed, and we
-fail while trying to create a buffer for the screenshot with size/format
-zeroed.
-
-With this patch we fail if we don't receive the capture info, what makes
-the failure reason more explicit.
-
-Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
----
- tests/weston-test-client-helper.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/weston-test-client-helper.c b/tests/weston-test-client-helper.c
-index 3e24a0310..2a7f938d3 100644
---- a/tests/weston-test-client-helper.c
-+++ b/tests/weston-test-client-helper.c
-@@ -1705,6 +1705,9 @@ client_capture_output(struct client *client,
- 
- 	client_roundtrip(client);
- 
-+	assert(capt.width != 0 && capt.height != 0 && capt.drm_format != 0 &&
-+	       "capture source not available");
-+
- 	buf = create_shm_buffer(client,
- 				capt.width, capt.height, capt.drm_format);
- 
--- 
-GitLab
-

diff --git a/dev-libs/weston/weston-12.0.1-r1.ebuild b/dev-libs/weston/weston-12.0.1-r1.ebuild
deleted file mode 100644
index 35a02ce6cc88..000000000000
--- a/dev-libs/weston/weston-12.0.1-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2023 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}/-/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.20.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:=[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.6*
-		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
-"
-
-PATCHES=(
-	"${FILESDIR}/weston-12.0.1-issue757.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)
-		-Dlauncher-libseat=true
-		$(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
-}


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/files/, dev-libs/weston/
@ 2024-04-25 21:10 James Le Cuirot
  0 siblings, 0 replies; 7+ messages in thread
From: James Le Cuirot @ 2024-04-25 21:10 UTC (permalink / raw
  To: gentoo-commits

commit:     3079294a63fae24c16c089c6a8e56151ed62a99d
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 21:02:58 2024 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 21:10:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3079294a

dev-libs/weston: Patch to build against neatvnc 0.8

Closes: https://bugs.gentoo.org/930424
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 dev-libs/weston/files/weston-neatvnc-0.8.patch            | 15 +++++++++++++++
 .../{weston-13.0.0-r1.ebuild => weston-13.0.0-r2.ebuild}  |  6 +++++-
 dev-libs/weston/weston-9999.ebuild                        |  6 +++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

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-13.0.0-r1.ebuild b/dev-libs/weston/weston-13.0.0-r2.ebuild
similarity index 98%
rename from dev-libs/weston/weston-13.0.0-r1.ebuild
rename to dev-libs/weston/weston-13.0.0-r2.ebuild
index 9b26690ae48b..659b66c2d03d 100644
--- a/dev-libs/weston/weston-13.0.0-r1.ebuild
+++ b/dev-libs/weston/weston-13.0.0-r2.ebuild
@@ -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..659b66c2d03d 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -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}]"
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-04-25 21:10 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-24 13:41 [gentoo-commits] repo/gentoo:master commit in: dev-libs/weston/files/, dev-libs/weston/ James Le Cuirot
  -- strict thread matches above, loose matches on Subject: below --
2024-04-25 21:10 James Le Cuirot
2023-10-17 21:34 James Le Cuirot
2022-02-08 23:00 James Le Cuirot
2022-02-05 17:01 James Le Cuirot
2018-06-06 23:38 Matt Turner
2018-04-29 22:07 Andreas Hüttel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox