From 0aaaf3c11fd14c5518bb73adcd18019e4c890638 Mon Sep 17 00:00:00 2001 From: Ian Jordan Date: Tue, 1 Oct 2024 18:03:25 +0100 Subject: [PATCH 1/2] x11-base/xorg-server: Add Oz to replace-flags for x86 Like Os, Oz has the same issue so added a second line to replace the flag. Bug: https://bugs.gentoo.org/835653 Signed-off-by: Ian Jordan Closes: https://github.com/gentoo/gentoo/pull/38840 Signed-off-by: Matt Turner --- x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild | 1 + x11-base/xorg-server/xorg-server-9999.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild index 0923dc31158f1..16599d733bf86 100644 --- a/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-21.1.13-r1.ebuild @@ -111,6 +111,7 @@ PATCHES=( src_configure() { # bug #835653 use x86 && replace-flags -Os -O2 + use x86 && replace-flags -Oz -O2 # localstatedir is used for the log location; we need to override the default # from ebuild.sh diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 73e76552fc7be..fbaefca8e5ce1 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -104,6 +104,7 @@ PATCHES=( src_configure() { # bug #835653 use x86 && replace-flags -Os -O2 + use x86 && replace-flags -Oz -O2 use debug && EMESON_BUILDTYPE=debug From 462b3e80886e943c43dc1b0fa19a70dc813926bc Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 2 Oct 2024 18:14:19 -0400 Subject: [PATCH 2/2] x11-base/xwayland: Version bump to 24.1.3 Signed-off-by: Matt Turner --- x11-base/xwayland/Manifest | 1 + x11-base/xwayland/xwayland-24.1.3.ebuild | 133 +++++++++++++++++++++++ 2 files changed, 134 insertions(+) create mode 100644 x11-base/xwayland/xwayland-24.1.3.ebuild diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest index c4e201a514d84..2cc84f0b523d6 100644 --- a/x11-base/xwayland/Manifest +++ b/x11-base/xwayland/Manifest @@ -1 +1,2 @@ DIST xwayland-24.1.2.tar.xz 1302068 BLAKE2B 761cc7da4e73da8120d5006ba085808e2c383fa991e29d3948c610671a11fee16295584d59409417ebb216fc8ae23de26d69eda7e453725067229672911ae85e SHA512 2788f6954c999c29be54d5b1e6e2c81327de9fbefae140f7cd322c1ff21f76fdd17cb74cf8243035ea850bfa4573d2013ab895426790b7959cceb7120ba9531c +DIST xwayland-24.1.3.tar.xz 1302164 BLAKE2B 53968bc0eb1ab6ab1d04d195730bbd0961428acfb0178dc592c04bc9bfc3a07cb5ba399377fd1aaaed1153de59d2d35b8b78582a8f7e151912998c3a3cfc6dce SHA512 7e0e11b07408f41a81bafa7bc519d02ed9bdc36e11be16abe255a7d779d04824af23d79323f1602119b046c545cdd43ea91b93e23feb0ffe411aa6989b462c1d diff --git a/x11-base/xwayland/xwayland-24.1.3.ebuild b/x11-base/xwayland/xwayland-24.1.3.ebuild new file mode 100644 index 0000000000000..9eecb443ea904 --- /dev/null +++ b/x11-base/xwayland/xwayland-24.1.3.ebuild @@ -0,0 +1,133 @@ +# 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 test unwind xcsecurity" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" + dev-libs/libbsd + dev-libs/openssl:= + >=dev-libs/wayland-1.21.0 + >=dev-libs/wayland-protocols-1.34 + 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.116 + >=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 ) +" +DEPEND=" + ${COMMON_DEPEND} + >=x11-base/xorg-proto-2024.1 + >=x11-libs/xtrans-1.3.5 + test? ( + x11-misc/rendercheck + x11-libs/libX11 + ) +" +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 +" + +src_prepare() { + default + + if ! use test; then + sed -i -e "s/dependency('x11')/disabler()/" meson.build || die + fi +} + +src_configure() { + local emesonargs=( + $(meson_use selinux xselinux) + $(meson_use systemd systemd_notify) + $(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 + -Dlibdecor=false + -Ddocs=false + -Ddevel-docs=false + -Ddocs-pdf=false + ) + + if [[ ${PV} == "9999" ]]; then + emesonargs+=( + -Dxorg=false + -Dxnest=false + -Dxvfb=false + -Dxwayland=true + ) + fi + + 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 + + # Remove files installed by x11-base/xorg-xserver + rm \ + "${ED}"/usr/share/man/man1/Xserver.1 \ + "${ED}"/usr/$(get_libdir)/xorg/protocol.txt \ + || die +}