diff options
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/Manifest.gz | bin | 1553 -> 1555 bytes | |||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.13.ebuild | 194 | ||||
| -rw-r--r-- | x11-base/xwayland/Manifest | 2 | ||||
| -rw-r--r-- | x11-base/xwayland/xwayland-23.2.6.ebuild | 2 |
5 files changed, 198 insertions, 2 deletions
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz Binary files differindex 95714b940e3f..7714dc6d737d 100644 --- a/x11-base/Manifest.gz +++ b/x11-base/Manifest.gz diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 20133b194b1a..69727a01cd25 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -4,7 +4,9 @@ AUX xorg-server-21.1.10-c99.patch 1508 BLAKE2B 7c4080924f5f5a8d4be2addae218bbc66 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-21.1.11.tar.xz 4985464 BLAKE2B 0a18840979bb8b20b02eca9d737f20ddcf92a4771386074c38692df8a1c9b0f471af2211f3006f845ad0dd887b3844b7e7aac761bc12fc4e4177f1ada32ec503 SHA512 ad5edacbe8c7e2ebe6b4a690af94c7ea5ebc781d00b0e58ae2d273c78ceee2fa00b86d10479ad69da1b3233490619bae5a33db64c967c24bbfc5d5d39ddce1cb DIST xorg-server-21.1.12.tar.xz 4957972 BLAKE2B 405354829494907c8d01b53e90b36b6e242dec65d0befb6850bfad40050b15c0fe986c33bc60082db8145d4bb961fd5611c25e1398c53d7bb41b606371a25773 SHA512 4c58bd5619be87dc52318c3719e8a05803835a96500bbd207b9fc056846f4473773a5dcb7ae96d8fdd3c9fe320f94e0136c8e8b2fc42a2064a947f5d48861054 +DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1 EBUILD xorg-server-21.1.11.ebuild 4595 BLAKE2B 330cafea2090d262cdf286d42292b6a75155e6a5a07f1e0ef75219cf63317bbb0a39a9d26428985427cec23143f8c2d6299deaaff1cbd7dbc2583840a6aa869a SHA512 938f4856ce3791bfd83dbf10f7a242a1485b7ede79c7cb5cb71ea678d6a05fceb8a1a9952b02636830bfefb54a532723e1da4a29dc1b88d1124477edaaffea56 EBUILD xorg-server-21.1.12.ebuild 4605 BLAKE2B 268de94b09f669881cbdb2c912ec5057f93f38db19f9a5b5c77c560f1ca5dd390ad5b77c58d1d1ffb3af98aea8948dc7cdb5d262c49ab00f7ad299e64a97578d SHA512 cb6e751dd2c758ef5593cb660a871062b1f50ffe7a1c0e888e29ab1c59d5bc13234a6fc16d9cdbb8adb471e2109305e51b0534828b762a243867a027d32fa8d2 +EBUILD xorg-server-21.1.13.ebuild 4605 BLAKE2B 268de94b09f669881cbdb2c912ec5057f93f38db19f9a5b5c77c560f1ca5dd390ad5b77c58d1d1ffb3af98aea8948dc7cdb5d262c49ab00f7ad299e64a97578d SHA512 cb6e751dd2c758ef5593cb660a871062b1f50ffe7a1c0e888e29ab1c59d5bc13234a6fc16d9cdbb8adb471e2109305e51b0534828b762a243867a027d32fa8d2 EBUILD xorg-server-9999.ebuild 4493 BLAKE2B cad2953ec28afb82bb24cf3adf5d6e4249b88eb860637fc124f16f3a672937d5ae28501849ef38567d2dac22486a85d90f34f261b681f37395e569eab4eb1f24 SHA512 a46b38a7047d4c4a00d41090bffb586bab2dd5fdadd9693bcd27b420909f340da740d5d1d25e964142e0398ea2415934d098d9c7a341da7a6d838de0cc63b15c MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90 diff --git a/x11-base/xorg-server/xorg-server-21.1.13.ebuild b/x11-base/xorg-server/xorg-server-21.1.13.ebuild new file mode 100644 index 000000000000..df261324220f --- /dev/null +++ b/x11-base/xorg-server/xorg-server-21.1.13.ebuild @@ -0,0 +1,194 @@ +# 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 ~ia64 ~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 + + # 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/xwayland/Manifest b/x11-base/xwayland/Manifest index ef6592b59a9f..11333d2e091b 100644 --- a/x11-base/xwayland/Manifest +++ b/x11-base/xwayland/Manifest @@ -8,6 +8,6 @@ DIST xwayland-23.2.6.tar.xz 1300092 BLAKE2B 5b10984a2c2fba87ce1101b70c26070100e7 EBUILD xwayland-23.2.4-r1.ebuild 2507 BLAKE2B 08d8f7cf243e6d7c74770f2115a67d25dfeb945f778aaeb6db18d1e5841243d43006073099e86e99b00cf0529aaa1def23eedc3fd869f23eb8033f110b715e29 SHA512 9e93fcd804f8a51106c63a016d21be25241b46220d23ab94e653d612c5731c16186ca57077d8d6cf0237d8d06f5b583628c3d2519c537c06cfc712d315dcc200 EBUILD xwayland-23.2.4.ebuild 2460 BLAKE2B 6f2f739493ea332813745c8ec7fd701fdb1424ed92bc4cb40df6514e77452be56521d338fde5dc8643966a8f40b52847a182b7eb24da6099c0ea686c915da62d SHA512 5bd80924be0710fcac6e71b27fbfce71c01f509a7a925f307d7f7980b9e6c3f4c3804c48dffefd056c125d9e1bd2a3d790d86ecbc9780caf663d22650236d0bb EBUILD xwayland-23.2.5.ebuild 2507 BLAKE2B ad8ffdab8604dfe72ef25f69e4a018cbc8c203bd059dde4dbbfc32146833f6e466a1fd63314423634e9323fb58148db0638a0f417452cc3ab2b4187ace65592b SHA512 5a0920791ed12dc84772731c6969ea76a8a22eeec85cf85e0ba7e147e3fb76fbdf76d7fbc8ea04e0814d2b766571870e374ef878ce433f7863a717d71e327db9 -EBUILD xwayland-23.2.6.ebuild 2466 BLAKE2B 5007c0c842a09dcfb24bf72215c76effc7a339b61adf64d2931d22a187c00f3638e415d609c4c374b4d3f7b741587a870b50809286212faa7b101fe8fb8ac7b5 SHA512 04483c140a11613af1d1b919a2cb48032ffdb24014b6940a235aec45ee72cd50b66407e7f3d81306166c3289d2607b8ce139d7b48ad31c485c532136bdc11bd2 +EBUILD xwayland-23.2.6.ebuild 2462 BLAKE2B bc873f90c223c5a09778e8962f91aa23cfcf9dcddd5efb594907981d6d2665315efb1c1764f6b3fd152d44610d0c734ac9427f187d837119869380730857048e SHA512 dca5b74fc2a8ae338e66c3dd69b5ef14b8f6b105be38c7707da994c6645a83a99f896d41ade14e055aee9ec3c098ce87d5b4604e7705fa268b4765d6869cf560 EBUILD xwayland-9999.ebuild 2298 BLAKE2B 89e55a9e1c6191540393f668374c0fabd6e7b13b06c4ecd391a7cb300ab64d57d8dfd82a690a86ec95a4dde446bcb1883e49caca4e0e74bd53694daf71e66bdb SHA512 439d05504a08cff05348cf2d731445074e26bc4e227a83f7842d9127a27efadbb312f052998538840105909b2d9f650e711209eda0ff1263c6b4211bc9ef05cf MISC metadata.xml 627 BLAKE2B 1d39badd8534a02eb9785acbfa9efa97823c134696d41397d1db294fa774da9b4f184e027dada1b718cff3d651c9b436a4812458abef1d70af4d7749963d822a SHA512 9d02c7a263144ecfa9aac594867efee3622823b264fc3305e11c4b396156f0c43b071804f6f0ae9850b67b09ae887d270a722b9c4c4482e5ea962eedb915ee79 diff --git a/x11-base/xwayland/xwayland-23.2.6.ebuild b/x11-base/xwayland/xwayland-23.2.6.ebuild index c753a669db77..70cb8d652e2a 100644 --- a/x11-base/xwayland/xwayland-23.2.6.ebuild +++ b/x11-base/xwayland/xwayland-23.2.6.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 ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" fi DESCRIPTION="Standalone X server running under Wayland" |