diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-07-03 22:39:47 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-07-03 22:39:47 +0100 |
| commit | 7f0ccc917c7abe6223784c703d86cd14755691fb (patch) | |
| tree | 8c6793f68896b341e22f33d7e6cef88e481f4a8b /x11-base/xorg-server | |
| parent | 9aa80713372911cec499b3adb2cd746790920916 (diff) | |
gentoo resync : 03.07.2021
Diffstat (limited to 'x11-base/xorg-server')
| -rw-r--r-- | x11-base/xorg-server/Manifest | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 18 |
2 files changed, 4 insertions, 16 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 8cdc31e65cc5..048f999761ae 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -4,5 +4,5 @@ AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d 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.ebuild 5574 BLAKE2B 9e1a53aab7fc913898e01728057bb121f68e41d3f50ad022328474e6b2fcea48502d5d64c2116faa8417db174259146420171cb77f1d10328a9951bb67de6b4b SHA512 b209f1dbbcdb8cacac4b638b2ad9db0527b535c5111535a99f6965124dba0e77fec890c292b07e5cdfef8f3a5f8e5a5f4e53464061b9936c8b391dbd0a23e635 -EBUILD xorg-server-9999.ebuild 5578 BLAKE2B 3fa7a83ed1cdada0ce2d7ae5fb43bbaf8b130c3a9b30b7db37508b0460045244361c989b26d3801d923fe06a83f03c0b29a0bf01270534dc66d83170b65e72e7 SHA512 a3829df86bf7446e277c165b703da4f930a9f0af014d7258df71fca055b61f917ddc6600fb69d8a94b4113badfd7d3a6aa2688b7ea3f8b95bf31d49372e57679 +EBUILD xorg-server-9999.ebuild 5242 BLAKE2B 0febe3e6105875cc0bc3ae0ff0953f99c962df7d89407de92a9f9edd9db38ed4baaba1ff39d30cbf97ef15a4ec51e65927990fe254fd1398c6645bba22014066 SHA512 2d97ede7604284d01232a4ec5bfb4d4fda4195418080b67334536390a9d3f98fbc22680ae6091d893dc4a9af6e6b71737bd49507e0c3126deefdbfeef3846231 MISC metadata.xml 895 BLAKE2B 03b64d8a77f70c326650f17775d8c605c1dad44529330d26daee4136bd36e0f53d79212a7038d943795dbc5772dbcd52208b762aad42ed832ebabd848e5fa15f SHA512 fcee97e4ee4b1f972c4bea7626a719aa4d18b75b4475554327369349d5f42c0b1a3b8fb513727751b9703cfb9afc34fdb073cf19e116e7c5f6fad9b204574a5c diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 1b2a33ee9084..70fb5f6bd29f 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -68,11 +68,6 @@ CDEPEND=" ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) - wayland? ( - >=dev-libs/wayland-1.3.0 - >=media-libs/libepoxy-1.5.4[egl(+)] - >=dev-libs/wayland-protocols-1.18 - ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus @@ -97,6 +92,7 @@ DEPEND="${CDEPEND} ) ) ) + wayland? ( x11-base/xwayland ) " RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) @@ -104,7 +100,6 @@ RDEPEND="${CDEPEND} " BDEPEND=" sys-devel/flex - wayland? ( dev-util/wayland-scanner ) " PDEPEND=" xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" @@ -127,14 +122,6 @@ PATCHES=( "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch ) -pkg_setup() { - if use wayland && use minimal; then - ewarn "glamor is necessary for acceleration under Xwayland." - ewarn "Performance may be unacceptable without it." - ewarn "Build with USE=-minimal to enable glamor." - fi -} - src_configure() { # localstatedir is used for the log location; we need to override the default # from ebuild.sh @@ -148,7 +135,6 @@ src_configure() { $(use_enable kdrive) $(use_enable test unit-tests) $(use_enable unwind libunwind) - $(use_enable wayland xwayland) $(use_enable !minimal record) $(use_enable !minimal xfree86-utils) $(use_enable !minimal dri) @@ -165,6 +151,7 @@ src_configure() { $(use_with doc doxygen) $(use_with doc xmlto) $(use_with systemd systemd-daemon) + --disable-xwayland --enable-libdrm --sysconfdir="${EPREFIX}"/etc/X11 --localstatedir="${EPREFIX}"/var @@ -174,6 +161,7 @@ src_configure() { --disable-linux-acpi --without-dtrace --without-fop + --with-os-vendor=Gentoo --with-sha1=libcrypto CPP="$(tc-getPROG CPP cpp)" ) |