summaryrefslogtreecommitdiff
path: root/x11-base/xorg-server
diff options
context:
space:
mode:
Diffstat (limited to 'x11-base/xorg-server')
-rw-r--r--x11-base/xorg-server/Manifest6
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.11-r4.ebuild (renamed from x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild)4
-rw-r--r--x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild219
-rw-r--r--x11-base/xorg-server/xorg-server-9999.ebuild6
4 files changed, 226 insertions, 9 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index ac3fe6bc22cc..9d8018a4a212 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -3,9 +3,11 @@ AUX xorg-server-1.18-support-multiple-Files-sections.patch 1902 BLAKE2B 69ba852b
AUX xorg-sets.conf 199 BLAKE2B e9414694f372d3f2a65bee903522094a60e261ddcd0c49a1d85a2ee804f3edbb5c605ed2d0b44839a91e98957f05ea88da87530f5f36b2db249e09ee56ee2975 SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41
DIST xorg-server-1.20.11.tar.bz2 6476116 BLAKE2B 71ec31c4ed050a3e27fadd525f1039895e43571c04b0a1efa9b35fda318f17b3c89d403c914c591345e7d245a7ebbd6e0f206e4415c1d54f1368fb0735a3d7ef SHA512 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
DIST xorg-server-1.20.12.tar.xz 5143456 BLAKE2B 1e70823890ccb382add92b8bda9e88168477d651edee70a97fd7632a290a20b8848f2c364aa859700e3e8528e4211d39104fa7dafac3f75f8e51afcfa98cffcf SHA512 98350c42fb1f10c965663c1c8d4b225689a6a63163d788d454aa71b28b9cc8fcf9709a932f882358a13ca0c277c0c15812d05919092b4c32828d4ed61cca0406
+DIST xorg-server-1.20.13.tar.xz 5122260 BLAKE2B 4435d25d8b379142fcc4bf60d82e52417ac3ab22a77ededa1472785d67c23bfb95be8e10465fc4859645405b8e580d6dcb262caea39c408e724d0e5ea61b37af SHA512 4e0b7bd4e070dc52cb2c51c2056feb133de2c0487d359392ed63abba9702910cd2e2983e9415973d8d6e9672eac78be6f39202687fc56610877914ce722554b3
EBUILD xorg-server-1.20.11-r2.ebuild 5219 BLAKE2B 7bd00eb534c539e80ca36cf387d0d0e57a0c45a6f489e0fba3c48d263a2d1b46cac1612e190280f0dbc47f018c8b32c98f3a25fb1241f886d3bae1b488c9ca59 SHA512 d9258c86c261e7772bfae2024ffb282d6aedf0591928e923d4ddd561e75349ea634a4d26d731542aba75784d61a88d65b3b609ff5d793d629e6380106c90b195
-EBUILD xorg-server-1.20.11-r3.ebuild 5295 BLAKE2B 85bd4a2d53afaf305953f0f125bcf501b0f4c720748efbdeb6a596242881c37c65a5aedd4c3685c35fdf55f6db718fa4854b49fbfc125bc896f8e161e53f9189 SHA512 ad61d98793d0edfcf8f77f1fb0155d695404a2295a07511a329e6d1344fbefd3208f18072f3f312b535988497d0e0ab28a9a7a120f7c28311094a9d82ab85b43
+EBUILD xorg-server-1.20.11-r4.ebuild 5232 BLAKE2B f11f0744e455d8b4fa241a26c7bc4b116c8b9107d7968e255838b4bdb092d79e333c730ebb5a5977890ee5f11380ead8be48ce18bd1f9955d5f5ffe6922bf0dc SHA512 e6737367baf082ecf0de2f97ebe3b9a2864bcafc8da677fd62f8783729ac02f568fdb5592b5c66fedf22975883e54dd7848f2896d3660477a64f6d2754a9780d
EBUILD xorg-server-1.20.11.ebuild 5574 BLAKE2B 9e1a53aab7fc913898e01728057bb121f68e41d3f50ad022328474e6b2fcea48502d5d64c2116faa8417db174259146420171cb77f1d10328a9951bb67de6b4b SHA512 b209f1dbbcdb8cacac4b638b2ad9db0527b535c5111535a99f6965124dba0e77fec890c292b07e5cdfef8f3a5f8e5a5f4e53464061b9936c8b391dbd0a23e635
EBUILD xorg-server-1.20.12.ebuild 5320 BLAKE2B 73f6cc91d34fef4b897a2fe4fe68bf6f2a8de588a8821e283efb8f6b44f9038834e8495acae877f74f29920a0bb022d34b164eeb2f5db246a7169a14232a5045 SHA512 451311224e15acc480e43e4cfb986661fb84c17604b22f53a5c5d0d7adc742690deac89075b0a3f735feb07439a9fa0e2ce823bdb55b43837818884498b74c5c
-EBUILD xorg-server-9999.ebuild 5320 BLAKE2B 73f6cc91d34fef4b897a2fe4fe68bf6f2a8de588a8821e283efb8f6b44f9038834e8495acae877f74f29920a0bb022d34b164eeb2f5db246a7169a14232a5045 SHA512 451311224e15acc480e43e4cfb986661fb84c17604b22f53a5c5d0d7adc742690deac89075b0a3f735feb07439a9fa0e2ce823bdb55b43837818884498b74c5c
+EBUILD xorg-server-1.20.13-r1.ebuild 5263 BLAKE2B 29bf1bd18ed5b65fdfc76071167cc4650a84fcdc55ed03bfa7fd0fa526880e263ba70f5b1a131e1e8925f5031b40edf64fff49cfe574b30558e42be0bc2b7b3c SHA512 b0cc8ac3574d4376dbdf2fe38dec763419fb6a53f6af8529457aa24c1648c7e9d78dfa30d2d2042040ab77dcfde274aa8ad4145c14ccdd2ca0c2f50c25e6ffe7
+EBUILD xorg-server-9999.ebuild 5263 BLAKE2B 29bf1bd18ed5b65fdfc76071167cc4650a84fcdc55ed03bfa7fd0fa526880e263ba70f5b1a131e1e8925f5031b40edf64fff49cfe574b30558e42be0bc2b7b3c SHA512 b0cc8ac3574d4376dbdf2fe38dec763419fb6a53f6af8529457aa24c1648c7e9d78dfa30d2d2042040ab77dcfde274aa8ad4145c14ccdd2ca0c2f50c25e6ffe7
MISC metadata.xml 895 BLAKE2B 03b64d8a77f70c326650f17775d8c605c1dad44529330d26daee4136bd36e0f53d79212a7038d943795dbc5772dbcd52208b762aad42ed832ebabd848e5fa15f SHA512 fcee97e4ee4b1f972c4bea7626a719aa4d18b75b4475554327369349d5f42c0b1a3b8fb513727751b9703cfb9afc34fdb073cf19e116e7c5f6fad9b204574a5c
diff --git a/x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild b/x11-base/xorg-server/xorg-server-1.20.11-r4.ebuild
index 29069a22532d..82ce49e94854 100644
--- a/x11-base/xorg-server/xorg-server-1.20.11-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.11-r4.ebuild
@@ -13,7 +13,7 @@ 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="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity"
RESTRICT="!test? ( test )"
@@ -95,7 +95,6 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}
!systemd? ( gui-libs/display-manager-init )
selinux? ( sec-policy/selinux-xserver )
- wayland? ( x11-base/xwayland )
"
BDEPEND="
sys-devel/flex
@@ -108,7 +107,6 @@ REQUIRED_USE="!minimal? (
)
elogind? ( udev )
?? ( elogind systemd )
- minimal? ( !wayland )
xephyr? ( kdrive )"
UPSTREAMED_PATCHES=(
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
new file mode 100644
index 000000000000..93c416de7606
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.20.13-r1.ebuild
@@ -0,0 +1,219 @@
+# 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"
+inherit xorg-3 multilib flag-o-matic toolchain-funcs
+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="dmx kdrive xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 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/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
+ dmx? (
+ x11-libs/libXt
+ >=x11-libs/libdmx-1.0.99.1
+ >=x11-libs/libX11-1.1.5
+ >=x11-libs/libXaw-1.0.4
+ >=x11-libs/libXext-1.0.99.4
+ >=x11-libs/libXfixes-5.0
+ >=x11-libs/libXi-1.2.99.1
+ >=x11-libs/libXmu-1.0.3
+ x11-libs/libXrender
+ >=x11-libs/libXres-1.0.3
+ >=x11-libs/libXtst-1.0.99.2
+ )
+ kdrive? (
+ >=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
+ 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-2018.4
+ >=x11-libs/xtrans-1.3.5
+ dmx? (
+ doc? (
+ || (
+ www-client/links
+ www-client/lynx
+ www-client/w3m
+ )
+ )
+ )
+"
+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 )
+ xephyr? ( kdrive )"
+
+UPSTREAMED_PATCHES=(
+)
+
+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 XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable debug)
+ $(use_enable dmx)
+ $(use_enable kdrive)
+ $(use_enable test unit-tests)
+ $(use_enable unwind libunwind)
+ $(use_enable !minimal record)
+ $(use_enable !minimal xfree86-utils)
+ $(use_enable !minimal dri)
+ $(use_enable !minimal dri2)
+ $(use_enable !minimal dri3)
+ $(use_enable !minimal glamor)
+ $(use_enable !minimal glx)
+ $(use_enable xcsecurity)
+ $(use_enable xephyr)
+ $(use_enable xnest)
+ $(use_enable xorg)
+ $(use_enable xvfb)
+ $(use_enable udev config-udev)
+ $(use_with doc doxygen)
+ $(use_with doc xmlto)
+ $(use_with systemd systemd-daemon)
+ --disable-xwayland
+ --enable-libdrm
+ --sysconfdir="${EPREFIX}"/etc/X11
+ --localstatedir="${EPREFIX}"/var
+ --with-fontrootdir="${EPREFIX}"/usr/share/fonts
+ --with-xkb-output="${EPREFIX}"/var/lib/xkb
+ --disable-config-hal
+ --disable-linux-acpi
+ --without-dtrace
+ --without-fop
+ --with-os-vendor=Gentoo
+ --with-sha1=libcrypto
+ CPP="$(tc-getPROG CPP cpp)"
+ )
+
+ if use systemd || use elogind; then
+ XORG_CONFIGURE_OPTIONS+=(
+ --enable-systemd-logind
+ --disable-install-setuid
+ $(use_enable suid suid-wrapper)
+ )
+ else
+ XORG_CONFIGURE_OPTIONS+=(
+ --disable-systemd-logind
+ --disable-suid-wrapper
+ $(use_enable suid install-setuid)
+ )
+ fi
+
+ xorg-3_src_configure
+}
+
+server_based_install() {
+ 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
+}
+
+src_install() {
+ xorg-3_src_install
+
+ server_based_install
+
+ if ! use minimal && use xorg; then
+ # Install xorg.conf.example into docs
+ dodoc "${S}"/hw/xfree86/xorg.conf.example
+
+ rm \
+ "${ED}"/usr/bin/cvt \
+ "${ED}"/usr/share/man/man1/cvt.1 || die
+ fi
+
+ # install the @x11-module-rebuild set for Portage
+ insinto /usr/share/portage/config/sets
+ newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+
+ find "${ED}"/var -type d -empty -delete || die
+}
+
+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 9d8b35301a6c..93c416de7606 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -14,7 +14,7 @@ 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="dmx kdrive wayland xephyr xnest xorg xvfb"
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
IUSE="${IUSE_SERVERS} debug +elogind ipv6 minimal selinux suid systemd test +udev unwind xcsecurity"
RESTRICT="!test? ( test )"
@@ -63,7 +63,7 @@ CDEPEND="
!minimal? (
>=x11-libs/libX11-1.1.5
>=x11-libs/libXext-1.0.5
- >=media-libs/mesa-18[X(+),egl,gbm]
+ >=media-libs/mesa-18[X(+),egl(+),gbm(+)]
>=media-libs/libepoxy-1.5.4[X,egl(+)]
)
udev? ( virtual/libudev:= )
@@ -96,7 +96,6 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}
!systemd? ( gui-libs/display-manager-init )
selinux? ( sec-policy/selinux-xserver )
- wayland? ( x11-base/xwayland )
"
BDEPEND="
sys-devel/flex
@@ -109,7 +108,6 @@ REQUIRED_USE="!minimal? (
)
elogind? ( udev )
?? ( elogind systemd )
- minimal? ( !wayland )
xephyr? ( kdrive )"
UPSTREAMED_PATCHES=(
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 23:30:46 +0000