From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1B119158088 for ; Wed, 29 Oct 2025 15:29:41 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D000E341050 for ; Wed, 29 Oct 2025 15:29:40 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C555C11056D; Wed, 29 Oct 2025 15:29:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id BF9D411056D for ; Wed, 29 Oct 2025 15:29:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77449340FF9 for ; Wed, 29 Oct 2025 15:29:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD1CD3ACA for ; Wed, 29 Oct 2025 15:29:34 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1761751760.ce6590235042f68ed6805180ec9d46a5e11343ad.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-base/xorg-server/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-base/xorg-server/Manifest x11-base/xorg-server/xorg-server-21.1.20.ebuild X-VCS-Directories: x11-base/xorg-server/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: ce6590235042f68ed6805180ec9d46a5e11343ad X-VCS-Branch: master Date: Wed, 29 Oct 2025 15:29:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2d28bf3f-8602-4311-abfd-90a90f5393f3 X-Archives-Hash: 281343522bc350886fe955301e346d0c commit: ce6590235042f68ed6805180ec9d46a5e11343ad Author: Matt Turner gentoo org> AuthorDate: Wed Oct 29 15:26:48 2025 +0000 Commit: Matt Turner gentoo org> CommitDate: Wed Oct 29 15:29:20 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce659023 x11-base/xorg-server: Version bump to 21.1.20 Bug: https://bugs.gentoo.org/965271 Signed-off-by: Matt Turner gentoo.org> x11-base/xorg-server/Manifest | 1 + x11-base/xorg-server/xorg-server-21.1.20.ebuild | 193 ++++++++++++++++++++++++ 2 files changed, 194 insertions(+) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index c2b3e1f47634..1f71f1eb931e 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1 +1,2 @@ DIST xorg-server-21.1.18.tar.xz 5037376 BLAKE2B 48c7b745c07a31d11d3a95f8eba056ff46bf69f2c70d499f677cbd706347e0c3c28a8197be5c0d65670c5b2f87f559ea10e7c21ee88bdc767c6a921d5fa8d3b2 SHA512 839ce759fc0e5405599c4cff0acf381f278d22b465b9fb9e335b5fd1c63f6d546788e4e869854026eb4b1e1a77a83b60d6fef472cf8534d45630f31b587a50dd +DIST xorg-server-21.1.20.tar.xz 5055676 BLAKE2B ca39f25dc71483a9d31f6cb3edfe4d2c0d93dff92edc89c8d508c114ae2193ad7416cc121659e5e09183f2f582dce7efc38885533136063ec328f45096e33c19 SHA512 cb83cfaaa804b39d4c6d827222439c7725ee2c6fe738d5f5ac9a406c3978ef3d7fafe9ba9fda54ba93fb37447f88edbc1e48656d5771b204945c6d67d1233f80 diff --git a/x11-base/xorg-server/xorg-server-21.1.20.ebuild b/x11-base/xorg-server/xorg-server-21.1.20.ebuild new file mode 100644 index 000000000000..21ee0d4aad17 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-21.1.20.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic xorg-meson +EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" + +DESCRIPTION="X.Org X servers" +SLOT="0/${PV}" +if [[ ${PV} != 9999* ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +IUSE_SERVERS="xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" +RESTRICT="!test? ( test )" + +CDEPEND=" + media-libs/libglvnd[X] + dev-libs/libbsd + dev-libs/openssl:0= + >=x11-apps/iceauth-1.0.2 + >=x11-apps/xauth-1.0.3 + x11-apps/xkbcomp + >=x11-libs/libdrm-2.4.89 + >=x11-libs/libpciaccess-0.12.901 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXfont2-2.0.1 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libxshmfence-1.1 + >=x11-libs/pixman-0.27.2 + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-2.4.1-r3 + xorg? ( + >=x11-libs/libxcvt-0.1.0 + ) + xnest? ( + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libX11-1.1.5 + ) + xephyr? ( + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-image + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-renderutil + x11-libs/xcb-util-wm + ) + !minimal? ( + >=media-libs/mesa-18[X(+),egl(+),gbm(+)] + >=media-libs/libepoxy-1.5.4[X,egl(+)] + ) + udev? ( virtual/libudev:= ) + unwind? ( sys-libs/libunwind:= ) + selinux? ( + sys-process/audit + sys-libs/libselinux:= + ) + systemd? ( + sys-apps/dbus + sys-apps/systemd + ) + elogind? ( + sys-apps/dbus + sys-auth/elogind[pam] + sys-auth/pambase[elogind] + ) + !!x11-drivers/nvidia-drivers[-libglvnd(+)] +" +DEPEND="${CDEPEND} + >=x11-base/xorg-proto-2021.4.99.2 + >=x11-libs/xtrans-1.3.5 + media-fonts/font-util + test? ( >=x11-libs/libxcvt-0.1.0 ) +" +RDEPEND="${CDEPEND} + !systemd? ( gui-libs/display-manager-init ) + selinux? ( sec-policy/selinux-xserver ) + xorg? ( >=x11-apps/xinit-1.3.3-r1 ) +" +BDEPEND=" + app-alternatives/lex +" +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + elogind? ( udev ) + ?? ( elogind systemd )" + +UPSTREAMED_PATCHES=( +) + +PATCHES=( + "${UPSTREAMED_PATCHES[@]}" + "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch + # needed for new eselect-opengl, bug #541232 + "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch + # pending upstream backport, bug #885763 + "${FILESDIR}"/${PN}-21.1.10-c99.patch +) + +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 + # sysconfdir is used for the xorg.conf location; same applies + local XORG_CONFIGURE_OPTIONS=( + --localstatedir "${EPREFIX}/var" + --sysconfdir "${EPREFIX}/etc/X11" + -Dbuildtype=$(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + $(meson_use !minimal dri1) + $(meson_use !minimal dri2) + $(meson_use !minimal dri3) + $(meson_use !minimal glamor) + $(meson_use !minimal glx) + $(meson_use udev) + $(meson_use udev udev_kms) + $(meson_use unwind libunwind) + $(meson_use xcsecurity) + $(meson_use selinux xselinux) + $(meson_use xephyr) + $(meson_use xnest) + $(meson_use xorg) + $(meson_use xvfb) + -Ddocs=false + -Ddrm=true + -Ddtrace=false + -Dipv6=true + -Dhal=false + -Dlinux_acpi=false + -Dlinux_apm=false + -Dsecure-rpc=false + -Dsha1=libcrypto + -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" + ) + + if [[ ${PV} == 9999 ]] ; then + # Gone in 21.1.x, but not in master. + XORG_CONFIGURE_OPTIONS+=( -Dxwayland=false ) + fi + + if use systemd || use elogind; then + XORG_CONFIGURE_OPTIONS+=( + -Dsystemd_logind=true + $(meson_use suid suid_wrapper) + ) + else + XORG_CONFIGURE_OPTIONS+=( + -Dsystemd_logind=false + -Dsuid_wrapper=false + ) + fi + + xorg-meson_src_configure +} + +src_install() { + xorg-meson_src_install + + # The meson build system does not support install-setuid + if ! use systemd && ! use elogind; then + if use suid; then + chmod u+s "${ED}"/usr/bin/Xorg + fi + fi + + if ! use xorg; then + rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ + "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ + "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ + "${ED}"/usr/share/man/man1/Xserver.1x || die + fi + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules + fi +}