diff options
Diffstat (limited to 'x11-base')
20 files changed, 214 insertions, 247 deletions
diff --git a/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild index 6318ff8c7cda..952949cb82a1 100644 --- a/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild +++ b/x11-base/xcb-proto/xcb-proto-1.17.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) XORG_TARBALL_SUFFIX="xz" XORG_MODULE=proto/ @@ -13,7 +13,7 @@ DESCRIPTION="X C-language Bindings protocol headers" HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/proto/xcbproto" EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" REQUIRED_USE="${PYTHON_REQUIRED_USE}" # DEPEND="" diff --git a/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild b/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild index 6067e4899959..66d73df9e7b4 100644 --- a/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-21.1-r2.ebuild @@ -5,12 +5,11 @@ EAPI=7 DESCRIPTION="Meta package containing deps on all xorg drivers" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="" LICENSE="metapackage" SLOT="0" if [[ ${PV} != 9999 ]]; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" else PROPERTIES+=" live" fi diff --git a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild index 39acd9f15195..e3f327838951 100644 --- a/x11-base/xorg-drivers/xorg-drivers-9999.ebuild +++ b/x11-base/xorg-drivers/xorg-drivers-9999.ebuild @@ -5,12 +5,11 @@ EAPI=7 DESCRIPTION="Meta package containing deps on all xorg drivers" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="" LICENSE="metapackage" SLOT="0" if [[ ${PV} != 9999 ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" else PROPERTIES+=" live" fi diff --git a/x11-base/xorg-fonts/xorg-fonts-3.ebuild b/x11-base/xorg-fonts/xorg-fonts-3.ebuild index 61e3695b1787..789cb4b76a65 100644 --- a/x11-base/xorg-fonts/xorg-fonts-3.ebuild +++ b/x11-base/xorg-fonts/xorg-fonts-3.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" LICENSE="metapackage" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~riscv sparc x86" RDEPEND=" media-fonts/font-adobe-100dpi diff --git a/x11-base/xorg-proto/xorg-proto-2024.1.ebuild b/x11-base/xorg-proto/xorg-proto-2024.1.ebuild index 42f6666cd142..d0942ea4d441 100644 --- a/x11-base/xorg-proto/xorg-proto-2024.1.ebuild +++ b/x11-base/xorg-proto/xorg-proto-2024.1.ebuild @@ -18,7 +18,7 @@ inherit ${GIT_ECLASS} meson python-any-r1 DESCRIPTION="X.Org combined protocol headers" HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" fi diff --git a/x11-base/xorg-proto/xorg-proto-9999.ebuild b/x11-base/xorg-proto/xorg-proto-9999.ebuild index 3ca7fa0c89e5..2568914aaeb5 100644 --- a/x11-base/xorg-proto/xorg-proto-9999.ebuild +++ b/x11-base/xorg-proto/xorg-proto-9999.ebuild @@ -18,7 +18,7 @@ inherit ${GIT_ECLASS} meson python-any-r1 DESCRIPTION="X.Org combined protocol headers" HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" if [[ ${PV} != 9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.xz" S="${WORKDIR}/${MY_P}" fi diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 08011c7bda68..4567ea113627 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1 +1,2 @@ DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1 +DIST xorg-server-21.1.14.tar.xz 5016608 BLAKE2B b64ff9bbcd1d1c632b588800acb1531d6295a52347294d323d684a7149a4f803fb38357a102d715525511c8bb8554daf2e71c28149ccb650b1c7c1990351f53e SHA512 833d36ca4a409363dc021a50702bc29dbb32d074de319d6910a158b6e4d8f51a20c3b0de0486d9613d4e526fe4fd60ca306b3c9fcce7d014ca8cc10185afd973 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 e32da90e92a2..16599d733bf8 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 @@ -11,7 +11,7 @@ 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 ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" + 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" @@ -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-21.1.14.ebuild b/x11-base/xorg-server/xorg-server-21.1.14.ebuild new file mode 100644 index 000000000000..8609a956a8bc --- /dev/null +++ b/x11-base/xorg-server/xorg-server-21.1.14.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +XORG_TARBALL_SUFFIX="xz" +XORG_EAUTORECONF="no" +inherit flag-o-matic xorg-3 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 emesonargs=( + --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. + emesonargs+=( -Dxwayland=false ) + fi + + if use systemd || use elogind; then + emesonargs+=( + -Dsystemd_logind=true + $(meson_use suid suid_wrapper) + ) + else + emesonargs+=( + -Dsystemd_logind=false + -Dsuid_wrapper=false + ) + fi + + meson_src_configure +} + +src_install() { + 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 +} diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 015535eec0a9..fbaefca8e5ce 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -11,7 +11,7 @@ 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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + 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" @@ -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 diff --git a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild index 499510876bf0..d72c219d99da 100644 --- a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild +++ b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.12.1.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="SGML entities and XML/CSS stylesheets used in X.Org docs" 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" DEPEND="x11-misc/util-macros" # RDEPEND="" diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest index 839726b74b3c..14e3fe727387 100644 --- a/x11-base/xwayland/Manifest +++ b/x11-base/xwayland/Manifest @@ -1,4 +1,3 @@ -DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e743239dc705716c4b7e1318e192ad1da5e4933516f87ab0405b98eb1cc093081d4a1e4754f5dc8947a546a6f89072 SHA512 9e3c2253af335a559d0f890fa8f9bc381beca6531e0842d739ac15cbca008b3d07c0eefafd03611b04917c626861a7871a83657afa2a298994f4b162f714fc49 -DIST xwayland-24.1.0.tar.xz 1301180 BLAKE2B d20f91fa6c1d404cafb69a7e1cf843458be084a5e0d4feb5266e6bc78a6ee0445aeb178e97c569eb17d13a8a3cc566ac664afcec02e1b56c92f9ea0b95be85b5 SHA512 7592609ad112652cb870761f938f280802d7d3b4bbc82acc7bf741a763d862aa97bbbd7f78250c63a961d76be73fb55555832045514092d89e406839564f0003 -DIST xwayland-24.1.1.tar.xz 1301652 BLAKE2B 0b25776d7b6910b5a122d5ab917506ce933c87b6f0abf908649461f013463001161d1fa5fcaa499c56cfce57f035ad95fd49e28bb3e84ce159eaaad74b5b2799 SHA512 e44f47adab3830846360fd05fdc06d9016832133c662f2e4b0763b98de0c9b48dbfce7d757ffea5538b5fabb68170e5d1057acc1b9a086e396b147deaa750998 DIST xwayland-24.1.2.tar.xz 1302068 BLAKE2B 761cc7da4e73da8120d5006ba085808e2c383fa991e29d3948c610671a11fee16295584d59409417ebb216fc8ae23de26d69eda7e453725067229672911ae85e SHA512 2788f6954c999c29be54d5b1e6e2c81327de9fbefae140f7cd322c1ff21f76fdd17cb74cf8243035ea850bfa4573d2013ab895426790b7959cceb7120ba9531c +DIST xwayland-24.1.3.tar.xz 1302164 BLAKE2B 53968bc0eb1ab6ab1d04d195730bbd0961428acfb0178dc592c04bc9bfc3a07cb5ba399377fd1aaaed1153de59d2d35b8b78582a8f7e151912998c3a3cfc6dce SHA512 7e0e11b07408f41a81bafa7bc519d02ed9bdc36e11be16abe255a7d779d04824af23d79323f1602119b046c545cdd43ea91b93e23feb0ffe411aa6989b462c1d +DIST xwayland-24.1.4.tar.xz 1302372 BLAKE2B 9ca30a423aa5395dda06e3d532a57dc241b4d56bdb0309a47e1075a146f1a7879dde20c46b9c645fc430f534ffe484d0e9448fc9eb74d519f146629176804dc5 SHA512 7d3e4fdf67f07f79d8ddefc0077d10f811fe5ab1f919a922b5afc5dd9843eb2e0bc0a8b225555a0886521eb04a993e06a250469d3594d5add34d6412c76c60f8 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 <sam@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 <sam@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?= <mdaenzer@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 fec9318f2815..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 ~ia64 ~loong ~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" - -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 -} diff --git a/x11-base/xwayland/xwayland-24.1.2.ebuild b/x11-base/xwayland/xwayland-24.1.2.ebuild index 3b5d437dd588..fe8be800f361 100644 --- a/x11-base/xwayland/xwayland-24.1.2.ebuild +++ b/x11-base/xwayland/xwayland-24.1.2.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + 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" diff --git a/x11-base/xwayland/xwayland-24.1.0.ebuild b/x11-base/xwayland/xwayland-24.1.3.ebuild index 3b5d437dd588..9eecb443ea90 100644 --- a/x11-base/xwayland/xwayland-24.1.0.ebuild +++ b/x11-base/xwayland/xwayland-24.1.3.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + 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" diff --git a/x11-base/xwayland/xwayland-24.1.1.ebuild b/x11-base/xwayland/xwayland-24.1.4.ebuild index 3b5d437dd588..381a1eba040e 100644 --- a/x11-base/xwayland/xwayland-24.1.1.ebuild +++ b/x11-base/xwayland/xwayland-24.1.4.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + 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" diff --git a/x11-base/xwayland/xwayland-9999.ebuild b/x11-base/xwayland/xwayland-9999.ebuild index fa6673d3a906..d72df2a354cb 100644 --- a/x11-base/xwayland/xwayland-9999.ebuild +++ b/x11-base/xwayland/xwayland-9999.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + 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" |