From 814f4cf860e299a046b649eaee5463427984c09c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 8 Jul 2021 15:03:58 +0100 Subject: gentoo resync : 08.07.2021 --- x11-base/Manifest.gz | Bin 1217 -> 1214 bytes x11-base/xorg-server/Manifest | 5 +- x11-base/xorg-server/xorg-server-1.20.11-r1.ebuild | 216 -------------------- x11-base/xorg-server/xorg-server-1.20.11-r2.ebuild | 216 ++++++++++++++++++++ x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild | 220 +++++++++++++++++++++ x11-base/xorg-server/xorg-server-9999.ebuild | 6 +- x11-base/xwayland/Manifest | 4 +- x11-base/xwayland/xwayland-21.1.1-r1.ebuild | 87 -------- x11-base/xwayland/xwayland-21.1.1-r2.ebuild | 84 ++++++++ x11-base/xwayland/xwayland-21.1.1.901.ebuild | 9 +- 10 files changed, 533 insertions(+), 314 deletions(-) delete mode 100644 x11-base/xorg-server/xorg-server-1.20.11-r1.ebuild create mode 100644 x11-base/xorg-server/xorg-server-1.20.11-r2.ebuild create mode 100644 x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild delete mode 100644 x11-base/xwayland/xwayland-21.1.1-r1.ebuild create mode 100644 x11-base/xwayland/xwayland-21.1.1-r2.ebuild (limited to 'x11-base') diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz index 4ca33a326918..207e8eb47f14 100644 Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 048f999761ae..a357c67e286a 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -2,7 +2,8 @@ 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-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef SHA512 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2 -EBUILD xorg-server-1.20.11-r1.ebuild 5219 BLAKE2B 80008ff4771eae117886ce2e10c04fd0aca05d7f8daf77bfe5f1cf3ddfb51ea9021ef31e078003746412ccfa13af941f44281172fe8dfc740c18ee0f416b5d17 SHA512 e19a024e55847a973edb77ebe064a1862405472c7eb50f231ddf3900c0e5ae258dad77ef6150be102d2e059079be75b939f2cd4a7563e445ee8c426ec3e89f96 +EBUILD xorg-server-1.20.11-r2.ebuild 5219 BLAKE2B 7bd00eb534c539e80ca36cf387d0d0e57a0c45a6f489e0fba3c48d263a2d1b46cac1612e190280f0dbc47f018c8b32c98f3a25fb1241f886d3bae1b488c9ca59 SHA512 d9258c86c261e7772bfae2024ffb282d6aedf0591928e923d4ddd561e75349ea634a4d26d731542aba75784d61a88d65b3b609ff5d793d629e6380106c90b195 +EBUILD xorg-server-1.20.11-r3.ebuild 5295 BLAKE2B 85bd4a2d53afaf305953f0f125bcf501b0f4c720748efbdeb6a596242881c37c65a5aedd4c3685c35fdf55f6db718fa4854b49fbfc125bc896f8e161e53f9189 SHA512 ad61d98793d0edfcf8f77f1fb0155d695404a2295a07511a329e6d1344fbefd3208f18072f3f312b535988497d0e0ab28a9a7a120f7c28311094a9d82ab85b43 EBUILD xorg-server-1.20.11.ebuild 5574 BLAKE2B 9e1a53aab7fc913898e01728057bb121f68e41d3f50ad022328474e6b2fcea48502d5d64c2116faa8417db174259146420171cb77f1d10328a9951bb67de6b4b SHA512 b209f1dbbcdb8cacac4b638b2ad9db0527b535c5111535a99f6965124dba0e77fec890c292b07e5cdfef8f3a5f8e5a5f4e53464061b9936c8b391dbd0a23e635 -EBUILD xorg-server-9999.ebuild 5242 BLAKE2B 0febe3e6105875cc0bc3ae0ff0953f99c962df7d89407de92a9f9edd9db38ed4baaba1ff39d30cbf97ef15a4ec51e65927990fe254fd1398c6645bba22014066 SHA512 2d97ede7604284d01232a4ec5bfb4d4fda4195418080b67334536390a9d3f98fbc22680ae6091d893dc4a9af6e6b71737bd49507e0c3126deefdbfeef3846231 +EBUILD xorg-server-9999.ebuild 5327 BLAKE2B e9c1d49efbe5c07308bfeb2a1f57396afcbaa571e663fc6886abdd5d85a2ed9610f43c404d1e716e0b6791ca6c238520cdc2be0f504f8077b5cd8df51d8e269d SHA512 1784131fc133ed370597514c0682795a225c035e72d60fbd88fcde932b99688fca07ab0d00177ac2f996d7bcfa10bc56292d1eb2138ee5f4a2c47376651de003 MISC metadata.xml 895 BLAKE2B 03b64d8a77f70c326650f17775d8c605c1dad44529330d26daee4136bd36e0f53d79212a7038d943795dbc5772dbcd52208b762aad42ed832ebabd848e5fa15f SHA512 fcee97e4ee4b1f972c4bea7626a719aa4d18b75b4475554327369349d5f42c0b1a3b8fb513727751b9703cfb9afc34fdb073cf19e116e7c5f6fad9b204574a5c diff --git a/x11-base/xorg-server/xorg-server-1.20.11-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.11-r1.ebuild deleted file mode 100644 index d7a28ea70805..000000000000 --- a/x11-base/xorg-server/xorg-server-1.20.11-r1.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -XORG_DOC=doc -inherit xorg-3 multilib flag-o-matic toolchain-funcs -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="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" -RESTRICT="!test? ( test )" - -CDEPEND=" - media-libs/libglvnd[X] - 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 - dmx? ( - x11-libs/libXt - >=x11-libs/libdmx-1.0.99.1 - >=x11-libs/libX11-1.1.5 - >=x11-libs/libXaw-1.0.4 - >=x11-libs/libXext-1.0.99.4 - >=x11-libs/libXfixes-5.0 - >=x11-libs/libXi-1.2.99.1 - >=x11-libs/libXmu-1.0.3 - x11-libs/libXrender - >=x11-libs/libXres-1.0.3 - >=x11-libs/libXtst-1.0.99.2 - ) - kdrive? ( - >=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 ) - >=x11-apps/xinit-1.3.3-r1 - 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-2018.4 - >=x11-libs/xtrans-1.3.5 - dmx? ( - doc? ( - || ( - www-client/links - www-client/lynx - www-client/w3m - ) - ) - ) - wayland? ( x11-base/xwayland ) -" -RDEPEND="${CDEPEND} - !systemd? ( gui-libs/display-manager-init ) - selinux? ( sec-policy/selinux-xserver ) -" -BDEPEND=" - sys-devel/flex -" -PDEPEND=" - xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" - -REQUIRED_USE="!minimal? ( - || ( ${IUSE_SERVERS} ) - ) - elogind? ( udev ) - ?? ( elogind systemd ) - minimal? ( !wayland ) - xephyr? ( kdrive )" - -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 - # NOTE: fop is used for doc generating; and I have no idea if Gentoo - # package it somewhere - local XORG_CONFIGURE_OPTIONS=( - $(use_enable ipv6) - $(use_enable debug) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable test unit-tests) - $(use_enable unwind libunwind) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal dri3) - $(use_enable !minimal glamor) - $(use_enable !minimal glx) - $(use_enable xcsecurity) - $(use_enable xephyr) - $(use_enable xnest) - $(use_enable xorg) - $(use_enable xvfb) - $(use_enable udev config-udev) - $(use_with doc doxygen) - $(use_with doc xmlto) - $(use_with systemd systemd-daemon) - --disable-xwayland - --enable-libdrm - --sysconfdir="${EPREFIX}"/etc/X11 - --localstatedir="${EPREFIX}"/var - --with-fontrootdir="${EPREFIX}"/usr/share/fonts - --with-xkb-output="${EPREFIX}"/var/lib/xkb - --disable-config-hal - --disable-linux-acpi - --without-dtrace - --without-fop - --with-os-vendor=Gentoo - --with-sha1=libcrypto - CPP="$(tc-getPROG CPP cpp)" - ) - - if use systemd || use elogind; then - XORG_CONFIGURE_OPTIONS+=( - --enable-systemd-logind - --disable-install-setuid - $(use_enable suid suid-wrapper) - ) - else - XORG_CONFIGURE_OPTIONS+=( - --disable-systemd-logind - --disable-suid-wrapper - $(use_enable suid install-setuid) - ) - fi - - xorg-3_src_configure -} - -server_based_install() { - 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 -} - -src_install() { - xorg-3_src_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example into docs - dodoc "${S}"/hw/xfree86/xorg.conf.example - fi - - # install the @x11-module-rebuild set for Portage - insinto /usr/share/portage/config/sets - newins "${FILESDIR}"/xorg-sets.conf xorg.conf - - find "${ED}"/var -type d -empty -delete || die -} - -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-1.20.11-r2.ebuild b/x11-base/xorg-server/xorg-server-1.20.11-r2.ebuild new file mode 100644 index 000000000000..7ba74e510229 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.20.11-r2.ebuild @@ -0,0 +1,216 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_DOC=doc +inherit xorg-3 multilib flag-o-matic toolchain-funcs +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="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" +RESTRICT="!test? ( test )" + +CDEPEND=" + media-libs/libglvnd[X] + 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 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=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 ) + >=x11-apps/xinit-1.3.3-r1 + 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-2018.4 + >=x11-libs/xtrans-1.3.5 + dmx? ( + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) +" +RDEPEND="${CDEPEND} + !systemd? ( gui-libs/display-manager-init ) + selinux? ( sec-policy/selinux-xserver ) + wayland? ( x11-base/xwayland ) +" +BDEPEND=" + sys-devel/flex +" +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + elogind? ( udev ) + ?? ( elogind systemd ) + minimal? ( !wayland ) + xephyr? ( kdrive )" + +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 + # NOTE: fop is used for doc generating; and I have no idea if Gentoo + # package it somewhere + local XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable debug) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable test unit-tests) + $(use_enable unwind libunwind) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal dri3) + $(use_enable !minimal glamor) + $(use_enable !minimal glx) + $(use_enable xcsecurity) + $(use_enable xephyr) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(use_with systemd systemd-daemon) + --disable-xwayland + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + CPP="$(tc-getPROG CPP cpp)" + ) + + if use systemd || use elogind; then + XORG_CONFIGURE_OPTIONS+=( + --enable-systemd-logind + --disable-install-setuid + $(use_enable suid suid-wrapper) + ) + else + XORG_CONFIGURE_OPTIONS+=( + --disable-systemd-logind + --disable-suid-wrapper + $(use_enable suid install-setuid) + ) + fi + + xorg-3_src_configure +} + +server_based_install() { + 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 +} + +src_install() { + xorg-3_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${S}"/hw/xfree86/xorg.conf.example + fi + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf + + find "${ED}"/var -type d -empty -delete || die +} + +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-1.20.11-r3.ebuild b/x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild new file mode 100644 index 000000000000..29069a22532d --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild @@ -0,0 +1,220 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_DOC=doc +inherit xorg-3 multilib flag-o-matic toolchain-funcs +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="dmx kdrive wayland xephyr xnest xorg xvfb" +IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" +RESTRICT="!test? ( test )" + +CDEPEND=" + media-libs/libglvnd[X] + 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 + dmx? ( + x11-libs/libXt + >=x11-libs/libdmx-1.0.99.1 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libXaw-1.0.4 + >=x11-libs/libXext-1.0.99.4 + >=x11-libs/libXfixes-5.0 + >=x11-libs/libXi-1.2.99.1 + >=x11-libs/libXmu-1.0.3 + x11-libs/libXrender + >=x11-libs/libXres-1.0.3 + >=x11-libs/libXtst-1.0.99.2 + ) + kdrive? ( + >=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 ) + >=x11-apps/xinit-1.3.3-r1 + 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-2018.4 + >=x11-libs/xtrans-1.3.5 + dmx? ( + doc? ( + || ( + www-client/links + www-client/lynx + www-client/w3m + ) + ) + ) +" +RDEPEND="${CDEPEND} + !systemd? ( gui-libs/display-manager-init ) + selinux? ( sec-policy/selinux-xserver ) + wayland? ( x11-base/xwayland ) +" +BDEPEND=" + sys-devel/flex +" +PDEPEND=" + xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" + +REQUIRED_USE="!minimal? ( + || ( ${IUSE_SERVERS} ) + ) + elogind? ( udev ) + ?? ( elogind systemd ) + minimal? ( !wayland ) + xephyr? ( kdrive )" + +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 + # NOTE: fop is used for doc generating; and I have no idea if Gentoo + # package it somewhere + local XORG_CONFIGURE_OPTIONS=( + $(use_enable ipv6) + $(use_enable debug) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable test unit-tests) + $(use_enable unwind libunwind) + $(use_enable !minimal record) + $(use_enable !minimal xfree86-utils) + $(use_enable !minimal dri) + $(use_enable !minimal dri2) + $(use_enable !minimal dri3) + $(use_enable !minimal glamor) + $(use_enable !minimal glx) + $(use_enable xcsecurity) + $(use_enable xephyr) + $(use_enable xnest) + $(use_enable xorg) + $(use_enable xvfb) + $(use_enable udev config-udev) + $(use_with doc doxygen) + $(use_with doc xmlto) + $(use_with systemd systemd-daemon) + --disable-xwayland + --enable-libdrm + --sysconfdir="${EPREFIX}"/etc/X11 + --localstatedir="${EPREFIX}"/var + --with-fontrootdir="${EPREFIX}"/usr/share/fonts + --with-xkb-output="${EPREFIX}"/var/lib/xkb + --disable-config-hal + --disable-linux-acpi + --without-dtrace + --without-fop + --with-os-vendor=Gentoo + --with-sha1=libcrypto + CPP="$(tc-getPROG CPP cpp)" + ) + + if use systemd || use elogind; then + XORG_CONFIGURE_OPTIONS+=( + --enable-systemd-logind + --disable-install-setuid + $(use_enable suid suid-wrapper) + ) + else + XORG_CONFIGURE_OPTIONS+=( + --disable-systemd-logind + --disable-suid-wrapper + $(use_enable suid install-setuid) + ) + fi + + xorg-3_src_configure +} + +server_based_install() { + 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 +} + +src_install() { + xorg-3_src_install + + server_based_install + + if ! use minimal && use xorg; then + # Install xorg.conf.example into docs + dodoc "${S}"/hw/xfree86/xorg.conf.example + + rm \ + "${ED}"/usr/bin/cvt \ + "${ED}"/usr/share/man/man1/cvt.1 || die + fi + + # install the @x11-module-rebuild set for Portage + insinto /usr/share/portage/config/sets + newins "${FILESDIR}"/xorg-sets.conf xorg.conf + + find "${ED}"/var -type d -empty -delete || die +} + +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 70fb5f6bd29f..22242af2138c 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -4,7 +4,6 @@ EAPI=7 XORG_DOC=doc -XORG_EAUTORECONF="yes" inherit xorg-3 multilib flag-o-matic toolchain-funcs EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" @@ -97,6 +96,7 @@ DEPEND="${CDEPEND} RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) selinux? ( sec-policy/selinux-xserver ) + wayland? ( x11-base/xwayland ) " BDEPEND=" sys-devel/flex @@ -200,6 +200,10 @@ src_install() { if ! use minimal && use xorg; then # Install xorg.conf.example into docs dodoc "${S}"/hw/xfree86/xorg.conf.example + + rm \ + "${ED}"/usr/bin/cvt \ + "${ED}"/usr/share/man/man1/cvt.1 || die fi # install the @x11-module-rebuild set for Portage diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest index 7f62e98359a0..93cde6d69b9f 100644 --- a/x11-base/xwayland/Manifest +++ b/x11-base/xwayland/Manifest @@ -1,6 +1,6 @@ AUX xwayland-drop-redundantly-installed-files.patch 664 BLAKE2B 95773c2287be7f985f5156eebb4e01be236b3f8a2b217c31ea4d7c2f7ad826716ff8ac7951c5ee7963a057a5afe71040ddf1ca72151fb90923364cabfefc34c2 SHA512 35e329763122726eca8dd7014ee1c0321a4b23f32441a180fd4dfa2fd91b508b71a57270cc335460ca84a1483dc7c6d7cec56f55a2506aecbb73c14e4705d252 DIST xwayland-21.1.1.901.tar.xz 1258684 BLAKE2B e689f9342bc1e3ccdd0807dc3e47d04e34b9d728698848c155cb489a02002ef8120cad1322db9d6fe955d275fc6c0835bbc76d61d4a2aa26118bb267c16e7717 SHA512 60dec3875e8ea60f8fc53eea0ebcb55c948cf5eeb40b30f6d5e13d8c7b48d0aabd035884ae108fce0b03ca5da592d1b0e395a9c5198c1204e8407ec119d9bbee DIST xwayland-21.1.1.tar.xz 1257776 BLAKE2B 181aca3d3fad3759eb726c6f6141912d588a85bae214f9d395450b6945ee845d28c7a8580e6aaa5f3538d06083312391d24267e6b239bfc533526a1bd7a56f0a SHA512 0cb03d796af183f9fde14c30ef45d94ef466ac4ba3d85dda34e74f91dd94bb75d0c8a867ecb7bda7ea61d98c70a4f73bc98c5a205ea5f69a0e222cd780d263d8 -EBUILD xwayland-21.1.1-r1.ebuild 1781 BLAKE2B e79e59ff8777b74ca154997673973b7527b7a805f354e08d0741f720fa1c81d3c25c3ab6608610da1b7e4c00c0c1fc9475d148cec7e08bd61f9b5ea6bfb5090c SHA512 1da30c7a5d6350238e971bf69a0a0465ac4cc3c1992fa3e7fd53dc979cd1053b499f4b4f453972b176fd5ed4ea411b2dd61e8afd7bb5edb8188de9419537531f -EBUILD xwayland-21.1.1.901.ebuild 1795 BLAKE2B 1d5afaaf69693d1de91996c81feb782a01a3fc3d732a0cf735f8b75a495a739033d316826c28b959dd376eb5b044987b8bb30d0691f6d84d1d544bab27a2698b SHA512 4f8cf17bb0c97f58993cce1ccfaf40f3026247da8bdeeb59cb0f2cd210df1ef9a90cb40f99808731f34ceeb4879bcae829ce8a13173c9e183e4d6c4487038d33 +EBUILD xwayland-21.1.1-r2.ebuild 1794 BLAKE2B 3558e27b1006cba4b301645dc203cfc7e2f69b884b714d47eccb613e01cdd51c3e3570dcd0f9ca1de11116b507442f701a9ead1c7f694f508a3686d17e044102 SHA512 8bef4a535c5257c6be77706b7a809701adfc6b0a604efa7a1dbcc4fb333a1be20a41dbcd7a20a6f6613b400b725c96627890cb6b86287ebfaa912d57b4ac63c1 +EBUILD xwayland-21.1.1.901.ebuild 1808 BLAKE2B 05ff3178a7e0327e31f566c1822d3014028eb17db924a078f26d689d376ce684b4b65571075057331dd600d29dcc4c95a3a681a78dd818766e5fd302e5a03fe4 SHA512 75e1a6dac3d1486bcb3680c6e414ac11abdd59b0c4be57ecbe6f93e572192726c8f3f25258ff2d76157532a345b7e7a6679b6eaa2bb83aac939592b73e70eca0 MISC metadata.xml 492 BLAKE2B df9bce6c0bf8fc88dc1386143ceffe54b16e9e024281d6839496827ba1e645b01126ed2937e152b9cd06ee232c8149c5a789bc4ce6d380b5b6cec722b7c65c13 SHA512 987198d7347e1849f7974873d8140d9dfa921b3afff3a6864c47b59baa29de92bdc90a83b03f3765c7a4e15553f2afaa1ae164aac2d9e3b52d9839444bee6255 diff --git a/x11-base/xwayland/xwayland-21.1.1-r1.ebuild b/x11-base/xwayland/xwayland-21.1.1-r1.ebuild deleted file mode 100644 index f9966135b1cf..000000000000 --- a/x11-base/xwayland/xwayland-21.1.1-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson - -DESCRIPTION="Standalone X server running under Wayland" -HOMEPAGE="https://wayland.freedesktop.org/xserver.html" -SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz" - -IUSE="rpc unwind ipv6 xcsecurity selinux" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" - -CDEPEND=" - >=x11-libs/pixman-0.27.2 - dev-libs/libbsd - >=x11-libs/libXfont2-2.0.1 - dev-libs/openssl:= - dev-libs/wayland - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libdrm-2.4.89 - >=media-libs/libepoxy-1.5.4[X,egl(+)] - >=media-libs/mesa-18[X(+),egl,gbm] - >=x11-libs/libxshmfence-1.1 - rpc? ( net-libs/libtirpc ) - >=x11-libs/libXau-1.0.4 - media-libs/libglvnd[X] - unwind? ( sys-libs/libunwind ) - >=dev-libs/wayland-protocols-1.18 - media-fonts/font-util - x11-libs/libxkbfile - >=x11-libs/xtrans-1.3.5 - x11-base/xorg-proto -" - -DEPEND=" - ${CDEPEND} - !<=x11-base/xorg-server-1.20.11 -" - -RDEPEND=" - ${DEPEND} - 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 rpc secure-rpc) - $(meson_use unwind libunwind) - $(meson_use ipv6) - $(meson_use xcsecurity) - $(meson_use selinux xselinux) - -Dsha1=libcrypto - -Ddpms=true - -Ddri3=true - -Dglamor=true - -Dglx=true - -Dscreensaver=true - -Dxace=true - -Dxdmcp=true - -Dxinerama=true - -Dxv=true - -Dxvfb=true - -Dxwayland-path="${EPREFIX}"/usr/libexec - -Ddtrace=false - ) - - meson_src_configure -} - -src_install() { - dosym ../libexec/Xwayland /usr/bin/Xwayland - - meson_src_install -} diff --git a/x11-base/xwayland/xwayland-21.1.1-r2.ebuild b/x11-base/xwayland/xwayland-21.1.1-r2.ebuild new file mode 100644 index 000000000000..06ad6c677a3d --- /dev/null +++ b/x11-base/xwayland/xwayland-21.1.1-r2.ebuild @@ -0,0 +1,84 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit meson + +DESCRIPTION="Standalone X server running under Wayland" +HOMEPAGE="https://wayland.freedesktop.org/xserver.html" +SRC_URI="https://xorg.freedesktop.org/archive/individual/xserver/${P}.tar.xz" + +IUSE="rpc unwind ipv6 xcsecurity selinux" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +DEPEND=" + >=x11-libs/pixman-0.27.2 + dev-libs/libbsd + >=x11-libs/libXfont2-2.0.1 + dev-libs/openssl:= + dev-libs/wayland + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libdrm-2.4.89 + >=media-libs/libepoxy-1.5.4[X,egl(+)] + >=media-libs/mesa-18[X(+),egl,gbm] + >=x11-libs/libxshmfence-1.1 + rpc? ( net-libs/libtirpc ) + >=x11-libs/libXau-1.0.4 + media-libs/libglvnd[X] + unwind? ( sys-libs/libunwind ) + >=dev-libs/wayland-protocols-1.18 + media-fonts/font-util + x11-libs/libxkbfile + >=x11-libs/xtrans-1.3.5 + x11-base/xorg-proto + >=x11-misc/xkeyboard-config-2.4.1-r3 +" + +RDEPEND=" + ${DEPEND} + !<=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 rpc secure-rpc) + $(meson_use unwind libunwind) + $(meson_use ipv6) + $(meson_use xcsecurity) + $(meson_use selinux xselinux) + -Dsha1=libcrypto + -Ddpms=true + -Ddri3=true + -Dglamor=true + -Dglx=true + -Dscreensaver=true + -Dxace=true + -Dxdmcp=true + -Dxinerama=true + -Dxv=true + -Dxvfb=true + -Dxwayland-path="${EPREFIX}"/usr/libexec + -Ddtrace=false + ) + + meson_src_configure +} + +src_install() { + dosym ../libexec/Xwayland /usr/bin/Xwayland + + meson_src_install +} diff --git a/x11-base/xwayland/xwayland-21.1.1.901.ebuild b/x11-base/xwayland/xwayland-21.1.1.901.ebuild index 2814cbf9058c..ad2989c660eb 100644 --- a/x11-base/xwayland/xwayland-21.1.1.901.ebuild +++ b/x11-base/xwayland/xwayland-21.1.1.901.ebuild @@ -15,7 +15,7 @@ LICENSE="MIT" SLOT="0" KEYWORDS="" -CDEPEND=" +DEPEND=" >=x11-libs/pixman-0.27.2 dev-libs/libbsd >=x11-libs/libXfont2-2.0.1 @@ -36,15 +36,12 @@ CDEPEND=" x11-libs/libxkbfile >=x11-libs/xtrans-1.3.5 x11-base/xorg-proto -" - -DEPEND=" - ${CDEPEND} - !<=x11-base/xorg-server-1.20.11 + >=x11-misc/xkeyboard-config-2.4.1-r3 " RDEPEND=" ${DEPEND} + !<=x11-base/xorg-server-1.20.11 selinux? ( sec-policy/selinux-xserver ) " BDEPEND=" -- cgit v1.2.3