commit: eb8e7bf0f11b5940bc469c25fec3eb02e2397e13 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Feb 25 20:35:50 2025 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Feb 25 20:37:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8e7bf0
x11-base/xwayland: Version bump to 24.1.6 Bug: https://bugs.gentoo.org/950290 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-base/xwayland/Manifest | 1 + x11-base/xwayland/xwayland-24.1.6.ebuild | 133 +++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest index 5b6aaf828fba..791a9ddadc18 100644 --- a/x11-base/xwayland/Manifest +++ b/x11-base/xwayland/Manifest @@ -1,2 +1,3 @@ DIST xwayland-24.1.4.tar.xz 1302372 BLAKE2B 9ca30a423aa5395dda06e3d532a57dc241b4d56bdb0309a47e1075a146f1a7879dde20c46b9c645fc430f534ffe484d0e9448fc9eb74d519f146629176804dc5 SHA512 7d3e4fdf67f07f79d8ddefc0077d10f811fe5ab1f919a922b5afc5dd9843eb2e0bc0a8b225555a0886521eb04a993e06a250469d3594d5add34d6412c76c60f8 DIST xwayland-24.1.5.tar.xz 1302484 BLAKE2B b7070725756ccfd8160f1231b8ae67c7aceab0a372d6fbdd1a9af81e97f3a8ad3f2e1aae30aebc7fdde74dec4ef86d790c9d7d786fb596bea8e2ae81d613e877 SHA512 4c821e62013c2c79edff364c3c5e34c58f9b0e0c411baba23d9ebe3fe1daf8bbb99e56b6041c5cba66a219d9f80c469a5ee1238cef728eda197f19e7bba1e74a +DIST xwayland-24.1.6.tar.xz 1302600 BLAKE2B e29a349bd7bc815a4005c8d7fe26697dc6444a3d866cee9673b0f72dbeb377e21c09800f16468a46f9b8f3ae6a10907ef0625e928acf991174ffd65fd01748be SHA512 b6dcc87f5c4d880cb23216518171a704c2a501803ac2efd9d01760895d755a617cd82313c6516f27a888b0581c64d74e3f8db5c238e1ae0d13da6cc1a547c02f diff --git a/x11-base/xwayland/xwayland-24.1.6.ebuild b/x11-base/xwayland/xwayland-24.1.6.ebuild new file mode 100644 index 000000000000..a2c9b9687f42 --- /dev/null +++ b/x11-base/xwayland/xwayland-24.1.6.ebuild @@ -0,0 +1,133 @@ +# Copyright 2021-2025 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 ~loong ~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 +}
