From a5b65c81168c90928784a1e92cda84ed5d6b9eb3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Sep 2019 19:33:39 +0100 Subject: gentoo resync : 25.09.2019 --- x11-base/Manifest.gz | Bin 1054 -> 1045 bytes x11-base/xorg-server/Manifest | 6 +++--- x11-base/xorg-server/metadata.xml | 3 ++- x11-base/xorg-server/xorg-server-1.20.5.ebuild | 12 +++++++++--- x11-base/xorg-server/xorg-server-9999.ebuild | 12 +++++++++--- 5 files changed, 23 insertions(+), 10 deletions(-) (limited to 'x11-base') diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz index 77ea74314934..e81fd3ee5b08 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 b0379f19024c..ca024deb26c7 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -8,6 +8,6 @@ AUX xorg-server-1.20.4-shm-Use-memfd_create-when-possible.patch 3194 BLAKE2B 6ac AUX xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch 1724 BLAKE2B 34c607f6b6a6f21ed6b34d7a87cb3bc1774f526f32144218c7d5d338474c08c98c72a87b41f3d0afcaf81dc0e8d5989a48fd8e64a6a9e25ad968ad8156f6e984 SHA512 49d5af904bac03cfc8ad89b70541e9af6687f7f0153d06ada64e2226d27dddc1b7bb27024bed73c20c365197858957730de005c515bbae8e22b610c3241b70e4 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be SHA512 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 -EBUILD xorg-server-1.20.5.ebuild 5875 BLAKE2B 633d60acbb823cf1231491af8e8e95e9acb5cf5de34f30ef42871399c6dc94ac865df0b0ff0240a0779fae15e5c3ddbfeb034ef7c3b7467c75eb0e29f595e4b4 SHA512 849ef60f35de4c5ed889af538f9f4fa24d9941aff2cccb46b0349bee4ad29b75f1dcba7f1b8ca201043dfb2e64f843be23294e911911cc0b7da435634c6d0913 -EBUILD xorg-server-9999.ebuild 5603 BLAKE2B 0fb854d6a47229633d8ef633647c422bf7561d12e851d020d6ea7deb12231468852c15918e571b833765818ed170270b85af4c0c5798508376857877bb5841a2 SHA512 8bbd3d5428e1ca5096c28d990189994574b140b85359dd70848f25df4308fb8e20ab6416f02821be8cc5a7169611a315b417429fe654fd2458a109dc6db4047b -MISC metadata.xml 960 BLAKE2B 886751450005aa4b2c197e0aa439028ab0138e8947a8deb005890ca4845e6e19b19f3134e7e3d105ef2bab68e6f8605fee87a082dd25cbd7fe223b9268ecc607 SHA512 d027e5a630ec940e6c2c5f216fa159aa25092cbbb7078efe2bc52ebee28b856297d0a641f57a2c108cb13ad61e9d8d0007ae9d6f2c2ff01ec4632650ec1b72df +EBUILD xorg-server-1.20.5.ebuild 5999 BLAKE2B 8693d6a1ecde9196c4355402b1d5cafbf45bee70364b65560417a6dea5fbfcca360b6980fef8fbc1fe3243743807e061a1b54cf5fbf8963f3cf9930ded6646fe SHA512 fe771c6b82d277db81233d02908e44321c2156380e75d1eeeb9fe806ca58367ec5291bfc04040cbc5019f0e11d94c99ec47562c447ba57aea17f5dd6d3d3eeec +EBUILD xorg-server-9999.ebuild 5727 BLAKE2B c00c01f5b71cc0eb468fb78b45b6c0d8ab5c5393923bdd1ff7fd1daf271f8908d3ab2a62b7cd830a0c04eb88a1d46f13bdfc5d070b9e92f71d031740bcabb8d0 SHA512 d143eef70e356efd82d3a60d02fec9595d58e877a33e19e45ffc7c38ab566e61bf45bf2c8b11c8d998619298b0a15285218bc063e3875cf574cedade52ccc744 +MISC metadata.xml 1017 BLAKE2B 98dc828c96dc8fe30ef9314a6858aab7f25a0959d496f1c61802a38438902597c477ea1ae8018873958339ff936f0093651e4352db2e82fe4b77116365888d9f SHA512 695f5fefa689ccb192e43f9deab082bb4b18f68355d95e6b483e053451c87bb64a4d74c9e382e736e2900b9f4720613651f69831e8eefb2c1cd228b6284ae5c2 diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml index 5c14eec54c86..b3f0d6f2cdee 100644 --- a/x11-base/xorg-server/metadata.xml +++ b/x11-base/xorg-server/metadata.xml @@ -10,10 +10,11 @@ Use elogind to get control over framebuffer when running as regular user Enable Glamor OpenGL 2D acceleration Build the kdrive X servers + Use libglvnd for dispatch. Enable libunwind usage for backtraces Build Security extension - Build the Xnest server Build the Xephyr server + Build the Xnest server Build the Xorg X server (HIGHLY RECOMMENDED) Build the Xvfb server diff --git a/x11-base/xorg-server/xorg-server-1.20.5.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild index 1fbae4ec6556..d6883094f9fd 100644 --- a/x11-base/xorg-server/xorg-server-1.20.5.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild @@ -15,9 +15,13 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" -CDEPEND=">=app-eselect/eselect-opengl-1.3.0 +CDEPEND="libglvnd? ( + media-libs/libglvnd + !app-eselect/eselect-opengl + ) + !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 @@ -206,7 +210,9 @@ src_install() { pkg_postinst() { if ! use minimal; then # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old + if ! use libglvnd; then + eselect opengl set xorg-x11 --use-old + fi fi } diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 3547a7b0742f..c45093888f55 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -14,9 +14,13 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl minimal selinux +suid systemd +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug elogind +glamor ipv6 libressl libglvnd minimal selinux +suid systemd +udev unwind xcsecurity" -CDEPEND=">=app-eselect/eselect-opengl-1.3.0 +CDEPEND="libglvnd? ( + media-libs/libglvnd + !app-eselect/eselect-opengl + ) + !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 @@ -201,7 +205,9 @@ src_install() { pkg_postinst() { if ! use minimal; then # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) - eselect opengl set xorg-x11 --use-old + if ! use libglvnd; then + eselect opengl set xorg-x11 --use-old + fi fi } -- cgit v1.2.3 From 5a165c60b9b8c4847067cb83b4be7da785d01f93 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Sep 2019 08:17:07 +0100 Subject: gentoo resync : 28.09.2019 --- x11-base/Manifest.gz | Bin 1045 -> 1046 bytes x11-base/xorg-server/Manifest | 4 ++-- x11-base/xorg-server/xorg-server-1.20.5.ebuild | 6 ++++++ x11-base/xorg-server/xorg-server-9999.ebuild | 8 +++++++- 4 files changed, 15 insertions(+), 3 deletions(-) (limited to 'x11-base') diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz index e81fd3ee5b08..df4ee8415587 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 ca024deb26c7..de371d8f6ba1 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -8,6 +8,6 @@ AUX xorg-server-1.20.4-shm-Use-memfd_create-when-possible.patch 3194 BLAKE2B 6ac AUX xorg-server-1.20.4-shm-reindent-shm_tmpfile-to-follow-our-standards.patch 1724 BLAKE2B 34c607f6b6a6f21ed6b34d7a87cb3bc1774f526f32144218c7d5d338474c08c98c72a87b41f3d0afcaf81dc0e8d5989a48fd8e64a6a9e25ad968ad8156f6e984 SHA512 49d5af904bac03cfc8ad89b70541e9af6687f7f0153d06ada64e2226d27dddc1b7bb27024bed73c20c365197858957730de005c515bbae8e22b610c3241b70e4 AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.20.5.tar.bz2 6126757 BLAKE2B 2374c6f39acd80174d9cf9c15b6a75f420de3a9b7b51a41385a326fed106fc57fdc5a0a4a08beba36a8d65bff1c8c8d35bb50c73c5285ee206f3293a212369be SHA512 625f0626b122cf95600abe382c3217348999357a0e2d2443092f1b67cff1c98d7ef09303884ceaeac181e0555dc56b0d4d44bda45cc464dac2d9a50c5b32d631 -EBUILD xorg-server-1.20.5.ebuild 5999 BLAKE2B 8693d6a1ecde9196c4355402b1d5cafbf45bee70364b65560417a6dea5fbfcca360b6980fef8fbc1fe3243743807e061a1b54cf5fbf8963f3cf9930ded6646fe SHA512 fe771c6b82d277db81233d02908e44321c2156380e75d1eeeb9fe806ca58367ec5291bfc04040cbc5019f0e11d94c99ec47562c447ba57aea17f5dd6d3d3eeec -EBUILD xorg-server-9999.ebuild 5727 BLAKE2B c00c01f5b71cc0eb468fb78b45b6c0d8ab5c5393923bdd1ff7fd1daf271f8908d3ab2a62b7cd830a0c04eb88a1d46f13bdfc5d070b9e92f71d031740bcabb8d0 SHA512 d143eef70e356efd82d3a60d02fec9595d58e877a33e19e45ffc7c38ab566e61bf45bf2c8b11c8d998619298b0a15285218bc063e3875cf574cedade52ccc744 +EBUILD xorg-server-1.20.5.ebuild 6092 BLAKE2B 8683b99a4044447db0d368591c4e04c76c2cc78d750494b761c7ae875c7c06bb1f96d046cb7bdb9b766c4c249c008c5e8ab2b9053efa7fc168cd727e14102cc7 SHA512 f9158c6f82840dfd12365baa2785039a027281482b21182bd66dd16557e272722d88806c1f27e5efb6a0b64d4c1ad45fb1674574ec64ab3e5567e5563c0467b2 +EBUILD xorg-server-9999.ebuild 5821 BLAKE2B d448bb1ce71de106744cb19a3d0e9b9d5ea5e5070f34a01989b4e35843aad5e524838b6b1ee9462ce22168019cc3cb61d049077ea6ba21d2be653db22e72ffea SHA512 23468b0c6d4bd0ffa763e87ae5ba6523ea079beaefe8e19aebb03603ae9e2ef49cf1c9ee58a9e327c95f71b0016f0027ac5a82f4d8ab6f380dbd8bf12a3e6e82 MISC metadata.xml 1017 BLAKE2B 98dc828c96dc8fe30ef9314a6858aab7f25a0959d496f1c61802a38438902597c477ea1ae8018873958339ff936f0093651e4352db2e82fe4b77116365888d9f SHA512 695f5fefa689ccb192e43f9deab082bb4b18f68355d95e6b483e053451c87bb64a4d74c9e382e736e2900b9f4720613651f69831e8eefb2c1cd228b6284ae5c2 diff --git a/x11-base/xorg-server/xorg-server-1.20.5.ebuild b/x11-base/xorg-server/xorg-server-1.20.5.ebuild index d6883094f9fd..6eb2ab411f88 100644 --- a/x11-base/xorg-server/xorg-server-1.20.5.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.5.ebuild @@ -186,6 +186,12 @@ pkg_setup() { ) } +src_prepare() { + sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die + default + eautoreconf +} + src_install() { xorg-3_src_install diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index c45093888f55..ccf5c5da1dbf 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -78,7 +78,7 @@ CDEPEND="libglvnd? ( wayland? ( >=dev-libs/wayland-1.3.0 media-libs/libepoxy[egl(+)] - >=dev-libs/wayland-protocols-1.1 + >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( @@ -181,6 +181,12 @@ pkg_setup() { ) } +src_prepare() { + sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die + default + eautoreconf +} + src_install() { xorg-3_src_install -- cgit v1.2.3