logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git
commit: 0dfcf82f2f5de0aa6db0b0312dc07c8a8bdff8ac
parent 7ab11385b9bc354b9b15b28770b9dafbad5dc4b5
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date:   Mon,  4 Jul 2022 06:51:17 +0200

x11-base/xwayland: Drop

Diffstat:

Dx11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch27---------------------------
Dx11-base/xwayland/metadata.xml15---------------
Dx11-base/xwayland/xwayland-9999.ebuild94-------------------------------------------------------------------------------
3 files changed, 0 insertions(+), 136 deletions(-)

diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch @@ -1,27 +0,0 @@ -diff --git a/dix/meson.build b/dix/meson.build -index ddc5cc3..bf5bfa3 100644 ---- a/dix/meson.build -+++ b/dix/meson.build -@@ -56,8 +56,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 4af03ef..791465d 100644 ---- a/meson.build -+++ b/meson.build -@@ -520,9 +520,3 @@ subdir('hw') - if host_machine.system() != 'windows' - subdir('test') - endif -- --install_man(configure_file( -- input: 'man/Xserver.man', -- output: 'Xserver.1', -- configuration: manpage_config, --)) diff --git a/x11-base/xwayland/metadata.xml b/x11-base/xwayland/metadata.xml @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <name>X11</name> -</maintainer> -<use> - <flag name="unwind">Enable libunwind usage for backtraces</flag> - <flag name="xcsecurity">Build Security extension</flag> -</use> -<upstream> - <remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id> -</upstream> -</pkgmetadata> diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild @@ -1,94 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson git-r3 - -DESCRIPTION="Standalone X server running under Wayland" -HOMEPAGE="https://wayland.freedesktop.org/xserver.html" -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" - -IUSE="selinux video_cards_nvidia unwind xcsecurity" - -LICENSE="MIT" -SLOT="0" - -DEPEND=" - >=x11-libs/pixman-0.27.2 - dev-libs/libbsd - >=x11-libs/libXfont2-2.0.1 - dev-libs/openssl:= - dev-libs/wayland - video_cards_nvidia? ( gui-libs/egl-wayland ) - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libdrm-2.4.89 - >=media-libs/libepoxy-1.5.4[X,egl(+)] - >=media-libs/mesa-21.1[X(+),egl(+),gbm(+)] - >=x11-libs/libxshmfence-1.1 - >=x11-libs/libXau-1.0.4 - media-libs/libglvnd[X] - unwind? ( sys-libs/libunwind ) - >=dev-libs/wayland-protocols-1.18 - media-fonts/font-util - x11-libs/libxkbfile - >=x11-libs/xtrans-1.3.5 - x11-base/xorg-proto - >=x11-misc/xkeyboard-config-2.4.1-r3 - x11-libs/libxcvt -" - -RDEPEND=" - ${DEPEND} - x11-apps/xkbcomp - !<=x11-base/xorg-server-1.20.11 - selinux? ( sec-policy/selinux-xserver ) -" -BDEPEND=" - sys-devel/flex - dev-util/wayland-scanner -" - -src_prepare() { - default - - sed -i '/install_man(/,/))/d' meson.build \ - || die "Failed to remove Xserver.1 install target" - - sed -i '/install_data/,/)/d' dix/meson.build \ - || die "Failed to remove protocols.txt install target" -} - -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 - -Ddtrace=false - -Dglamor=true - -Dglx=true - -Dipv6=true - -Dsecure-rpc=false - -Dscreensaver=true - -Dsha1=libcrypto - -Dxace=true - -Dxdmcp=true - -Dxinerama=true - -Dxvfb=false - -Dxnest=false - -Dxwayland-path="${EPREFIX}"/usr/bin - -Dxorg=false - -Dxwayland=true - ) - - meson_src_configure -} - -src_install() { - dosym ../bin/Xwayland /usr/libexec/Xwayland - - meson_src_install -}