diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-01-04 01:27:12 +0000 |
commit | 3517852e3b8a68d1e997770fc0650c5053bafc6c (patch) | |
tree | 44068672445b1418489aed82de58df3c470289e7 /x11-base/xorg-server | |
parent | 0f15659d48c193027158492acb726297501202c5 (diff) |
gentoo resync : 04.01.2022
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r-- | x11-base/xorg-server/Manifest | 6 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.2-r4.ebuild (renamed from x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild) | 4 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.3.ebuild | 184 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 4 |
4 files changed, 192 insertions, 6 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 2fa8b9c27939..1d90ad00fe74 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -5,7 +5,9 @@ AUX xorg-server-21.1.2-fix-resume-logind.patch 5634 BLAKE2B 15528bd26a26a701b374 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.20.14.tar.xz 5178288 BLAKE2B e60cbb6f3023639598d518fb53e3df3a2aced8f8950279f3a1642ad0a9545bea756574c4d41383cba966dc76c317859065b2290c8420668547f26f1d6e508da3 SHA512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963 DIST xorg-server-21.1.2.tar.xz 4967784 BLAKE2B 352c8717dbbceb547e84610db3983bcfc83d4d72f02f6658ce6c7faa88821a60b401824e76a02bbce617d6646cd474a21823a4b7b75270512bbfd37957dff18d SHA512 6d7a0d29d5be09f80ed505c4d6ae964795127525a0ab73a4eab4f601788ab3627033143e5aeb4c2565c6683dd3402084d13acab5554606fbd519c4aec0a79def +DIST xorg-server-21.1.3.tar.xz 4955948 BLAKE2B 1907007e4131378ead2b8757e84e8e9403148c9b3cdffc68d7c54faf5ab0efa6b594b635940fce8af4b8334e4a1c67984f59fc2f3642e48b54eb2f2dcc7fd8f5 SHA512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b EBUILD xorg-server-1.20.14.ebuild 5101 BLAKE2B 92557bb8ff4afb0c4d62a2e4a2d42eabd05a6d99cd45f574b91a24d378938133f11cfd6b1a7f69ec60b51a72745d701ccf1f3bc97493ba13f76add6aa3430453 SHA512 c52f33f276b48dddaea825343147f33f0e73f47be6e03aa1e7d12b2fa4d43df6249a480645a78b6c21870499a2545e0e022e9606defb2a2878cd70e699db3427 -EBUILD xorg-server-21.1.2-r3.ebuild 4432 BLAKE2B 5be72c01f815b0e05ab5500a40a866e057cd32286b81574d97a6a21aec033904407271d9c522a37c54f8eabf3e2869413eb93bae3fb557b758a950f15089f994 SHA512 3770f8ba34fe4ecfcbc031908fc537d65ca54fbfbd7e61f7b28af5fb784f9dee968870aabe7f88dfefdbac48edc4b37d47e161bf3986479cfff0026ccc36b061 -EBUILD xorg-server-9999.ebuild 4388 BLAKE2B 0d52b9bd06c561fa1b14c9833c450ee3800f8703b5794359f20c78b960f3de9729dcc4ae279caacb18eba72e9be51a3fd1e2e4afb79f338325f8a7b542487aec SHA512 aa0acb2a0710f2651fad7167aa26978b97ad02bea103b29b6e5e7edf051a7efb7f121b1d80f45e5b3208e93e71cbc4e7406b53192534a47f159fe5ff34c173f1 +EBUILD xorg-server-21.1.2-r4.ebuild 4432 BLAKE2B e03babd0c81e78558d651b9622cdc4d8fc4d302523eb4016a0850a44ab129384fa38cdf353218378583e143b10f159b645f26001e7301e08db1abcec8b745a12 SHA512 559b4414d2583ad62f2dad82a8b46ff03826c19f5ace62c2750a71b61bdf49de4fc74d7ede86de9fd2ed36ec8ce25d5614b8da4425d90e7d125f3afb1fc8b7da +EBUILD xorg-server-21.1.3.ebuild 4388 BLAKE2B 3e1683034181cb6a58210051792444ec7431fb15fb99b48f56264574e9bcf8bbd4943ce352a91b07d3b3d7645c98a702447522c6de6f518f871117cd3bcddf34 SHA512 7c81fe0f187cfab5a7822bacdcc5dc4182a3ef328e57aa59deb153c0bd7dd8f9d2a1cccd1fd99cfa1d459a23633ff8397f1e5cdde4cf64dedf90c07aaa96666a +EBUILD xorg-server-9999.ebuild 4388 BLAKE2B 3e1683034181cb6a58210051792444ec7431fb15fb99b48f56264574e9bcf8bbd4943ce352a91b07d3b3d7645c98a702447522c6de6f518f871117cd3bcddf34 SHA512 7c81fe0f187cfab5a7822bacdcc5dc4182a3ef328e57aa59deb153c0bd7dd8f9d2a1cccd1fd99cfa1d459a23633ff8397f1e5cdde4cf64dedf90c07aaa96666a MISC metadata.xml 896 BLAKE2B cdcbd8758222413b63e88487aa887654f80fac5e245563e99cc8fa9de5af6ab5da3da2ff499230a1e897b3e051a692e62100e8864fc0cfde128365f85d715d08 SHA512 51970dfe9c2ef9a00dd4095246160f344fa9df76defbd4f0c43e07062b36d4c4f027cd77d0de7d7d70a91995f3e898c4537111b0191298e331fe14586a2d8637 diff --git a/x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild b/x11-base/xorg-server/xorg-server-21.1.2-r4.ebuild index 3f1a181bcf83..b68bfec9fdd3 100644 --- a/x11-base/xorg-server/xorg-server-21.1.2-r3.ebuild +++ b/x11-base/xorg-server/xorg-server-21.1.2-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -159,7 +159,7 @@ src_install() { meson_src_install # The meson build system does not support install-setuid - if ! use systemd || ! use elogind; then + if ! use systemd && ! use elogind; then if use suid; then chmod u+s "${ED}"/usr/bin/Xorg fi diff --git a/x11-base/xorg-server/xorg-server-21.1.3.ebuild b/x11-base/xorg-server/xorg-server-21.1.3.ebuild new file mode 100644 index 000000000000..79b9ff4ad7a3 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-21.1.3.ebuild @@ -0,0 +1,184 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_TARBALL_SUFFIX="xz" +XORG_EAUTORECONF="no" +inherit 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 ~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/rgb-1.0.3 + >=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/libxcvt-0.1.0 + >=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 + >=x11-libs/libXext-1.0.5 + x11-libs/libXv + xephyr? ( + x11-libs/libxcb[xkb] + 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? ( + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXext-1.0.5 + >=media-libs/mesa-18[X(+),egl(+),gbm(+)] + >=media-libs/libepoxy-1.5.4[X,egl(+)] + ) + udev? ( virtual/libudev:= ) + unwind? ( sys-libs/libunwind ) + selinux? ( 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 +" +RDEPEND="${CDEPEND} + !systemd? ( gui-libs/display-manager-init ) + selinux? ( sec-policy/selinux-xserver ) + xorg? ( >=x11-apps/xinit-1.3.3-r1 ) +" +BDEPEND=" + sys-devel/flex +" +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 +) + +src_configure() { + # 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" + --buildtype $(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 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 05df79d40fe4..79b9ff4ad7a3 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -158,7 +158,7 @@ src_install() { meson_src_install # The meson build system does not support install-setuid - if ! use systemd || ! use elogind; then + if ! use systemd && ! use elogind; then if use suid; then chmod u+s "${ED}"/usr/bin/Xorg fi |