| 1 |
commit: 4673734609065f73a5190f88ff04972c8447de3e |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 2 23:20:04 2022 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 2 23:22:09 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46737346 |
| 7 |
|
| 8 |
x11-base/xorg-server: Version bump to 21.1.3 |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
x11-base/xorg-server/Manifest | 1 + |
| 13 |
x11-base/xorg-server/xorg-server-21.1.3.ebuild | 184 +++++++++++++++++++++++++ |
| 14 |
2 files changed, 185 insertions(+) |
| 15 |
|
| 16 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
| 17 |
index 5d64b775798f..8a613afcb333 100644 |
| 18 |
--- a/x11-base/xorg-server/Manifest |
| 19 |
+++ b/x11-base/xorg-server/Manifest |
| 20 |
@@ -1,2 +1,3 @@ |
| 21 |
DIST xorg-server-1.20.14.tar.xz 5178288 BLAKE2B e60cbb6f3023639598d518fb53e3df3a2aced8f8950279f3a1642ad0a9545bea756574c4d41383cba966dc76c317859065b2290c8420668547f26f1d6e508da3 SHA512 be3dc32cce7d55d7e38c5f6557027f13f39224c76cc83e5800555d5ce89dbdc3731773a2d186a5b97db9fc8731a2b2dd6e9829af2b01ee2559246d4aef7c4963 |
| 22 |
DIST xorg-server-21.1.2.tar.xz 4967784 BLAKE2B 352c8717dbbceb547e84610db3983bcfc83d4d72f02f6658ce6c7faa88821a60b401824e76a02bbce617d6646cd474a21823a4b7b75270512bbfd37957dff18d SHA512 6d7a0d29d5be09f80ed505c4d6ae964795127525a0ab73a4eab4f601788ab3627033143e5aeb4c2565c6683dd3402084d13acab5554606fbd519c4aec0a79def |
| 23 |
+DIST xorg-server-21.1.3.tar.xz 4955948 BLAKE2B 1907007e4131378ead2b8757e84e8e9403148c9b3cdffc68d7c54faf5ab0efa6b594b635940fce8af4b8334e4a1c67984f59fc2f3642e48b54eb2f2dcc7fd8f5 SHA512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b |
| 24 |
|
| 25 |
diff --git a/x11-base/xorg-server/xorg-server-21.1.3.ebuild b/x11-base/xorg-server/xorg-server-21.1.3.ebuild |
| 26 |
new file mode 100644 |
| 27 |
index 000000000000..93b39ce0de42 |
| 28 |
--- /dev/null |
| 29 |
+++ b/x11-base/xorg-server/xorg-server-21.1.3.ebuild |
| 30 |
@@ -0,0 +1,184 @@ |
| 31 |
+# Copyright 1999-2022 Gentoo Authors |
| 32 |
+# Distributed under the terms of the GNU General Public License v2 |
| 33 |
+ |
| 34 |
+EAPI=7 |
| 35 |
+ |
| 36 |
+XORG_TARBALL_SUFFIX="xz" |
| 37 |
+XORG_EAUTORECONF="no" |
| 38 |
+inherit xorg-3 meson |
| 39 |
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git" |
| 40 |
+ |
| 41 |
+DESCRIPTION="X.Org X servers" |
| 42 |
+SLOT="0/${PV}" |
| 43 |
+if [[ ${PV} != 9999* ]]; then |
| 44 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 45 |
+fi |
| 46 |
+ |
| 47 |
+IUSE_SERVERS="xephyr xnest xorg xvfb" |
| 48 |
+IUSE="${IUSE_SERVERS} debug +elogind minimal selinux suid systemd test +udev unwind xcsecurity" |
| 49 |
+RESTRICT="!test? ( test )" |
| 50 |
+ |
| 51 |
+CDEPEND=" |
| 52 |
+ media-libs/libglvnd[X] |
| 53 |
+ dev-libs/libbsd |
| 54 |
+ dev-libs/openssl:0= |
| 55 |
+ >=x11-apps/iceauth-1.0.2 |
| 56 |
+ >=x11-apps/rgb-1.0.3 |
| 57 |
+ >=x11-apps/xauth-1.0.3 |
| 58 |
+ x11-apps/xkbcomp |
| 59 |
+ >=x11-libs/libdrm-2.4.89 |
| 60 |
+ >=x11-libs/libpciaccess-0.12.901 |
| 61 |
+ >=x11-libs/libXau-1.0.4 |
| 62 |
+ >=x11-libs/libXdmcp-1.0.2 |
| 63 |
+ >=x11-libs/libXfont2-2.0.1 |
| 64 |
+ >=x11-libs/libxcvt-0.1.0 |
| 65 |
+ >=x11-libs/libxkbfile-1.0.4 |
| 66 |
+ >=x11-libs/libxshmfence-1.1 |
| 67 |
+ >=x11-libs/pixman-0.27.2 |
| 68 |
+ >=x11-misc/xbitmaps-1.0.1 |
| 69 |
+ >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 70 |
+ >=x11-libs/libXext-1.0.5 |
| 71 |
+ x11-libs/libXv |
| 72 |
+ xephyr? ( |
| 73 |
+ x11-libs/libxcb[xkb] |
| 74 |
+ x11-libs/xcb-util |
| 75 |
+ x11-libs/xcb-util-image |
| 76 |
+ x11-libs/xcb-util-keysyms |
| 77 |
+ x11-libs/xcb-util-renderutil |
| 78 |
+ x11-libs/xcb-util-wm |
| 79 |
+ ) |
| 80 |
+ !minimal? ( |
| 81 |
+ >=x11-libs/libX11-1.1.5 |
| 82 |
+ >=x11-libs/libXext-1.0.5 |
| 83 |
+ >=media-libs/mesa-18[X(+),egl(+),gbm(+)] |
| 84 |
+ >=media-libs/libepoxy-1.5.4[X,egl(+)] |
| 85 |
+ ) |
| 86 |
+ udev? ( virtual/libudev:= ) |
| 87 |
+ unwind? ( sys-libs/libunwind ) |
| 88 |
+ selinux? ( sys-libs/libselinux ) |
| 89 |
+ systemd? ( |
| 90 |
+ sys-apps/dbus |
| 91 |
+ sys-apps/systemd |
| 92 |
+ ) |
| 93 |
+ elogind? ( |
| 94 |
+ sys-apps/dbus |
| 95 |
+ sys-auth/elogind[pam] |
| 96 |
+ sys-auth/pambase[elogind] |
| 97 |
+ ) |
| 98 |
+ !!x11-drivers/nvidia-drivers[-libglvnd(+)] |
| 99 |
+" |
| 100 |
+DEPEND="${CDEPEND} |
| 101 |
+ >=x11-base/xorg-proto-2021.4.99.2 |
| 102 |
+ >=x11-libs/xtrans-1.3.5 |
| 103 |
+ media-fonts/font-util |
| 104 |
+" |
| 105 |
+RDEPEND="${CDEPEND} |
| 106 |
+ !systemd? ( gui-libs/display-manager-init ) |
| 107 |
+ selinux? ( sec-policy/selinux-xserver ) |
| 108 |
+ xorg? ( >=x11-apps/xinit-1.3.3-r1 ) |
| 109 |
+" |
| 110 |
+BDEPEND=" |
| 111 |
+ sys-devel/flex |
| 112 |
+" |
| 113 |
+PDEPEND=" |
| 114 |
+ xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )" |
| 115 |
+ |
| 116 |
+REQUIRED_USE="!minimal? ( |
| 117 |
+ || ( ${IUSE_SERVERS} ) |
| 118 |
+ ) |
| 119 |
+ elogind? ( udev ) |
| 120 |
+ ?? ( elogind systemd )" |
| 121 |
+ |
| 122 |
+UPSTREAMED_PATCHES=( |
| 123 |
+) |
| 124 |
+ |
| 125 |
+PATCHES=( |
| 126 |
+ "${UPSTREAMED_PATCHES[@]}" |
| 127 |
+ "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
| 128 |
+ # needed for new eselect-opengl, bug #541232 |
| 129 |
+ "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch |
| 130 |
+) |
| 131 |
+ |
| 132 |
+src_configure() { |
| 133 |
+ # localstatedir is used for the log location; we need to override the default |
| 134 |
+ # from ebuild.sh |
| 135 |
+ # sysconfdir is used for the xorg.conf location; same applies |
| 136 |
+ |
| 137 |
+ local emesonargs=( |
| 138 |
+ --localstatedir "${EPREFIX}/var" |
| 139 |
+ --sysconfdir "${EPREFIX}/etc/X11" |
| 140 |
+ --buildtype $(usex debug debug plain) |
| 141 |
+ -Db_ndebug=$(usex debug false true) |
| 142 |
+ $(meson_use !minimal dri1) |
| 143 |
+ $(meson_use !minimal dri2) |
| 144 |
+ $(meson_use !minimal dri3) |
| 145 |
+ $(meson_use !minimal glamor) |
| 146 |
+ $(meson_use !minimal glx) |
| 147 |
+ $(meson_use udev) |
| 148 |
+ $(meson_use udev udev_kms) |
| 149 |
+ $(meson_use unwind libunwind) |
| 150 |
+ $(meson_use xcsecurity) |
| 151 |
+ $(meson_use xephyr) |
| 152 |
+ $(meson_use xnest) |
| 153 |
+ $(meson_use xorg) |
| 154 |
+ $(meson_use xvfb) |
| 155 |
+ -Ddocs=false |
| 156 |
+ -Ddrm=true |
| 157 |
+ -Ddtrace=false |
| 158 |
+ -Dipv6=true |
| 159 |
+ -Dhal=false |
| 160 |
+ -Dlinux_acpi=false |
| 161 |
+ -Dlinux_apm=false |
| 162 |
+ -Dsecure-rpc=false |
| 163 |
+ -Dsha1=libcrypto |
| 164 |
+ -Dxkb_output_dir="${EPREFIX}/var/lib/xkb" |
| 165 |
+ ) |
| 166 |
+ |
| 167 |
+ if [[ ${PV} == 9999 ]] ; then |
| 168 |
+ # Gone in 21.1.x, but not in master. |
| 169 |
+ emesonargs+=( -Dxwayland=false ) |
| 170 |
+ fi |
| 171 |
+ |
| 172 |
+ if use systemd || use elogind; then |
| 173 |
+ emesonargs+=( |
| 174 |
+ -Dsystemd_logind=true |
| 175 |
+ $(meson_use suid suid_wrapper) |
| 176 |
+ ) |
| 177 |
+ else |
| 178 |
+ emesonargs+=( |
| 179 |
+ -Dsystemd_logind=false |
| 180 |
+ -Dsuid_wrapper=false |
| 181 |
+ ) |
| 182 |
+ fi |
| 183 |
+ |
| 184 |
+ meson_src_configure |
| 185 |
+} |
| 186 |
+ |
| 187 |
+src_install() { |
| 188 |
+ meson_src_install |
| 189 |
+ |
| 190 |
+ # The meson build system does not support install-setuid |
| 191 |
+ if ! use systemd || ! use elogind; then |
| 192 |
+ if use suid; then |
| 193 |
+ chmod u+s "${ED}"/usr/bin/Xorg |
| 194 |
+ fi |
| 195 |
+ fi |
| 196 |
+ |
| 197 |
+ if ! use xorg; then |
| 198 |
+ rm -f "${ED}"/usr/share/man/man1/Xserver.1x \ |
| 199 |
+ "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
| 200 |
+ "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
| 201 |
+ "${ED}"/usr/share/man/man1/Xserver.1x || die |
| 202 |
+ fi |
| 203 |
+ |
| 204 |
+ # install the @x11-module-rebuild set for Portage |
| 205 |
+ insinto /usr/share/portage/config/sets |
| 206 |
+ newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 207 |
+} |
| 208 |
+ |
| 209 |
+pkg_postrm() { |
| 210 |
+ # Get rid of module dir to ensure opengl-update works properly |
| 211 |
+ if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
| 212 |
+ rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
| 213 |
+ fi |
| 214 |
+} |
Archives