commit: b118a6bf7f6a88c3e2e319f739daef2d98d0b58d Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Tue Sep 24 00:32:09 2024 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Tue Sep 24 00:33:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b118a6bf
x11-base/xwayland: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> x11-base/xwayland/Manifest | 1 - .../files/xwayland-23.2.3-systemd-automagic.patch | 52 ---------- ...wayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch | 36 ------- ...xwayland-drop-redundantly-installed-files.patch | 27 ----- x11-base/xwayland/xwayland-23.2.6.ebuild | 113 --------------------- 5 files changed, 229 deletions(-) diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest index 97afcdda4055..c4e201a514d8 100644 --- a/x11-base/xwayland/Manifest +++ b/x11-base/xwayland/Manifest @@ -1,2 +1 @@ -DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49 DIST xwayland-24.1.2.tar.xz 1302068 BLAKE2B 761cc7da4e73da8120d5006ba085808e2c383fa991e29d3948c610671a11fee16295584d59409417ebb216fc8ae23de26d69eda7e453725067229672911ae85e SHA512 2788f6954c999c29be54d5b1e6e2c81327de9fbefae140f7cd322c1ff21f76fdd17cb74cf8243035ea850bfa4573d2013ab895426790b7959cceb7120ba9531c diff --git a/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch b/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch deleted file mode 100644 index 9af034c46fd5..000000000000 --- a/x11-base/xwayland/files/xwayland-23.2.3-systemd-automagic.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1230 - -From 010f6e751e86207a7e88f3504191bcae2d77b458 Mon Sep 17 00:00:00 2001 -From: Sam James <s...@gentoo.org> -Date: Sun, 31 Dec 2023 23:37:19 +0000 -Subject: [PATCH] meson: add option for systemd - -Without this, systemd will be used if installed on the system automagically, -which is a problem if the built e.g. Xwayland is going to be used on a non-systemd -machine. - -Bug: https://bugs.gentoo.org/908254 -Signed-off-by: Sam James <s...@gentoo.org> - -diff --git a/include/meson.build b/include/meson.build -index e6e3d553f..ddc18407e 100644 ---- a/include/meson.build -+++ b/include/meson.build -@@ -91,7 +91,7 @@ endif - - conf_data.set('HAVE_LIBBSD', libbsd_dep.found() ? '1' : false) - # Note: this symbol is used by libXtrans. --conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found() ? '1' : false) -+conf_data.set('HAVE_SYSTEMD_DAEMON', build_systemd ? '1' : false) - conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found() ? '1' : false) - conf_data.set('WITH_LIBDRM', libdrm_required ? '1' : false) - conf_data.set('GLAMOR_HAS_EGL_QUERY_DMABUF', -diff --git a/meson.build b/meson.build -index 60164d73b..de984760c 100644 ---- a/meson.build -+++ b/meson.build -@@ -99,6 +99,7 @@ xkbcomp_dep = dependency('xkbcomp', required: false) - xkbfile_dep = dependency('xkbfile') - xfont2_dep = dependency('xfont2', version: '>= 2.0') - -+build_systemd = get_option('systemd') == 'true' - # libsystemd-daemon was moved into libsystemd in version 209 - libsystemd_daemon_dep = dependency('libsystemd', version: '>= 209', required: false) - if not libsystemd_daemon_dep.found() -diff --git a/meson_options.txt b/meson_options.txt -index af094df70..62c539fbd 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -47,6 +47,8 @@ option('listen_unix', type: 'boolean', value: true, - option('listen_local', type: 'boolean', value: true, - description: 'Listen on local by default') - -+option('systemd', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', -+ description: 'Enable systemd-notify support') - option('dpms', type: 'boolean', value: true, - description: 'Xorg DPMS extension') - option('xf86bigfont', type: 'boolean', value: false, diff --git a/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch b/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch deleted file mode 100644 index 173daa3c6265..000000000000 --- a/x11-base/xwayland/files/xwayland-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch +++ /dev/null @@ -1,36 +0,0 @@ -From d5ef57f1efc967fbc88dfa0f0177be354caf039b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaen...@redhat.com> -Date: Tue, 26 Sep 2023 17:23:32 +0200 -Subject: [PATCH xserver] test: Skip Xwayland test early if PIGLIT_DIR / - XTEST_DIR isn't set - -No point starting weston and waiting for it to start up in that case. ---- - test/scripts/xwayland-piglit.sh | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/test/scripts/xwayland-piglit.sh b/test/scripts/xwayland-piglit.sh -index 97a1759d9..9d6e54d01 100755 ---- a/test/scripts/xwayland-piglit.sh -+++ b/test/scripts/xwayland-piglit.sh -@@ -1,5 +1,17 @@ - #!/bin/bash -e - -+if test "x$XTEST_DIR" = "x"; then -+ echo "XTEST_DIR must be set to the directory of the xtest repository." -+ # Exit as a "skip" so make check works even without xtest. -+ exit 77 -+fi -+ -+if test "x$PIGLIT_DIR" = "x"; then -+ echo "PIGLIT_DIR must be set to the directory of the piglit repository." -+ # Exit as a "skip" so make check works even without piglit. -+ exit 77 -+fi -+ - # this times out on Travis, because the tests take too long. - if test "x$TRAVIS_BUILD_DIR" != "x"; then - exit 77 --- -2.43.2 - 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 39e0548eaaa3..000000000000 --- 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-23.2.6.ebuild b/x11-base/xwayland/xwayland-23.2.6.ebuild deleted file mode 100644 index b2c72b5e40de..000000000000 --- a/x11-base/xwayland/xwayland-23.2.6.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 2021-2024 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 video_cards_nvidia unwind xcsecurity" - -COMMON_DEPEND=" - dev-libs/libbsd - dev-libs/openssl:= - >=dev-libs/wayland-1.21.0 - >=dev-libs/wayland-protocols-1.30 - 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.109 - >=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 ) - video_cards_nvidia? ( gui-libs/egl-wayland ) -" -DEPEND=" - ${COMMON_DEPEND} - >=x11-base/xorg-proto-2023.2 - >=x11-libs/xtrans-1.3.5 -" -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 -" - -PATCHES=( - "${FILESDIR}"/${PN}-drop-redundantly-installed-files.patch - "${FILESDIR}"/${PN}-23.2.3-systemd-automagic.patch - "${FILESDIR}"/${PN}-23.3.6-test-Skip-Xwayland-test-early-if-PIGLIT_DIR-XTEST_DI.patch -) - -src_configure() { - local emesonargs=( - $(meson_use selinux xselinux) - $(meson_use systemd) - $(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 - -Dlibdecor=false - -Ddocs=false - -Ddevel-docs=false - -Ddocs-pdf=false - ) - - 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 -}
