From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6BC0A1582E8 for ; Thu, 16 May 2024 14:16:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96926E2A5A; Thu, 16 May 2024 14:16:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7DD24E2A5A for ; Thu, 16 May 2024 14:16:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BA57E335D6E for ; Thu, 16 May 2024 14:16:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B33031AD1 for ; Thu, 16 May 2024 14:16:08 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1715868962.8989120adab315cf23c0338435fc9baf221aceac.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xwayland/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xwayland/Manifest x11-base/xwayland/xwayland-24.1.0.ebuild X-VCS-Directories: x11-base/xwayland/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 8989120adab315cf23c0338435fc9baf221aceac X-VCS-Branch: master Date: Thu, 16 May 2024 14:16:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d64f3466-78dd-459f-8bf4-d079172d43c2 X-Archives-Hash: 0a859f9c70a34fd6b72ec3591cb2f69d commit: 8989120adab315cf23c0338435fc9baf221aceac Author: Matt Turner gentoo org> AuthorDate: Thu May 16 12:54:48 2024 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu May 16 14:16:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8989120a x11-base/xwayland: Version bump to 24.1.0 Signed-off-by: Matt Turner gentoo.org> x11-base/xwayland/Manifest | 1 + x11-base/xwayland/xwayland-24.1.0.ebuild | 133 +++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest index 5ae605b09e05..1944c2de88e7 100644 --- a/x11-base/xwayland/Manifest +++ b/x11-base/xwayland/Manifest @@ -1,2 +1,3 @@ DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49 DIST xwayland-23.2.7.tar.xz 1295016 BLAKE2B 9c8b5490eb4c468f0ee7c4e267ee9f3f9eba04bd9535a0a06a461fe0f3c7c8708d19deb8473ba4eacb446b9207637555a379bd768f8459c1ebe10cfed59010d1 SHA512 d78bd1ffed5a8149c55b453a464e46d2d658169bb814a96b8b75119349ba5506bb9d5c131c3ff28d94b4a27db894963b8f039b89843a0164d4463d7015d74c1b +DIST xwayland-24.1.0.tar.xz 1301180 BLAKE2B d20f91fa6c1d404cafb69a7e1cf843458be084a5e0d4feb5266e6bc78a6ee0445aeb178e97c569eb17d13a8a3cc566ac664afcec02e1b56c92f9ea0b95be85b5 SHA512 7592609ad112652cb870761f938f280802d7d3b4bbc82acc7bf741a763d862aa97bbbd7f78250c63a961d76be73fb55555832045514092d89e406839564f0003 diff --git a/x11-base/xwayland/xwayland-24.1.0.ebuild b/x11-base/xwayland/xwayland-24.1.0.ebuild new file mode 100644 index 000000000000..3b5d437dd588 --- /dev/null +++ b/x11-base/xwayland/xwayland-24.1.0.ebuild @@ -0,0 +1,133 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" + inherit git-r3 +else + SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +DESCRIPTION="Standalone X server running under Wayland" +HOMEPAGE="https://wayland.freedesktop.org/xserver.html" + +LICENSE="MIT" +SLOT="0" + +IUSE="libei selinux systemd test unwind xcsecurity" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/libbsd + dev-libs/openssl:= + >=dev-libs/wayland-1.21.0 + >=dev-libs/wayland-protocols-1.34 + 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.116 + >=x11-libs/libXau-1.0.4 + x11-libs/libxcvt + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont2-2.0.1 + x11-libs/libxkbfile + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-misc/xkeyboard-config-2.4.1-r3 + + libei? ( dev-libs/libei ) + systemd? ( sys-apps/systemd ) + unwind? ( sys-libs/libunwind ) +" +DEPEND=" + ${COMMON_DEPEND} + >=x11-base/xorg-proto-2024.1 + >=x11-libs/xtrans-1.3.5 + test? ( + x11-misc/rendercheck + x11-libs/libX11 + ) +" +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + + libei? ( >=sys-apps/xdg-desktop-portal-1.18.0 ) + selinux? ( sec-policy/selinux-xserver ) +" +BDEPEND=" + app-alternatives/lex + dev-util/wayland-scanner +" + +src_prepare() { + default + + if ! use test; then + sed -i -e "s/dependency('x11')/disabler()/" meson.build || die + fi +} + +src_configure() { + local emesonargs=( + $(meson_use selinux xselinux) + $(meson_use systemd systemd_notify) + $(meson_use unwind libunwind) + $(meson_use xcsecurity) + -Ddpms=true + -Ddri3=true + -Ddrm=true + -Ddtrace=false + -Dglamor=true + -Dglx=true + -Dipv6=true + -Dsecure-rpc=false + -Dscreensaver=true + -Dsha1=libcrypto + -Dxace=true + -Dxdmcp=true + -Dxinerama=true + -Dxvfb=true + -Dxv=true + -Dxwayland-path="${EPREFIX}"/usr/bin + -Dlibdecor=false + -Ddocs=false + -Ddevel-docs=false + -Ddocs-pdf=false + ) + + if [[ ${PV} == "9999" ]]; then + emesonargs+=( + -Dxorg=false + -Dxnest=false + -Dxvfb=false + -Dxwayland=true + ) + fi + + if use libei; then + emesonargs+=( -Dxwayland_ei=portal ) + else + emesonargs+=( -Dxwayland_ei=false ) + fi + + meson_src_configure +} + +src_install() { + dosym ../bin/Xwayland /usr/libexec/Xwayland + + meson_src_install + + # Remove files installed by x11-base/xorg-xserver + rm \ + "${ED}"/usr/share/man/man1/Xserver.1 \ + "${ED}"/usr/$(get_libdir)/xorg/protocol.txt \ + || die +}