diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-01-03 20:27:24 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-03 20:27:24 +0000 |
commit | 27e5574c9ed56a2633e25f7fa8f591554266a1b4 (patch) | |
tree | eafae39b8faa55ceb7cc8100d5d03a2dfc9b7842 /x11-base | |
parent | 5aede38e7304fc5c3bd8a2034b25758b15a19fa0 (diff) |
gentoo auto-resync : 03:01:2023 - 20:27:24
Diffstat (limited to 'x11-base')
-rw-r--r-- | x11-base/Manifest.gz | bin | 1552 -> 1555 bytes | |||
-rw-r--r-- | x11-base/xorg-server/Manifest | 5 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild | 195 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.4.ebuild | 190 | ||||
-rw-r--r-- | x11-base/xorg-server/xorg-server-21.1.5.ebuild | 195 | ||||
-rw-r--r-- | x11-base/xwayland/Manifest | 4 | ||||
-rw-r--r-- | x11-base/xwayland/xwayland-22.1.5.ebuild | 100 | ||||
-rw-r--r-- | x11-base/xwayland/xwayland-22.1.6.ebuild | 100 |
8 files changed, 0 insertions, 789 deletions
diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz Binary files differindex 64fee076a1a2..cfe222ac2a74 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 cb46826e5750..60a47d7f6061 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -2,12 +2,7 @@ AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1b AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b425d652ebb83d116cabbf92d1530d2c616910ddbb96fb574cdad8d3f1ce2b4fcf9fb16aa2950b40a0723c9d00465d8e6d72299f1ea181a257d014c80 SHA512 5cd0a4ce9c2efef7abc84df805a3c6da33bd64fdb16c3aa2fa61da4f805605a3d12cab0f452d3bc217b6e5d5d5bea29c9f3bf262e46347a074770ebd75ddf5b5 AUX xorg-server-21.1.4-BadIDChoice.patch 1950 BLAKE2B eb3ef49d68c526b1484b580ac08b45c4e31b7f263354a8fffc763577c618a1edbf55c8bec5ddb916eefd2c0b4e9429d2a445f221ea0a447d6e26ec1b6f88fa0e SHA512 bbd49c133f33bfad4eb4225d3246ca9814c6bc876a5a606f89ce018de7bd26c1bd84462f4f250c2dbdac82d2fdb366ab722ecf5bbb183f9958ba7f856efc1472 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 -DIST xorg-server-21.1.4.tar.xz 4940176 BLAKE2B 8f68c7de102f7f8d0f56566a518025bb32c079184d5a5556dc8e651111b6a018669102b18ec2e9470d3ab91f51291618f9c49281915d885fc30446e1b54d2134 SHA512 eb5b8520d02908f72719e6ecfbf7a9bf139acb65ccae04d1db4223a8a2384cd3a94bd5afef10cce327b751b800cc2b79bfaa5ae35c95c3a217f775168082e68f -DIST xorg-server-21.1.5.tar.xz 4929120 BLAKE2B 40f31250101293fa048c3c32278caaf0350fcf0b153a295d7574a6698893fa3c2d14078714a3c6ee7755b66c1f0ccf80b8faacb27aa5d7c279bc09fa6285ffd5 SHA512 a39c6ba36f94241d330b679a9a6fe2c5fda73fc3f5a9308a7a9cfd0d58503e407291759c9e553455c07cf5a3862952ae3904334eeca29c97ff5af7cffd2e6953 DIST xorg-server-21.1.6.tar.xz 4977496 BLAKE2B 8bcfa0a29f7b84b3ba9357d8ae9b1c7a5dc108159cf059f9c76c2c15f00be0d34964a3240937d146ae5f58a2d94deb091facacab984f8f905848bef5679cf46a SHA512 5e3cf879facf3a04aa64b7f6129226ea68a97109a7daca5146b57b4c707cc76a4fbad1924997dd319efd8c8c20eb5bb59570a719101b76ae07e923b7e9656239 -EBUILD xorg-server-21.1.4-r1.ebuild 4654 BLAKE2B b344bb3f720aa233a883ad8736c754b98ce16bc1f13711023dca505dd15b566850df27eb33f6e5c4668a3fa9a19163feef25407a8e3e5c1a8f188725574d9046 SHA512 aed5c0c76c411ad37151aef0209a2d7a50573839b68f299e33a219433e3d921b86d3e57f6e1b702ac5f064b581bd9c99ef08a4949df201b58e49c18509fbbbba -EBUILD xorg-server-21.1.4.ebuild 4513 BLAKE2B 7a36143b235eeaec435bb21b989d464723ba062fa1d7b223b8f944cd60661662d38cac82973c7f2b1911cb4ba3294357a74677561fe599b636bb6a9896687409 SHA512 7fb72a177b8ef0f61ccb0ca677f118c065846577b9da21317b5343e19ec797b5e7cddf60f47eff50b4b03ee4507bc51c9f92545bd1e52357fe862e9265ced7f0 -EBUILD xorg-server-21.1.5.ebuild 4654 BLAKE2B b344bb3f720aa233a883ad8736c754b98ce16bc1f13711023dca505dd15b566850df27eb33f6e5c4668a3fa9a19163feef25407a8e3e5c1a8f188725574d9046 SHA512 aed5c0c76c411ad37151aef0209a2d7a50573839b68f299e33a219433e3d921b86d3e57f6e1b702ac5f064b581bd9c99ef08a4949df201b58e49c18509fbbbba EBUILD xorg-server-21.1.6.ebuild 4646 BLAKE2B cf73bcd0c069b6fb5c9999907e8e9fcf63a0115608f61009e856b2e73839fd8db4eb491506ad7d9a82656dcf7b8ab5348547eca397c96342aa1a1c4b0f4c4fc5 SHA512 d7e55274629256573017d5421339911f4aff1e56b4dde3f5e670bf404ae6e99c6ac6aff612f97488f88149e6b9fd40e0eb0e9e7dce7c25017a0cd9f0e68d4213 EBUILD xorg-server-9999.ebuild 4516 BLAKE2B 232c7211a805dfca04da95c0c17e71847a57bbb22351e8eecd5d5be51b88653ab7ab67874e66022cf70bfdf382e7e3284de54a2d843763468540453fc46e1592 SHA512 ffa779b6a8fc0127422542863eb4ca25876c352662215bd4ec1a29dccb354514bdf7e043a66b5c5d1aa634f386b75d3528b0c39ace7d4bc745a1593477d205ce MISC metadata.xml 881 BLAKE2B e5b0384c9cc45cf1e12a3010abf31232e4a726c11aa46b7303cc22b582e31d6ece1dbed35aacee265ca5a54433a6821d964059709307e4d4e51bb5a22b74b31d SHA512 72d6c8a97e474464e222d8d0be1a5d16c123683bf1415a142204b26361fdefdfbf1b3493d7b33cb637c03a808d5068c10d18adeb7de2a4fd5ecfcd4fa40f2f90 diff --git a/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild b/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild deleted file mode 100644 index 85f83743b7ff..000000000000 --- a/x11-base/xorg-server/xorg-server-21.1.4-r1.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2022 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/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/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=" - sys-devel/flex -" -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - elogind? ( udev ) - ?? ( elogind systemd )" - -UPSTREAMED_PATCHES=( - # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953 - "${FILESDIR}"/${PN}-21.1.4-BadIDChoice.patch -) - -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() { - # 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" - --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 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-21.1.4.ebuild b/x11-base/xorg-server/xorg-server-21.1.4.ebuild deleted file mode 100644 index c43a56374d07..000000000000 --- a/x11-base/xorg-server/xorg-server-21.1.4.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2022 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/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/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[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? ( - >=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=" - sys-devel/flex -" -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - elogind? ( udev ) - ?? ( elogind systemd )" - -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() { - # 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" - --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 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-21.1.5.ebuild b/x11-base/xorg-server/xorg-server-21.1.5.ebuild deleted file mode 100644 index 85f83743b7ff..000000000000 --- a/x11-base/xorg-server/xorg-server-21.1.5.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2022 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/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/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=" - sys-devel/flex -" -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - elogind? ( udev ) - ?? ( elogind systemd )" - -UPSTREAMED_PATCHES=( - # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/953 - "${FILESDIR}"/${PN}-21.1.4-BadIDChoice.patch -) - -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() { - # 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" - --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 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 4f7d5c4752b4..079310c7c92c 100644 --- a/x11-base/xwayland/Manifest +++ b/x11-base/xwayland/Manifest @@ -1,10 +1,6 @@ AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252 AUX xwayland-drop-redundantly-installed-files_v2.patch 745 BLAKE2B eb9a61b2746c7b694bde5ed946ecb818f1933edcaaff45a491667cb2ebca81343c40fc3f5caf544e9e15bc41e3bd0777086fc9c0b48aa98d7aceb152dabbc168 SHA512 a4eab1cf0a31cd049ad83f7402746eca8948fcccdf162e4b216efd203fba8eca9ccc5594d483abc5591322f65a8fb937057c08caaec040b350b790fddcb21d24 -DIST xwayland-22.1.5.tar.xz 1273444 BLAKE2B a6773f2b9655d0651a0a686f5e1fa41bdeaba998dc3e42c2c24dcc262d2affdb055c7ab0cf32b94ba11c82cbfe91bfcf10eb651f678feda95fccb55cc21d2e4f SHA512 806219692be297419777ad5343158f72473a691f7c8be4468fac185a3bc5e3b6811755de3133c12f3694480e51529ac3fa409b22640a80a233925716fec24c06 -DIST xwayland-22.1.6.tar.xz 1273532 BLAKE2B aa0604e425c8e5648966f58d8baa56163f7f39b439618e4fe556cdbfd7d417e4d8b1d34a7d850d31ed51b782e268c05f8d8ef4c8c48b3f8c702aabe8e579fb0f SHA512 a78f44f14a6c1e25afbf245c5c757a253f0607afdc80c8b852cf6f810247566d1cc17b63d4442a21d8e69bdb696faf1014438ad98a977fbed9a11b9c5b85e0a4 DIST xwayland-22.1.7.tar.xz 1273476 BLAKE2B 9e128ff85690c6fb35eb196eefd49b1cf24aed290fd74cdb6e2fb8ad72d61b8dd9dccf83bdafc9a8e1ba13dc61135a7756dbae5ff40490d2076516d72818dbb1 SHA512 dc4187d4e9e1bbf5f431a4a71da01b773be3a8870c3f82da599739d9f72756ac69c1fb8cc3b6c96c88da3c1dd40ce42429a3a003c08f90fc337ebaf6200de649 -EBUILD xwayland-22.1.5.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839 -EBUILD xwayland-22.1.6.ebuild 2154 BLAKE2B e76ecab4126e3bd7a4f37633ab56773759de72653e2d04ed8a58c278720770d38efac5dba2ae53acbbf560d3b3494de34d0dc4a32370bde9daa03fce940645ab SHA512 3216ab44000ff2bda753586a506251a3ec7ba3320497d347a3888f7638ba93622abec5ad03b7951a88915bc7ecc53afd67eef8c6d9192d10c35a1c4d24454924 EBUILD xwayland-22.1.7.ebuild 2148 BLAKE2B 7be8706e2e0d4694506c7de67c914f75be631f17964feab9b05bd72d7d4e1a4e583f04ab753c0e5d732ef435dce5a0a28d3758304bb820bc9e184a9ef6948401 SHA512 731fdcb1bcba4612381c1b97ae2d7e7fea20b86530ea2a8820ba755f830093377f76d1c6f353df1468e45a02554d22afb3ad76c06633296961165daffa3b1839 EBUILD xwayland-9999.ebuild 2221 BLAKE2B 79ebcf371891bcf3000095f61b53459279b78e1461e6ce361532452f6d20a5f5a204d1c366fe5cdd36093d40237932866d08a62edfca2aa7b82960285d1360f2 SHA512 67fad119e1bef87751bdb1ebff8d349e122875a9940bd2557d93ce2db99209d663e9f3c74486775d6cb9258d692642bc9472344e5bf4063d34ceb8ea6fe9456a MISC metadata.xml 543 BLAKE2B 6d9eaf03b02d3db1a546ca6443bc0e4964be085031c18ba0b5e58e615ef48090f181894fc9aec4abe358a8b59131423135b3bb25f0fe3a3cbb628e8d0f52c273 SHA512 075a7e2f5b39b537472c2ce242d9c7dde98be8230c6b48ec4a4115bd740011d1792a9d8188b44326276c91b7ddb56f01d1e548199786885b0f766854eab047b6 diff --git a/x11-base/xwayland/xwayland-22.1.5.ebuild b/x11-base/xwayland/xwayland-22.1.5.ebuild deleted file mode 100644 index afcd2774aad0..000000000000 --- a/x11-base/xwayland/xwayland-22.1.5.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 2021-2022 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" - -IUSE="selinux video_cards_nvidia unwind xcsecurity" - -LICENSE="MIT" -SLOT="0" - -COMMON_DEPEND=" - dev-libs/libbsd - dev-libs/openssl:= - >=dev-libs/wayland-1.20 - >=dev-libs/wayland-protocols-1.22 - 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.89 - >=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 - - unwind? ( sys-libs/libunwind ) - video_cards_nvidia? ( gui-libs/egl-wayland ) -" -DEPEND=" - ${COMMON_DEPEND} - x11-base/xorg-proto - >=x11-libs/xtrans-1.3.5 -" -RDEPEND=" - ${COMMON_DEPEND} - x11-apps/xkbcomp - !<=x11-base/xorg-server-1.20.11 - selinux? ( sec-policy/selinux-xserver ) -" -BDEPEND=" - sys-devel/flex - dev-util/wayland-scanner -" - -PATCHES=( - "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch -) - -src_configure() { - local emesonargs=( - $(meson_use selinux xselinux) - $(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 - -Ddocs=false - -Ddevel-docs=false - -Ddocs-pdf=false - ) - - meson_src_configure -} - -src_install() { - dosym ../bin/Xwayland /usr/libexec/Xwayland - - meson_src_install -} diff --git a/x11-base/xwayland/xwayland-22.1.6.ebuild b/x11-base/xwayland/xwayland-22.1.6.ebuild deleted file mode 100644 index 384312c2aa5c..000000000000 --- a/x11-base/xwayland/xwayland-22.1.6.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 2021-2022 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" - -IUSE="selinux video_cards_nvidia unwind xcsecurity" - -LICENSE="MIT" -SLOT="0" - -COMMON_DEPEND=" - dev-libs/libbsd - dev-libs/openssl:= - >=dev-libs/wayland-1.20 - >=dev-libs/wayland-protocols-1.22 - 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.89 - >=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 - - unwind? ( sys-libs/libunwind ) - video_cards_nvidia? ( gui-libs/egl-wayland ) -" -DEPEND=" - ${COMMON_DEPEND} - x11-base/xorg-proto - >=x11-libs/xtrans-1.3.5 -" -RDEPEND=" - ${COMMON_DEPEND} - x11-apps/xkbcomp - !<=x11-base/xorg-server-1.20.11 - selinux? ( sec-policy/selinux-xserver ) -" -BDEPEND=" - sys-devel/flex - dev-util/wayland-scanner -" - -PATCHES=( - "${FILESDIR}"/xwayland-drop-redundantly-installed-files.patch -) - -src_configure() { - local emesonargs=( - $(meson_use selinux xselinux) - $(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 - -Ddocs=false - -Ddevel-docs=false - -Ddocs-pdf=false - ) - - meson_src_configure -} - -src_install() { - dosym ../bin/Xwayland /usr/libexec/Xwayland - - meson_src_install -} |