[gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/

[Matt Turner]

commit:     c739caf3c3c024303708eeaad26a4e5b5e0753fd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 15:27:42 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 17:24:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c739caf3

x11-base/xwayland: Version bump to 23.1.0

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 x11-base/xwayland/Manifest                              |  1 +
 .../{xwayland-9999.ebuild => xwayland-23.1.0.ebuild}    | 17 +++++++----------
 x11-base/xwayland/xwayland-9999.ebuild                  | 11 ++++++-----
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest
index 87a4500a57f1..c0062184b886 100644
--- a/x11-base/xwayland/Manifest
+++ b/x11-base/xwayland/Manifest
@@ -1 +1,2 @@
 DIST xwayland-22.1.8.tar.xz 1273668 BLAKE2B 
ad1f3e0a6a3782b271653864380d0beb0db60293fb96ab8f218caaeef245967ad46ca505fb516a936115c9d49e6a32bffb725bc6c95dc98a6c4c24521c6022df
 SHA512 
f52c6f99d8ef7605bc1c651d5ee5e306c12af30649a2d712b1c4c3cf4c7c80246ae24bd9ac39461d47aafc78f5d659446a459cd6259e05ef3128b204981d114a
+DIST xwayland-23.1.0.tar.xz 1286056 BLAKE2B 
19f3cee10f9b86a1ee4529f91de3125c303a771ddb00ab1d76764fec2d8d2639e20585de777741fc3706ec6e2f03a1295024cd9c582c1e4a744fa1a43d8997e6
 SHA512 
984213a193b903e6023ecb3144a15f483dc3e9ec7cb02c36d8e67c6859b501b8b3e5a6e1ade9cb245450ad93002322f392b81d9286377ac34350cc3ea1f9679f

diff --git a/x11-base/xwayland/xwayland-9999.ebuild 
b/x11-base/xwayland/xwayland-23.1.0.ebuild
similarity index 87%
copy from x11-base/xwayland/xwayland-9999.ebuild
copy to x11-base/xwayland/xwayland-23.1.0.ebuild
index beed9ee6c40c..d7e53ec8adcf 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-23.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,13 +24,13 @@ SLOT="0"
 COMMON_DEPEND="
        dev-libs/libbsd
        dev-libs/openssl:=
-       >=dev-libs/wayland-1.20
-       >=dev-libs/wayland-protocols-1.22
+       >=dev-libs/wayland-1.21.0
+       >=dev-libs/wayland-protocols-1.28
        media-fonts/font-util
        >=media-libs/libepoxy-1.5.4[X,egl(+)]
        media-libs/libglvnd[X]
        >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-       >=x11-libs/libdrm-2.4.89
+       >=x11-libs/libdrm-2.4.109
        >=x11-libs/libXau-1.0.4
        x11-libs/libxcvt
        >=x11-libs/libXdmcp-1.0.2
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 "
 DEPEND="
        ${COMMON_DEPEND}
-       x11-base/xorg-proto
+       >=x11-base/xorg-proto-2022.2
        >=x11-libs/xtrans-1.3.5
 "
 RDEPEND="
@@ -60,7 +60,7 @@ BDEPEND="
 "
 
 PATCHES=(
-       "${FILESDIR}"/xwayland-drop-redundantly-installed-files_v2.patch
+       "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch
 )
 
 src_configure() {
@@ -85,13 +85,10 @@ src_configure() {
                -Dxvfb=true
                -Dxv=true
                -Dxwayland-path="${EPREFIX}"/usr/bin
+               -Dlibdecor=false
                -Ddocs=false
                -Ddevel-docs=false
                -Ddocs-pdf=false
-               -Dxorg=false
-               -Dxnest=false
-               -Dxvfb=false
-               -Dxwayland=true
        )
 
        meson_src_configure

diff --git a/x11-base/xwayland/xwayland-9999.ebuild 
b/x11-base/xwayland/xwayland-9999.ebuild
index beed9ee6c40c..cd8c1b8fb8d2 100644
--- a/x11-base/xwayland/xwayland-9999.ebuild
+++ b/x11-base/xwayland/xwayland-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,13 +24,13 @@ SLOT="0"
 COMMON_DEPEND="
        dev-libs/libbsd
        dev-libs/openssl:=
-       >=dev-libs/wayland-1.20
-       >=dev-libs/wayland-protocols-1.22
+       >=dev-libs/wayland-1.21.0
+       >=dev-libs/wayland-protocols-1.28
        media-fonts/font-util
        >=media-libs/libepoxy-1.5.4[X,egl(+)]
        media-libs/libglvnd[X]
        >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)]
-       >=x11-libs/libdrm-2.4.89
+       >=x11-libs/libdrm-2.4.109
        >=x11-libs/libXau-1.0.4
        x11-libs/libxcvt
        >=x11-libs/libXdmcp-1.0.2
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 "
 DEPEND="
        ${COMMON_DEPEND}
-       x11-base/xorg-proto
+       >=x11-base/xorg-proto-2022.2
        >=x11-libs/xtrans-1.3.5
 "
 RDEPEND="
@@ -85,6 +85,7 @@ src_configure() {
                -Dxvfb=true
                -Dxv=true
                -Dxwayland-path="${EPREFIX}"/usr/bin
+               -Dlibdecor=false
                -Ddocs=false
                -Ddevel-docs=false
                -Ddocs-pdf=false