From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- x11-base/Manifest.gz | Bin 1214 -> 1396 bytes x11-base/xorg-drivers/Manifest | 1 + x11-base/xorg-drivers/xorg-drivers-21.1.ebuild | 99 ++++++++++++ x11-base/xorg-proto/Manifest | 6 +- x11-base/xorg-proto/xorg-proto-2021.4.99.2.ebuild | 54 ------- x11-base/xorg-proto/xorg-proto-2021.4.ebuild | 54 ------- x11-base/xorg-proto/xorg-proto-2021.5.ebuild | 2 +- x11-base/xorg-server/Manifest | 7 +- .../files/xorg-server-21.1.1-DPI-revert.patch | 133 +++++++++++++++ x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild | 2 +- x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild | 180 +++++++++++++++++++++ x11-base/xorg-server/xorg-server-9999.ebuild | 34 ++-- x11-base/xorg-sgml-doctools/Manifest | 3 + x11-base/xorg-sgml-doctools/metadata.xml | 8 + .../xorg-sgml-doctools-1.11.ebuild | 18 +++ x11-base/xwayland/Manifest | 4 +- x11-base/xwayland/xwayland-21.1.2.901.ebuild | 87 ---------- x11-base/xwayland/xwayland-21.1.3.ebuild | 87 ++++++++++ 18 files changed, 559 insertions(+), 220 deletions(-) create mode 100644 x11-base/xorg-drivers/xorg-drivers-21.1.ebuild delete mode 100644 x11-base/xorg-proto/xorg-proto-2021.4.99.2.ebuild delete mode 100644 x11-base/xorg-proto/xorg-proto-2021.4.ebuild create mode 100644 x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch create mode 100644 x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild create mode 100644 x11-base/xorg-sgml-doctools/Manifest create mode 100644 x11-base/xorg-sgml-doctools/metadata.xml create mode 100644 x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild delete mode 100644 x11-base/xwayland/xwayland-21.1.2.901.ebuild create mode 100644 x11-base/xwayland/xwayland-21.1.3.ebuild (limited to 'x11-base') diff --git a/x11-base/Manifest.gz b/x11-base/Manifest.gz index 683ad36841a6..6ed3cab82e10 100644 Binary files a/x11-base/Manifest.gz and b/x11-base/Manifest.gz differ diff --git a/x11-base/xorg-drivers/Manifest b/x11-base/xorg-drivers/Manifest index 764b1004bba6..d1bfddc917ba 100644 --- a/x11-base/xorg-drivers/Manifest +++ b/x11-base/xorg-drivers/Manifest @@ -1,3 +1,4 @@ EBUILD xorg-drivers-1.20-r2.ebuild 3663 BLAKE2B 8bea6180884af5bface58cb832be4aedebd3246aa04ac425202611d70ffeb6373a191f92bd626c86161f5e0916b4b094275c824063254c2f0e9765c25ba3ac4b SHA512 8598f1dbc448d42daf1eb738a9ac42701f19777f585529e7af7c9c761eabf0ac19e41af0374297e186e0bf363be409ef13937a12ece193237c160af671cd70dd +EBUILD xorg-drivers-21.1.ebuild 3670 BLAKE2B c0bc7865521fea82636126a059c4d1dfaf77774acdb22165d0a10afa87148265c66213256606218bc718e21ef2b4364788e83b2d0434677c75893b43203e35e8 SHA512 f2e09206b6552573ce455041fac30370fe75b628c6bda4296badd7a098ba0bc84192f96ab91c40f6b2a8753b9f4ebd0e180dad8ab469941bbf07de04ca04ff15 EBUILD xorg-drivers-9999.ebuild 3689 BLAKE2B 90c471e6925594be628396251f7a5d408fdc0068c0e1285a603b5f3a85e5647b68345e24efd23143a739482db5169f5cf274a443238301d3667c0ded59c1ff32 SHA512 74478e2ae3af50ca9594f92e214a011ac00780649dc45e3b64614193b7b524960fcd7bad42ce8894ba0dd23519d767d1a081b4ebb5ab4de4feae58d51f7ba364 MISC metadata.xml 235 BLAKE2B 5ed3cd35ac32a5cdd6ac490bafdbc1cd03fc8c6bdbc8194ba7f4a34151a24c4ade7a80705d92348d6d13a9579d18b19ec40a353bf014dc02f98980bfa03d3574 SHA512 3fe78f6dd92b87b30ed02aef15ed72ec5cb62f4c6568dd9b98dcb2f11a4b9ce93955e34c62112a310b4c4a51f87e0e31e31ae5af140e1054c127d3cd344d7267 diff --git a/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild b/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild new file mode 100644 index 000000000000..961b9ece8743 --- /dev/null +++ b/x11-base/xorg-drivers/xorg-drivers-21.1.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Meta package containing deps on all xorg drivers" +HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" +SRC_URI="" + +LICENSE="metapackage" +SLOT="0" +if [[ ${PV} != 9999 ]]; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +IUSE_INPUT_DEVICES=" + input_devices_elographics + input_devices_evdev + input_devices_joystick + input_devices_libinput + input_devices_vmmouse + input_devices_void + input_devices_synaptics + input_devices_wacom +" +IUSE_VIDEO_CARDS=" + video_cards_amdgpu + video_cards_ast + video_cards_dummy + video_cards_fbdev + video_cards_freedreno + video_cards_geode + video_cards_glint + video_cards_i915 + video_cards_i965 + video_cards_intel + video_cards_mga + video_cards_nouveau + video_cards_nv + video_cards_omap + video_cards_qxl + video_cards_r128 + video_cards_radeon + video_cards_radeonsi + video_cards_siliconmotion + video_cards_tegra + video_cards_vc4 + video_cards_vesa + video_cards_via + video_cards_virtualbox + video_cards_vmware + video_cards_nvidia +" + +IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}" + +PDEPEND=" + input_devices_elographics? ( x11-drivers/xf86-input-elographics ) + input_devices_evdev? ( + >=x11-base/xorg-server-${PV}[udev] + >=x11-drivers/xf86-input-evdev-2.10.6 + ) + input_devices_joystick? ( >=x11-drivers/xf86-input-joystick-1.6.3 ) + input_devices_libinput? ( + >=x11-base/xorg-server-${PV}[udev] + >=x11-drivers/xf86-input-libinput-0.27.1 + ) + input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse ) + input_devices_void? ( x11-drivers/xf86-input-void ) + input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) + input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.36.0-r2 ) + + video_cards_amdgpu? ( >=x11-drivers/xf86-video-amdgpu-18.0.1 ) + video_cards_ast? ( x11-drivers/xf86-video-ast ) + video_cards_dummy? ( x11-drivers/xf86-video-dummy ) + video_cards_fbdev? ( >=x11-drivers/xf86-video-fbdev-0.5.0 ) + video_cards_freedreno? ( >=x11-base/xorg-server-${PV}[-minimal] ) + video_cards_geode? ( x11-drivers/xf86-video-geode ) + video_cards_glint? ( >=x11-drivers/xf86-video-glint-1.2.9 ) + video_cards_i915? ( x11-drivers/xf86-video-intel ) + video_cards_i965? ( >=x11-base/xorg-server-${PV}[-minimal] ) + video_cards_intel? ( !video_cards_i965? ( >=x11-drivers/xf86-video-intel-2.99.917_p20180214-r1 ) ) + video_cards_mga? ( >=x11-drivers/xf86-video-mga-1.6.5 ) + video_cards_nouveau? ( >=x11-drivers/xf86-video-nouveau-1.0.13 ) + video_cards_nv? ( >=x11-drivers/xf86-video-nv-2.1.21 ) + video_cards_omap? ( >=x11-drivers/xf86-video-omap-0.4.5 ) + video_cards_qxl? ( x11-drivers/xf86-video-qxl ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers ) + video_cards_r128? ( >=x11-drivers/xf86-video-r128-6.10.2 ) + video_cards_radeon? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) + video_cards_radeonsi? ( >=x11-drivers/xf86-video-ati-18.0.1-r1 ) + video_cards_siliconmotion? ( >=x11-drivers/xf86-video-siliconmotion-1.7.9 ) + video_cards_tegra? ( >=x11-base/xorg-server-${PV}[-minimal] ) + video_cards_vc4? ( >=x11-base/xorg-server-${PV}[-minimal] ) + video_cards_vesa? ( x11-drivers/xf86-video-vesa ) + video_cards_via? ( x11-drivers/xf86-video-openchrome ) + video_cards_virtualbox? ( x11-drivers/xf86-video-vboxvideo ) + video_cards_vmware? ( >=x11-drivers/xf86-video-vmware-13.3.0 ) +" diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest index e1c10b4032f3..09b44c3f05f1 100644 --- a/x11-base/xorg-proto/Manifest +++ b/x11-base/xorg-proto/Manifest @@ -1,8 +1,4 @@ -DIST xorgproto-2021.4.99.2.tar.gz 1143087 BLAKE2B eabdbc903a058a9be919192ac71fc95cedc2ff58e131a0eae6454be1e03714fb592d020ce8d9a4915a620de2a4d1c7cf2c5939c53ba96199f2a2ea579c450606 SHA512 34c4cb2aa97568be5ac5480c86122e9733afab3d17d48d170636aa10b39a99d6d637864d872ab78040a468ee3896a1aa42f5124bc8a4901dbb4b543eada7a607 -DIST xorgproto-2021.4.tar.gz 1141941 BLAKE2B 016a3c2f30ed064855de2a13d86a4b7bc9420ff10e8ac3ba97e08512fef6f0495a69dcaea7f12c7d8694a52284b500a38aee73de7bf2ff0a295715354d04eab0 SHA512 5f4c94d3ee20635f2358d7644be54d5e291bafba15a7713583acbb3564c2799da4ba33ffba625273fe015e4ab733cbaec146467804fd2174eb5fd1ff3bf21019 DIST xorgproto-2021.5.tar.gz 1132811 BLAKE2B 3fe288cf8a848436dacc0ebf437b6a1d2c81878abaf8c542ff45e70389643cb2bc25bdab5ab6ff9d44a4f9bbdbd24757d21617c2c6a0754870afcd9f60ccbb05 SHA512 9c9ec62f0af68fd0dff24010986326a2b201be2b56b8b94abfe7258bf66b3c4c37088596c43a234aae63b1d781f7797caf408e434c98e8805803bc890b8aacb0 -EBUILD xorg-proto-2021.4.99.2.ebuild 1191 BLAKE2B 3b074d900922af4633893e60fb07cff71a8868ed33ca7a7ef4c5d3dcf16853006e9978e82c77aec781225940e864a6e44e3ee73209d244ee0d98a98aca48d14e SHA512 f454d47c50d1caf590ae528829031abf416283eb51415ac80a2c1d90154830b9c0fc0dbdaa8aba151fb357807867a4b404563c2a4031bc5f95c6b643b68eb758 -EBUILD xorg-proto-2021.4.ebuild 1183 BLAKE2B a546eb4286819d9699dc04ca7f8e9f4114cfabcd8dc7e5d214278e1cb8ac71f4b1dda561c23f6114ab6afd78ac910029b36fd468746b098e4eec80c94e84f5c4 SHA512 ecbacd72b45f800b16c8e72a17dd60e868376fd9ba19368a99760ebbf0ebf104ffbde15affec7ed56a3d7012ca0ca725262c758a08ef70b2781d20a847fb2c9c -EBUILD xorg-proto-2021.5.ebuild 1189 BLAKE2B 7573df8784ce1be638dc590cd458787f18ca136b54a4600deb59ea0f6dbef6def1ccc57783d708c6d43a21730fe95714439abb3a91e2e1d081e66789bb61dd8d SHA512 4a026bb44d7484e040e0c72b9b5a15bd7102f1db56e94e1e51fdfb6fa5a8951b19e3084514c85fc7c52205ee9ed6ea752d6a2a293c4b5211d345467bb1b27ddc +EBUILD xorg-proto-2021.5.ebuild 1184 BLAKE2B 7129e8ed1e437e04359d2d61612f808715f2639f0ae6846343d4f844556b570c9d5fd240597a408d2295ea6c76a88bc582c3d6cd388c12f8e93019cb3e1a3822 SHA512 32a3cef52319fbe9c15aa31fd2378e743b8a1ea8b6c366aed9bb97f3882252e3eeb0d4b340d6f69a45a87cc3587be937b5cf223bc3f60049bb34600f53a03613 EBUILD xorg-proto-9999.ebuild 1192 BLAKE2B 038ddae65c702a3db68db14a8d7325561ea832a41a32fb6d48377bcfd6c629816a7b18366353c54fc9f0fdcd413af95bcc8f111539e7d6b220bea1913ba4f7ac SHA512 646608b43c5753b25cb1ecdc749853d81e98e6bb766997173445c3d2444b9e60516c07ff5b7aee443b26fc44c045e2f5fee0b38ed44067e815528ce6bf4e0df1 MISC metadata.xml 231 BLAKE2B 6373a9c04316f777f87754fbb7cbc856493138d32bdb05d1015946ebbb359c4b8adb9372554097833d5c9a20e00e32fa0a1c90995d9299dd2215a2cadcccbb73 SHA512 bf6ad5078a6775cd61d257939d41ec53d006124475da2949c55b4b3ac138ec85a88b9068c5920b1e781fadda963939b8f120f8864d82e10cf50e09cc8052a6dc diff --git a/x11-base/xorg-proto/xorg-proto-2021.4.99.2.ebuild b/x11-base/xorg-proto/xorg-proto-2021.4.99.2.ebuild deleted file mode 100644 index 3544d1e5d5eb..000000000000 --- a/x11-base/xorg-proto/xorg-proto-2021.4.99.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -MY_PN="${PN/xorg-/xorg}" -MY_P="${MY_PN}-${PV}" - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson python-any-r1 - -DESCRIPTION="X.Org combined protocol headers" -HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - $(python_gen_any_dep ' - dev-python/python-libevdev[${PYTHON_USEDEP}] - ') - ) -" -RDEPEND="" - -python_check_deps() { - has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_install() { - meson_src_install - - mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die -} diff --git a/x11-base/xorg-proto/xorg-proto-2021.4.ebuild b/x11-base/xorg-proto/xorg-proto-2021.4.ebuild deleted file mode 100644 index 5c22fcba9c92..000000000000 --- a/x11-base/xorg-proto/xorg-proto-2021.4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) - -MY_PN="${PN/xorg-/xorg}" -MY_P="${MY_PN}-${PV}" - -EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson python-any-r1 - -DESCRIPTION="X.Org combined protocol headers" -HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" -if [[ ${PV} = 9999* ]]; then - SRC_URI="" -else - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" - SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" - S="${WORKDIR}/${MY_P}" -fi - -LICENSE="MIT" -SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" - -DEPEND=" - test? ( - $(python_gen_any_dep ' - dev-python/python-libevdev[${PYTHON_USEDEP}] - ') - ) -" -RDEPEND="" - -python_check_deps() { - has_version -b "dev-python/python-libevdev[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_install() { - meson_src_install - - mv "${ED}"/usr/share/doc/{xorgproto,${P}} || die -} diff --git a/x11-base/xorg-proto/xorg-proto-2021.5.ebuild b/x11-base/xorg-proto/xorg-proto-2021.5.ebuild index 1e488b841fa8..6bd2e9b7da19 100644 --- a/x11-base/xorg-proto/xorg-proto-2021.5.ebuild +++ b/x11-base/xorg-proto/xorg-proto-2021.5.ebuild @@ -20,7 +20,7 @@ HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto" if [[ ${PV} = 9999* ]]; then SRC_URI="" else - KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris" SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}" fi diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index da0f48fd4308..7c19f6e3e982 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,7 +1,10 @@ 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-server-21.1.1-DPI-revert.patch 5333 BLAKE2B 65a32a38bc08660d0b77c3d95a0ffdf36945a46d873f908e16aa93fdc2f48cdcbbd06ec754077d3690be1b17707da8f4bc4fbdb4e833281167769d4453487535 SHA512 20dfdd57e6038aac931ac4b3cc322dcfb594a9ba8b58786e95c442891ec4f12c16b238672dc41983eb68c0ad0f7be4c0bf5479d99b9f64f8f7a9578250f48c1d AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 DIST xorg-server-1.20.13.tar.xz 5122260 BLAKE2B 4435d25d8b379142fcc4bf60d82e52417ac3ab22a77ededa1472785d67c23bfb95be8e10465fc4859645405b8e580d6dcb262caea39c408e724d0e5ea61b37af SHA512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3 -EBUILD xorg-server-1.20.13-r1.ebuild 5255 BLAKE2B 3b300201176f3d0a83991d48ac1a33aec5f68f25db717ab23bebed74b2c8402385508bf0f6dcfac86158970149ade4f815218d86141ba6582d9c269bf53ce1ff SHA512 794b98725fe94e07f133f42aaf757887881f4a5fb37d8a0a92f77ee7dcbff31d041af380898982dab2996749aa65c399c434d2eaa6f59a68b6d952abfe97e0f0 -EBUILD xorg-server-9999.ebuild 4222 BLAKE2B 44ea47cbcb8f1e0d9f94c95b9f5809fe71726e342412dfd674b7de71295e0ca8334399e8616c3c9789abdc6b6f9a3880abbb1430460f1680990b207acd1131d4 SHA512 574fddb0803dd75730c80d81b73ba711098fd4fa28546ac83ca4a8e2cb821ffa32ab2a35900315a5a6631d018d7e592b486a429aca4d935e9108c7962a87624f +DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d +EBUILD xorg-server-1.20.13-r1.ebuild 5233 BLAKE2B ba5938c842d7c4688907b62de72e7f8aeacd1657f3e0dff6de81fb6d3eb234f7c1a6e628d29d332fbfa2809f90e19bfdef9a66d34f6fe0ce478352fbbabb54f5 SHA512 17de9e4c9a8639a750210eeb5c751fd365a088d9e4aefb5b80447d0a6246a8d5312e36ee26d612bcefc4492d2d16d8136e969db443a8ec00f7d95c7b03c3d123 +EBUILD xorg-server-21.1.1-r2.ebuild 4382 BLAKE2B 856d6fd11d78ef9421ee8bb55ee1100cf61b1f6750983f6719f673b12f4f8205f344d481b0b245840ced1eb0121e01cc5d0c69af52fbb0d7f4e1775e750fbe4e SHA512 734cadb72e5a28fc818f10e7563a7c311a092cd7658d29f60579d7d626b5fe09720771324d6e49cd0bc64b0b63152175e7941e19beba5c6b5a4a73deb4b31cd0 +EBUILD xorg-server-9999.ebuild 4364 BLAKE2B 5046f3e7a18c3a641800aba984219f35b35b1f09b2a500b40682665ae4001756e5ec8820b704d05c80b3b57212e7de0478edd731d4b9aafbba0868b90b13421b SHA512 9589abe381e82610c0f9865d0c025f5764c08d659dea94c41e14f251d05d0ae314c54360fafe57ba235f64a337521050570aadc29ed204ab4d302d454e94e3f8 MISC metadata.xml 896 BLAKE2B cdcbd8758222413b63e88487aa887654f80fac5e245563e99cc8fa9de5af6ab5da3da2ff499230a1e897b3e051a692e62100e8864fc0cfde128365f85d715d08 SHA512 51970dfe9c2ef9a00dd4095246160f344fa9df76defbd4f0c43e07062b36d4c4f027cd77d0de7d7d70a91995f3e898c4537111b0191298e331fe14586a2d8637 diff --git a/x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch b/x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch new file mode 100644 index 000000000000..89d8e2653a28 --- /dev/null +++ b/x11-base/xorg-server/files/xorg-server-21.1.1-DPI-revert.patch @@ -0,0 +1,133 @@ +https://gitlab.freedesktop.org/xorg/xserver/-/commit/35af1299e73483eaf93d913a960e1d1738bc7de6 + +From: Povilas Kanapickas +Date: Sat, 13 Nov 2021 17:23:54 +0200 +Subject: [PATCH] Revert "hw/xfree86: Propagate physical dimensions from DRM + connector" + +Quite a lot of applications currently expect the screen DPI exposed by +the X server to be 96 even when the real display DPI is different. +Additionally, currently Xwayland completely ignores any hardware +information and sets the DPI to 96. Accordingly the new behavior, even +if it fixes a bug, should not be enabled automatically to all users. + +A better solution would be to make the default DPI stay as is and enable +the correct behavior with a command line option (maybe -dpi auto, or +similar). For now let's just revert the bug fix. + +This reverts commit 05b3c681ea2f478c0cb941c2f8279919cf78de6d. + +Signed-off-by: Povilas Kanapickas +--- a/hw/xfree86/common/xf86Helper.c ++++ b/hw/xfree86/common/xf86Helper.c +@@ -55,7 +55,6 @@ + #include "xf86Xinput.h" + #include "xf86InPriv.h" + #include "mivalidate.h" +-#include "xf86Crtc.h" + + /* For xf86GetClocks */ + #if defined(CSRG_BASED) || defined(__GNU__) +@@ -852,9 +851,8 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) + { + MessageType from = X_DEFAULT; + xf86MonPtr DDC = (xf86MonPtr) (pScrn->monitor->DDC); +- int probedWidthmm, probedHeightmm; ++ int ddcWidthmm, ddcHeightmm; + int widthErr, heightErr; +- xf86OutputPtr compat = xf86CompatOutput(pScrn); + + /* XXX Maybe there is no need for widthmm/heightmm in ScrnInfoRec */ + pScrn->widthmm = pScrn->monitor->widthmm; +@@ -864,15 +862,11 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) + /* DDC gives display size in mm for individual modes, + * but cm for monitor + */ +- probedWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */ +- probedHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */ +- } +- else if (compat && compat->mm_width > 0 && compat->mm_height > 0) { +- probedWidthmm = compat->mm_width; +- probedHeightmm = compat->mm_height; ++ ddcWidthmm = DDC->features.hsize * 10; /* 10mm in 1cm */ ++ ddcHeightmm = DDC->features.vsize * 10; /* 10mm in 1cm */ + } + else { +- probedWidthmm = probedHeightmm = 0; ++ ddcWidthmm = ddcHeightmm = 0; + } + + if (monitorResolution > 0) { +@@ -898,15 +892,15 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) + pScrn->widthmm, pScrn->heightmm); + + /* Warn if config and probe disagree about display size */ +- if (probedWidthmm && probedHeightmm) { ++ if (ddcWidthmm && ddcHeightmm) { + if (pScrn->widthmm > 0) { +- widthErr = abs(probedWidthmm - pScrn->widthmm); ++ widthErr = abs(ddcWidthmm - pScrn->widthmm); + } + else { + widthErr = 0; + } + if (pScrn->heightmm > 0) { +- heightErr = abs(probedHeightmm - pScrn->heightmm); ++ heightErr = abs(ddcHeightmm - pScrn->heightmm); + } + else { + heightErr = 0; +@@ -915,17 +909,17 @@ xf86SetDpi(ScrnInfoPtr pScrn, int x, int y) + /* Should include config file name for monitor here */ + xf86DrvMsg(pScrn->scrnIndex, X_WARNING, + "Probed monitor is %dx%d mm, using Displaysize %dx%d mm\n", +- probedWidthmm, probedHeightmm, pScrn->widthmm, ++ ddcWidthmm, ddcHeightmm, pScrn->widthmm, + pScrn->heightmm); + } + } + } +- else if (probedWidthmm && probedHeightmm) { ++ else if (ddcWidthmm && ddcHeightmm) { + from = X_PROBED; + xf86DrvMsg(pScrn->scrnIndex, from, "Display dimensions: (%d, %d) mm\n", +- probedWidthmm, probedHeightmm); +- pScrn->widthmm = probedWidthmm; +- pScrn->heightmm = probedHeightmm; ++ ddcWidthmm, ddcHeightmm); ++ pScrn->widthmm = ddcWidthmm; ++ pScrn->heightmm = ddcHeightmm; + if (pScrn->widthmm > 0) { + pScrn->xDpi = + (int) ((double) pScrn->virtualX * MMPERINCH / pScrn->widthmm); +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -3256,10 +3256,8 @@ xf86OutputSetEDID(xf86OutputPtr output, xf86MonPtr edid_mon) + free(output->MonInfo); + + output->MonInfo = edid_mon; +- if (edid_mon) { +- output->mm_width = 0; +- output->mm_height = 0; +- } ++ output->mm_width = 0; ++ output->mm_height = 0; + + if (debug_modes) { + xf86DrvMsg(scrn->scrnIndex, X_INFO, "EDID for output %s\n", +--- a/hw/xfree86/modes/xf86RandR12.c ++++ b/hw/xfree86/modes/xf86RandR12.c +@@ -806,12 +806,6 @@ xf86RandR12CreateScreenResources(ScreenPtr pScreen) + mmWidth = output->conf_monitor->mon_width; + mmHeight = output->conf_monitor->mon_height; + } +- else if (output && +- (output->mm_width > 0 && +- output->mm_height > 0)) { +- mmWidth = output->mm_width; +- mmHeight = output->mm_height; +- } + else { + /* + * Otherwise, just set the screen to DEFAULT_DPI +GitLab diff --git a/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild index d6d1f45f1b26..70f50b24ca30 100644 --- a/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild +++ b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild @@ -5,7 +5,7 @@ EAPI=7 XORG_DOC=doc XORG_TARBALL_SUFFIX="xz" -inherit xorg-3 multilib flag-o-matic toolchain-funcs +inherit xorg-3 toolchain-funcs EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" DESCRIPTION="X.Org X servers" diff --git a/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild b/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild new file mode 100644 index 000000000000..9e885eb74813 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-21.1.1-r2.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_DOC=doc +XORG_TARBALL_SUFFIX="xz" +XORG_EAUTORECONF="no" +inherit 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 ~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/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/libxcvt-0.1.0 + >=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 + >=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 + selinux? ( 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 + doc? ( + x11-base/xorg-sgml-doctools + ) +" +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 )" + +UPSTREAMED_PATCHES=( + "${FILESDIR}"/${P}-DPI-revert.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() { + # 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 emesonargs=( + --localstatedir "${EPREFIX}/var" + --sysconfdir "${EPREFIX}/etc/X11" + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + $(meson_use doc docs) + $(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 xephyr) + $(meson_use xnest) + $(meson_use xorg) + $(meson_use xvfb) + -Ddefault_font_path="${EPREFIX}"/usr/share/fonts + -Ddrm=true + -Ddtrace=false + -Dipv6=true + -Dhal=false + -Dlinux_acpi=false + -Dlinux_apm=false + -Dsha1=libcrypto + -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" + ) + + if use systemd || use elogind; then + emesonargs+=( + -Dsystemd_logind=true + $(meson_use suid suid_wrapper) + ) + else + emesonargs+=( + -Dsystemd_logind=false + $(meson_use suid suid_wrapper) + ) + fi + + meson_src_configure +} + +src_install() { + meson_src_install + + #The new meson build system do not leave X symlink + ln -s Xorg "${ED}"/usr/bin/X + + 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-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 27d63ee09fb5..2fb9a72911bc 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -5,9 +5,9 @@ EAPI=7 XORG_DOC=doc XORG_TARBALL_SUFFIX="xz" +XORG_EAUTORECONF="no" inherit xorg-3 meson EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" -XORG_EAUTORECONF="no" DESCRIPTION="X.Org X servers" SLOT="0/${PV}" @@ -16,7 +16,7 @@ if [[ ${PV} != 9999* ]]; then fi IUSE_SERVERS="xephyr xnest xorg xvfb" -IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity" +IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" RESTRICT="!test? ( test )" CDEPEND=" @@ -56,6 +56,7 @@ CDEPEND=" udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) >=x11-apps/xinit-1.3.3-r1 + selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/dbus sys-apps/systemd @@ -70,6 +71,9 @@ CDEPEND=" DEPEND="${CDEPEND} >=x11-base/xorg-proto-2021.4.99.2 >=x11-libs/xtrans-1.3.5 + doc? ( + x11-base/xorg-sgml-doctools + ) " RDEPEND="${CDEPEND} !systemd? ( gui-libs/display-manager-init ) @@ -107,30 +111,32 @@ src_configure() { local emesonargs=( --localstatedir "${EPREFIX}/var" --sysconfdir "${EPREFIX}/etc/X11" - $(meson_use ipv6) - $(meson_use debug) - $(meson_use unwind libunwind) - $(meson_use !minimal dri) + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + $(meson_use doc docs) + $(meson_use !minimal dri1) $(meson_use !minimal dri2) $(meson_use !minimal dri3) - $(meson_use !minimal glx) $(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 xephyr) $(meson_use xnest) $(meson_use xorg) $(meson_use xvfb) - $(meson_use udev) - $(meson_use udev udev_kms) - $(meson_use doc docs) + -Ddefault_font_path="${EPREFIX}"/usr/share/fonts -Ddrm=true - -Dxwayland=false - -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" + -Ddtrace=false + -Dipv6=true -Dhal=false -Dlinux_acpi=false - -Ddtrace=false + -Dlinux_apm=false -Dsha1=libcrypto - -Ddefault_font_path="${EPREFIX}"/usr/share/fonts + -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" + -Dxwayland=false ) if use systemd || use elogind; then diff --git a/x11-base/xorg-sgml-doctools/Manifest b/x11-base/xorg-sgml-doctools/Manifest new file mode 100644 index 000000000000..25f1ad3108fa --- /dev/null +++ b/x11-base/xorg-sgml-doctools/Manifest @@ -0,0 +1,3 @@ +DIST xorg-sgml-doctools-1.11.tar.bz2 120356 BLAKE2B 55a6e89675dff17bb873e187325255a3da0a431a49950dfb3aea353efa6335a01118512edc0a24b0690f2d2d8b2ddda49bd84e71064574048e06c0a4923cf0ba SHA512 64bf561bc7a6855f96d9df8b062860deb3b9967203339ae2fc02404ad29c05272f7ead3aa792b149811ecfc7af786567e0b8a66a2bf112d33ec7385dd1398e7e +EBUILD xorg-sgml-doctools-1.11.ebuild 406 BLAKE2B df22ff8918a192ac1044b55d63a031271a896b7c2edaa31bfbb305aeb21e7b1f1c25e03c581871128b19c8de07939fea102fda2da8ee0acd50da98349144dbe2 SHA512 9e992185a735469e4baf7d7def7a46d5399ccf564b5ad0fe33abdf9fea7d82a8cdf4ea7c0802e07bc949f3104e7892f1a9b66733e4f4b064c4b46f21c7ddca68 +MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b diff --git a/x11-base/xorg-sgml-doctools/metadata.xml b/x11-base/xorg-sgml-doctools/metadata.xml new file mode 100644 index 000000000000..7a7bbf810544 --- /dev/null +++ b/x11-base/xorg-sgml-doctools/metadata.xml @@ -0,0 +1,8 @@ + + + + + x11@gentoo.org + X11 + + diff --git a/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild new file mode 100644 index 000000000000..79f67580decb --- /dev/null +++ b/x11-base/xorg-sgml-doctools/xorg-sgml-doctools-1.11.ebuild @@ -0,0 +1,18 @@ +# Copyright 2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +XORG_MODULE=doc/ + +inherit xorg-3 + +DESCRIPTION="SGML entities and XML/CSS stylesheets used in X.Org docs" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" + +DEPEND="x11-misc/util-macros" +RDEPEND="" +BDEPEND="" diff --git a/x11-base/xwayland/Manifest b/x11-base/xwayland/Manifest index 43351666ea7c..74d2ce99009a 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.2.901.tar.xz 1261656 BLAKE2B 76710f02d50506d3a41d33065b23b8bd43ef6ab6abb69f359d12174dd8a9fc2d90e1125f093701c560f6de77ad52fda6d76fdabbfe9df6028194a6ae73f82c91 SHA512 94ffb4f1d107db7c78aa01048ccc984882cd290bc67c8dc6d83ee158c65d8ad58974b71881136301b1b43077abe0aeb6b37780a5c69edf502ca714b8b8d75b1c DIST xwayland-21.1.2.tar.xz 1258732 BLAKE2B 1a797e4dedee4f47ada968d4a06c89da2fac64bbfa587e84f01d5b0aa7da23402b70369a274a672470e6d8df0645fd117d129d1f2049b25394d825a9eed3e451 SHA512 3bd595a563cbc44b49a00c85adabdbcddf02fd55c6500ed2711557c156f10cd273af93f7b232865141ad27392a85583e40268bcedad183ad9eeefba457cef6c6 +DIST xwayland-21.1.3.tar.xz 1261776 BLAKE2B bccecc3386ceb7e612929139b5b73e038df684bc43d9554c1196c4c3e66f200b346ea8615ec9224ae999400f34881d5f29365f06d4487bf4dda381c03b83e05b SHA512 24147ef788cce3fa16cd5604d293ffbe7ef4c6dc5fc2b1a1018d78ca4c0f10ade7b99c1ad6a8cdca5c581ff40f5834d7e34b2a314acca665a527eed700993594 EBUILD xwayland-21.1.2-r2.ebuild 1928 BLAKE2B fa337518f1cf0d1da110b0cbe890a63f8ccf7b1f6abb005c5e7948b2d6d4eda17a1135c97d5ace033b68f0af7975a61fb4ef8710c6b564eef39d681c2fc1a4ad SHA512 640e0895fc066f6fb713a88a83f67329f202acec89c12cfe9d39fe03832ef8d682b1ef901650ca64e8f7e81bbbccc03c9e3523328e0e06669ac1b21bf31c428a -EBUILD xwayland-21.1.2.901.ebuild 1934 BLAKE2B 6d620ee6fad745f9833df0a8d2b0633066aa11aa8571a772dfecff19f99122947bdf6bde1a769083f98ae0b82da9b230ecb6ebed518b6e14a634332f38d1221a SHA512 b4ed120b7323dbf989aa14b0c4c1b34f11496af9de73bdf7a59e547a38c05440d6934783493e552f3162dd487f9e516c2a73fa184072225be8a43ac0d428166d +EBUILD xwayland-21.1.3.ebuild 1923 BLAKE2B 679e27aecfe108bf0d36d720d87e8cb2a100efcd46c8ee15b30ba453534090abff3bcdffab188d1b0558218a8acf3922cf4e1ae726d9a1bae7141c358983cf8c SHA512 08e61b75a110439c985def27e2af5ebb140d61917b7010a0b9ed4bce738a62da4c9ecdf5d1460abd884435883bd2cb7f5a7632f86cf5148234fa0887027594ed MISC metadata.xml 493 BLAKE2B 9761735ff751b1c66db647d8427c32997113ca4106b6d447a3542b0e70b848bf3486fab64a9a47d9c4222d2184dd582036c91c02118cddd43458e69075eebfdd SHA512 eef562fc6bcbfaa6916e7ee3ee813eebea57e56049dd4617f6c9a22118de836e681c14a77a7187deee5d003d0fd4f9a509b24535b54ba42df791ffa644b6be3a diff --git a/x11-base/xwayland/xwayland-21.1.2.901.ebuild b/x11-base/xwayland/xwayland-21.1.2.901.ebuild deleted file mode 100644 index f95f884f71bf..000000000000 --- a/x11-base/xwayland/xwayland-21.1.2.901.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 video_cards_nvidia" - -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 - video_cards_nvidia? ( gui-libs/egl-wayland ) - >=x11-libs/libXdmcp-1.0.2 - >=x11-libs/libdrm-2.4.89 - >=media-libs/libepoxy-1.5.4[X,egl(+)] - >=media-libs/mesa-21.1[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-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 rpc secure-rpc) - $(meson_use unwind libunwind) - $(meson_use ipv6) - $(meson_use xcsecurity) - $(meson_use selinux xselinux) - $(meson_use video_cards_nvidia xwayland_eglstream) - -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/bin - -Ddtrace=false - ) - - meson_src_configure -} - -src_install() { - dosym ../bin/Xwayland /usr/libexec/Xwayland - - meson_src_install -} diff --git a/x11-base/xwayland/xwayland-21.1.3.ebuild b/x11-base/xwayland/xwayland-21.1.3.ebuild new file mode 100644 index 000000000000..8700d08f40f9 --- /dev/null +++ b/x11-base/xwayland/xwayland-21.1.3.ebuild @@ -0,0 +1,87 @@ +# 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 xcsecurity selinux video_cards_nvidia" + +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 + video_cards_nvidia? ( gui-libs/egl-wayland ) + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libdrm-2.4.89 + >=media-libs/libepoxy-1.5.4[X,egl(+)] + >=media-libs/mesa-21.1[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-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 rpc secure-rpc) + $(meson_use selinux xselinux) + $(meson_use unwind libunwind) + $(meson_use xcsecurity) + $(meson_use video_cards_nvidia xwayland_eglstream) + -Ddpms=true + -Ddri3=true + -Ddtrace=false + -Dglamor=true + -Dglx=true + -Dipv6=true + -Dscreensaver=true + -Dsha1=libcrypto + -Dxace=true + -Dxdmcp=true + -Dxinerama=true + -Dxvfb=true + -Dxv=true + -Dxwayland-path="${EPREFIX}"/usr/bin + ) + + meson_src_configure +} + +src_install() { + dosym ../bin/Xwayland /usr/libexec/Xwayland + + meson_src_install +} -- cgit v1.2.3