From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- x11-base/xwayland/Manifest | 4 +- ...yland-drop-redundantly-installed-files_v2.patch | 30 ++++++ x11-base/xwayland/xwayland-22.1.1.ebuild | 2 +- x11-base/xwayland/xwayland-9999.ebuild | 104 +++++++++++++++++++++ 4 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 x11-base/xwayland/files/xwayland-drop-redundantly-installed-files_v2.patch create mode 100644 x11-base/xwayland/xwayland-9999.ebuild (limited to 'x11-base/xwayland') diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest index 5a893505e3db..faf8c79018fd 100644 --- a/x11-base/xwayland/Manifest +++ b/x11-base/xwayland/Manifest @@ -1,8 +1,10 @@ AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252 +AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24 DIST xwayland-21.1.4.tar.xz 1261712 BLAKE2B 698886d450f340c4a275f583d27382a5ee22c09255d907bbe2babc6794da1827bd5bf3e575b9da77ff3b3c5c4cd3e30cc10b89d14e0f6365d2a71f8ade61e410 SHA512 54e18565b4c2514534501ddcc76058d6911cf0c2185cddf5c54833d317f51ba8eb8934bd9be269518ece05f3bc8cda81600b25871c61437c923eba916eccc525 DIST xwayland-22.1.0.tar.xz 1271896 BLAKE2B bd090032a31a2872d3e1095ca2f73d8945eb9f29801ea5164b867132c98e4195eb84adc404048b294e148181b38b9172453e276f78a1a9575889fbc77c31d740 SHA512 01306d2127e9d02e457d86208d6fb285379ed8fab2837febe56aaee4b236bc052ad65ca8ec35555b983d15f0d8dd01d20526a17b40225d2a4b91c53202ec10b5 DIST xwayland-22.1.1.tar.xz 1272176 BLAKE2B 5dabf9d6cf6ed217cdf5694dba9c63059bcc43e2bb413c1edcd5d8775a906270b28e9dddb90bedacdefe27bd792339c346782511102b42250e2a940aa664e9cb SHA512 435cdf59f2be1ff7cb3dbb04e7a8920d9c48471fbeffca96c9dab2be400b168bfdb73b9e818829c555ab5d6fd83345eb693b3ba785d4ef701bdb27c8344077b5 EBUILD xwayland-21.1.4.ebuild 1889 BLAKE2B 084f95eb85009e95da761a339a84cd0645ba0d0fa0c298722e3bcf56a8adc2f4433816be8bb2d9c8f6dce67d2cfc6ace08538d1111bbf5671e842fe2cd5ff451 SHA512 7612a13407450e6655ff958bcc316f40a5c180a9f3dbae8550a65abae12f341748471868592e26b01ca078bc894735cc80b9d1c59628509308a28cdf2c120405 EBUILD xwayland-22.1.0.ebuild 2023 BLAKE2B 7d13e6cfd08c2f70907a69a540adebb3a110ff944467a8521d4bd827b9543fa207fe052cd193967a205801f8bd6bf4ce9ea60062efba311a5c198321b8636fb1 SHA512 ac69ec3176db6bc3b04d194fe7f661c7aadbe310801ad49ded1614a887ed8250a71b7e1251e9115ccec95a0d95e116d6dd31b856744116ecce71c54738721705 -EBUILD xwayland-22.1.1.ebuild 2023 BLAKE2B 7d13e6cfd08c2f70907a69a540adebb3a110ff944467a8521d4bd827b9543fa207fe052cd193967a205801f8bd6bf4ce9ea60062efba311a5c198321b8636fb1 SHA512 ac69ec3176db6bc3b04d194fe7f661c7aadbe310801ad49ded1614a887ed8250a71b7e1251e9115ccec95a0d95e116d6dd31b856744116ecce71c54738721705 +EBUILD xwayland-22.1.1.ebuild 2020 BLAKE2B 5bfaee8325d95e711a921a5c67700482d8e8ff4e0405fb0d8e45a532e65236e73dadaeb3c8f561e583f4e196ebe970adf6366d17df8ebd2867cfb6e1be45567d SHA512 c5c9ef260b037b2235daecea81100c9c875e85106bbaa337b34e47a0057bae399f7cf0ccca125de337bdddae8b2bdfcded7281e4fbbdee67daded6ff4b823c99 +EBUILD xwayland-9999.ebuild 2214 BLAKE2B 012d454ca5547cb16ba1ef9d358977f8cf97767ac41f38bf91d5046fa23dde83b14979aada7b7a3e86e5437cec21a1c1dbeda17d31995ab4a76130df94ef63c3 SHA512 89e54178b77c31a822610dc9d50c5b3a371167e00f1ea3afcb461a5d764a9805d3174c9f44d40f8f4c66c2dee0a31dfb626b7acf72fc3423ce79f00d1e1a7221 MISC metadata.xml 450 BLAKE2B 9bddecffad64304a7d32a52c921ca817db03bb90315ebdb64710def6dfd5a17362e319de94fe26ccb5def82996917005bc3a77b4f673cf19a4f4be19d6d2ffe8 SHA512 13fef8a30ada7880d900603b361337757f93eaeb1d61d97d1119ab11633c1128926ca61c8249d00fa4fe2756191f5f01c974036c9d7ecee0457c0629d8f0da11 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-22.1.1.ebuild b/x11-base/xwayland/xwayland-22.1.1.ebuild index 242b2daef28f..88e906cd045b 100644 --- a/x11-base/xwayland/xwayland-22.1.1.ebuild +++ b/x11-base/xwayland/xwayland-22.1.1.ebuild @@ -13,7 +13,7 @@ IUSE="selinux video_cards_nvidia unwind xcsecurity" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" dev-libs/libbsd 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 +} -- cgit v1.2.3