commit: 7267981751efbc38cef7d90bc1fb0f857b42648a Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> AuthorDate: Mon Apr 18 20:25:29 2022 +0000 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> CommitDate: Mon Apr 18 20:26:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72679817
x11-base/xwayland: added live ebuild. Closes: https://bugs.gentoo.org/801478 Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org> ...yland-drop-redundantly-installed-files_v2.patch | 30 ++++++ x11-base/xwayland/xwayland-9999.ebuild | 104 +++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch new file mode 100644 index 000000000000..ea765d3dcfcd --- /dev/null +++ b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch @@ -0,0 +1,30 @@ +diff --git a/dix/meson.build b/dix/meson.build +index fbbcf8646..15ca7d3b0 100644 +--- a/dix/meson.build ++++ b/dix/meson.build +@@ -57,8 +57,3 @@ libxserver_main = static_library('libxserver_main', + include_directories: inc, + dependencies: common_dep, + ) +- +-install_data( +- 'protocol.txt', +- install_dir: serverconfigdir, +-) +diff --git a/meson.build b/meson.build +index db1d63f3e..b9cef5a56 100644 +--- a/meson.build ++++ b/meson.build +@@ -806,12 +806,6 @@ if host_machine.system() != 'windows' + subdir('test') + endif + +-install_man(configure_file( +- input: 'man/Xserver.man', +- output: 'Xserver.1', +- configuration: manpage_config, +-)) +- + if build_xorg + sdkconfig = configuration_data() + awk = find_program('awk') diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild new file mode 100644 index 000000000000..dae6cf880e98 --- /dev/null +++ b/x11-base/xwayland/xwayland-9999.ebuild @@ -0,0 +1,104 @@ +# Copyright 2021-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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 ~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"; + +IUSE="selinux video_cards_nvidia unwind xcsecurity" + +LICENSE="MIT" +SLOT="0" + +COMMON_DEPEND=" + dev-libs/libbsd + dev-libs/openssl:= + >=dev-libs/wayland-1.20 + >=dev-libs/wayland-protocols-1.22 + 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/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 + + unwind? ( sys-libs/libunwind ) + video_cards_nvidia? ( gui-libs/egl-wayland ) +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto + >=x11-libs/xtrans-1.3.5 +" +RDEPEND=" + ${COMMON_DEPEND} + x11-apps/xkbcomp + !<=x11-base/xorg-server-1.20.11 + selinux? ( sec-policy/selinux-xserver ) +" +BDEPEND=" + sys-devel/flex + dev-util/wayland-scanner +" + +PATCHES=( + "${FILESDIR}"/xwayland-drop-redundantly-installed-files_v2.patch +) + +src_configure() { + local emesonargs=( + $(meson_use selinux xselinux) + $(meson_use unwind libunwind) + $(meson_use xcsecurity) + $(meson_use video_cards_nvidia xwayland_eglstream) + -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 + -Ddocs=false + -Ddevel-docs=false + -Ddocs-pdf=false + -Dxorg=false + -Dxnest=false + -Dxvfb=false + -Dxwayland=true + ) + + meson_src_configure +} + +src_install() { + dosym ../bin/Xwayland /usr/libexec/Xwayland + + meson_src_install +}
