summaryrefslogtreecommitdiff
path: root/x11-base/xorg-server
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-12-14 13:26:14 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-12-14 13:26:14 +0000
commit6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch)
tree25413d1cb3a0cbfe36029db32398c0f333609215 /x11-base/xorg-server
parent9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff)
gentoo resync : 14.12.2020
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r--x11-base/xorg-server/Manifest8
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.10.ebuild (renamed from x11-base/xorg-server/xorg-server-1.20.9.ebuild)24
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild2
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild22
4 files changed, 16 insertions, 40 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 86a756da0e88..c5583dbed63d 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,9 +4,9 @@ AUX xdm.initd-11 6033 BLAKE2B 713aa81380124326f3dce3604c44e943578d37d0c83b60778b
AUX xorg-server-1.12-unloadsubmodule.patch 1373 BLAKE2B 4c6017bcdc53964ecc796e1beaf8a8714a85f1cfe65032df3e9ea23378b4d2db0057ea7a75ab00e8d5d89ae0d63c766dce05350446f69ffe69bb668d06e2e68b SHA512 a6a8ebbb1005f2ea9cfdfc928209a23fe213caab31a889c3290f14bcae0a9afd40176330e2e56cb5ff986d522505e7fb98fa0c71187f403e2afd33c9c919780e
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.10.tar.bz2 6307058 BLAKE2B 13306e5f4f7f2b4531f2af5103337defa1d441bff78f20ea4d564a7d046ee546406812b6836fe94ca9323189382754270989b2ac7ded8950ddb2b15562c6ff21 SHA512 a07bee380bb72f2117fe6f831a6e4aded19bea1f2b36e42a019a30348e98d6fe65c0617cf819be9c6b405502f88cafb829df30aab32393774b71f1418a4cefae
DIST xorg-server-1.20.8.tar.bz2 6309640 BLAKE2B 0dadd3a7afdb768bcd79f99f3670f7efcb919c43ea88870c93df598b080fbbec48f88cfa996fb7bff2363cffe70d42d9b154855691a64ddb26156f1b378512a0 SHA512 ab0ec0fcbf490c61558b9297f61b58fd2dedb676c78bef6431dc9166054743b43a0091b88a8b3f4e81d1f539909440ee7e188a298cefabe13ea89159639cd805
-DIST xorg-server-1.20.9.tar.bz2 6302902 BLAKE2B b5d78f38dcf6a9af980a8d5caab751bd7b159a4af5503f176c5af87cce371ecc71572af67f99f08b5794410d2e9a32379ed0d70ceda9f9e2ed3eb6de3bb5fb72 SHA512 d9b5f93e1b9763a89187d8b272aa7d4ce9709641b8539f4536708af153310e5a4931bffd4229c51a3b0e3b12da7838750aa71b635751fb4c0bb27438cce4e5e6
-EBUILD xorg-server-1.20.8-r1.ebuild 5854 BLAKE2B eb32dc6bed38399d2ac5090676b8c2561a6878cdac863b0a52b908f5618baae55aa9f90e4caa5e485b8a0237d3b825127f74283694b75a368e3ef0b7c8a6b43e SHA512 c2c30312ceef3ae561c2f84db2c142a15d5fa2714be9971c6fbdcbbb33850873aea85b598893bee0975431e4486af114e91376bfbecd35865630a6f0b8568748
-EBUILD xorg-server-1.20.9.ebuild 5856 BLAKE2B 3637d521acf017fdddcb32bc1d8efc694b7eb332e7cc3390f3684b9e156f8034f119d67e1c3b22e8697c665eb9619a43f79ad0762a934145ce8870812a17dfe5 SHA512 b7006a75914d005a32aabc6638b0f869f1b10c1a3c3b9289eedb360bcdd50595b0d8375b7edfa7a52891162f35797991c0a8a9dd3ba2784ff2af231a92529189
-EBUILD xorg-server-9999.ebuild 5859 BLAKE2B f2099180e8c20d179f765287bb8e0534cf7ddb812ca877f1d861a1c8b5a13390c90209e80010078f6cedf1a93178e08bef5d2d796da983b21daa559fdcc62749 SHA512 56c6716463ac90322ac72790896f101f92fe62ae03ad55268a3fd0ed3a35d820525eea7ef974f9b1d231d502c68f0944fb94ac672a93e9fe9179e83a47fdb77d
+EBUILD xorg-server-1.20.10.ebuild 5556 BLAKE2B c385a2df5af966ba41692ff238c8c64c873f6c2f057e7856e6542dbbeb363cea924c59e1cffb5da927093e0694f6ec216a4ce64a93efd62c604253f1009999a4 SHA512 1a60f2906e9ae9347c4b617958ce4519d8f37569cca6e584b9e42f921ff740db7e90047a0aaccde13b8e7b5beb9020865dffef9ab10367b382000e11b653f14b
+EBUILD xorg-server-1.20.8-r1.ebuild 5861 BLAKE2B c74b36075e0912e90f4aa16495cd3e1493b2dd0c5feecf335ef2d34a2195a94db332fa88ad9c2c87298c7cb0e66f20b638e4767ae16d0b311bd24d97cc653d69 SHA512 17e76294b30d77a7dbb8d4c7e3aa1c06e8ebd3e3551ad030c03594f7b635a8be824119f24b51778d2f9854bc1d984b49e08ff74bab1873d60e83459595967b19
+EBUILD xorg-server-9999.ebuild 5560 BLAKE2B 74c8b0f4de73dbd51416d10c6b613b9cb6b1fcae96a0dbc2310a254ab311fe3ac3745b8f20535e9a6786536f77df1ea55dd92a31ce8f65bc4c130e4c22896655 SHA512 23b5b056aead208714911fa6a15f5b65e8a945c071c35ee1a0410e439ebae018dc691e180dc452a1e60d693a7bc9c498f29114f09f6e893681f0012defedc012
MISC metadata.xml 952 BLAKE2B 48b5bada3b2b3b16ef4806f028b8fe47a4d5cd0d19783ebb585f0389f51df589d3f53c5bff5f5ed883ad61c7e7be0fef94fd5cf11042e23dea5e456faf0a927c SHA512 34955c04ee1488a09997d0d9caf63c9202023d06e0524b74120c5c1def033d9dbc2ce82a5d4c289a6fd98df83e2e09ad54e6a084d164d2416228628df7874198
diff --git a/x11-base/xorg-server/xorg-server-1.20.9.ebuild b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
index e7dc1b76401c..bcd42d84a2d4 100644
--- a/x11-base/xorg-server/xorg-server-1.20.9.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.10.ebuild
@@ -10,18 +10,14 @@ 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 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity"
-CDEPEND="libglvnd? (
- media-libs/libglvnd[X]
- !app-eselect/eselect-opengl
- !!x11-drivers/nvidia-drivers[-libglvnd(-)]
- )
- !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 )
+CDEPEND="
+ media-libs/libglvnd[X]
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
>=x11-apps/iceauth-1.0.2
@@ -87,7 +83,8 @@ CDEPEND="libglvnd? (
sys-auth/elogind[pam]
sys-auth/pambase[elogind]
)
- "
+ !!x11-drivers/nvidia-drivers[-libglvnd(-)]
+"
DEPEND="${CDEPEND}
sys-devel/flex
@@ -212,15 +209,6 @@ src_install() {
find "${ED}"/var -type d -empty -delete || die
}
-pkg_postinst() {
- if ! use minimal; then
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
- if ! use libglvnd; then
- eselect opengl set xorg-x11 --use-old
- fi
- fi
-}
-
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
diff --git a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
index 8154b59da1aa..5f18e7ec8ed7 100644
--- a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
@@ -10,7 +10,7 @@ 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 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+ 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"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index e6b07abb3bb3..ed1a5f6c51e6 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -15,14 +15,10 @@ if [[ ${PV} != 9999* ]]; then
fi
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl minimal selinux suid systemd +udev unwind xcsecurity"
-CDEPEND="libglvnd? (
- media-libs/libglvnd[X]
- !app-eselect/eselect-opengl
- !!x11-drivers/nvidia-drivers[-libglvnd(-)]
- )
- !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 )
+CDEPEND="
+ media-libs/libglvnd[X]
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
>=x11-apps/iceauth-1.0.2
@@ -88,7 +84,8 @@ CDEPEND="libglvnd? (
sys-auth/elogind[pam]
sys-auth/pambase[elogind]
)
- "
+ !!x11-drivers/nvidia-drivers[-libglvnd(-)]
+"
DEPEND="${CDEPEND}
sys-devel/flex
@@ -212,15 +209,6 @@ src_install() {
find "${ED}"/var -type d -empty -delete || die
}
-pkg_postinst() {
- if ! use minimal; then
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
- if ! use libglvnd; then
- eselect opengl set xorg-x11 --use-old
- fi
- fi
-}
-
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 08:47:30 +0000