From a81c5c251ec00b4354daf651ef95aed9ef08d7b4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 16 Oct 2022 16:27:07 +0100 Subject: x11-base/xwayland : use Gentoo's package --- x11-base/xwayland/Manifest | 1 - ...xwayland-drop-redundantly-installed-files.patch | 27 ------ x11-base/xwayland/xwayland-22.1.3-r100.ebuild | 99 ---------------------- 3 files changed, 127 deletions(-) delete mode 100644 x11-base/xwayland/Manifest delete mode 100644 x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch delete mode 100644 x11-base/xwayland/xwayland-22.1.3-r100.ebuild (limited to 'x11-base') diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest deleted file mode 100644 index d364df26..00000000 --- a/x11-base/xwayland/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST xwayland-22.1.3.tar.xz 1272440 BLAKE2B 5f35d6675ee90d910ed39921b4590e7a5325f941238c69b09d6b7063bcded992d1e4425327ae4626e8e9cead7dc17b4d892642a1a3bdb3a4de797f8f733202c4 SHA512 be15cb398f9a8aad70352d09b0745c827d4766d5996e817b92c828b5ede27b10186c7ee319901abdc5e141da97170a3ace039269146461d4e2ceb5002a7c35b4 diff --git a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch b/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch deleted file mode 100644 index 39e0548e..00000000 --- a/x11-base/xwayland/files/xwayland-drop-redundantly-installed-files.patch +++ /dev/null @@ -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/xwayland-22.1.3-r100.ebuild b/x11-base/xwayland/xwayland-22.1.3-r100.ebuild deleted file mode 100644 index 1811e604..00000000 --- a/x11-base/xwayland/xwayland-22.1.3-r100.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 2021-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="Standalone X server running under Wayland" -HOMEPAGE="https://wayland.freedesktop.org/xserver.html" -SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz" - -IUSE="selinux unwind xcsecurity" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" - -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 ) - amd64? ( 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.patch -) - -src_configure() { - local emesonargs=( - $(meson_use selinux xselinux) - $(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 - -Ddocs=false - -Ddevel-docs=false - -Ddocs-pdf=false - ) - - if use amd64; then - local emesonargs+=( - -Dxwayland_eglstream=true - ) - fi - - meson_src_configure -} - -src_install() { - dosym ../bin/Xwayland /usr/libexec/Xwayland - - meson_src_install -} -- cgit v1.2.3